RepoMirrors
/
mars
mirror of https://github.com/schoebel/mars
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

client: better timeout statistics

This commit is contained in:
Thomas Schoebel-Theuer 2020-10-01 23:14:29 +02:00 committed by Thomas Schoebel-Theuer
parent 5f18b50734
commit ea17fa59f5
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
kernel/mars_client.c
View File

@ -779,6 +779,9 @@ void _do_timeout(struct client_output *output, struct list_head *anchor, int *ro
ch->socket.s_send_abort = mars_client_abort;
ch->socket.s_recv_abort = mars_client_abort;
}
#ifdef MARS_CLIENT_DEBUGGING
atomic_inc(&brick->infinite_count);
#endif
return;
}
@ -794,8 +797,12 @@ void _do_timeout(struct client_output *output, struct list_head *anchor, int *ro
/* Don't run more than once per second */
if (!force &&
lamport_time_compare(&timeout_stamp, &brick->last_timeout_stamp) <= 0)
lamport_time_compare(&timeout_stamp, &brick->last_timeout_stamp) <= 0) {
#ifdef MARS_CLIENT_DEBUGGING
atomic_inc(&brick->skip_count);
#endif
return;
}
memcpy(&brick->last_timeout_stamp, &timeout_stamp, sizeof(brick->last_timeout_stamp));
brick->last_timeout_stamp.tv_sec += 1;
@ -806,6 +813,9 @@ void _do_timeout(struct client_output *output, struct list_head *anchor, int *ro
mref_a = container_of(tmp, struct client_mref_aspect, io_head);
#ifdef MARS_CLIENT_DEBUGGING
atomic_inc(&brick->check_count);
#endif
if (!force &&
lamport_time_compare(&mref_a->submit_stamp, &timeout_stamp) >= 0)
continue;
@ -834,7 +844,9 @@ void _do_timeout(struct client_output *output, struct list_head *anchor, int *ro
mref->ref_len);
}
#ifdef MARS_CLIENT_DEBUGGING
atomic_inc(&brick->timeout_count);
#endif
SIMPLE_CALLBACK(mref, -ETIME);
@ -1126,14 +1138,24 @@ char *client_statistics(struct client_brick *brick, int verbose)
"socket_count = %d "
"max_flying = %d "
"io_timeout = %d | "
#ifdef MARS_CLIENT_DEBUGGING
"infinite_count = %d "
"skip_count = %d "
"check_count = %d "
"timeout_count = %d "
#endif
"fly_count = %d\n",
output->get_info,
output->got_info,
socket_count,
brick->max_flying,
brick->power.io_timeout,
#ifdef MARS_CLIENT_DEBUGGING
atomic_read(&brick->infinite_count),
atomic_read(&brick->skip_count),
atomic_read(&brick->check_count),
atomic_read(&brick->timeout_count),
#endif
atomic_read(&brick->fly_count));
return res;
@ -1142,7 +1164,12 @@ char *client_statistics(struct client_brick *brick, int verbose)
static
void client_reset_statistics(struct client_brick *brick)
{
#ifdef MARS_CLIENT_DEBUGGING
atomic_set(&brick->infinite_count, 0);
atomic_set(&brick->skip_count, 0);
atomic_set(&brick->check_count, 0);
atomic_set(&brick->timeout_count, 0);
#endif
}
//////////////// object / aspect constructors / destructors ///////////////

9
kernel/mars_client.h
View File

@ -27,6 +27,10 @@
#include "mars_net.h"
#include "lib_limiter.h"
#ifdef CONFIG_MARS_DEBUG
#define MARS_CLIENT_DEBUGGING
#endif
extern struct mars_limiter client_limiter;
extern int global_net_io_timeout;
extern int mars_client_info_timeout;
@ -60,7 +64,12 @@ struct client_brick {
atomic_t receiver_count;
int socket_count;
atomic_t fly_count;
#ifdef MARS_CLIENT_DEBUGGING
atomic_t infinite_count;
atomic_t skip_count;
atomic_t check_count;
atomic_t timeout_count;
#endif
struct lamport_time hang_stamp; /* submit stamp of eldest request */
struct lamport_time last_timeout_stamp;
};