RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-08 10:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: time: move the cpu, mono, and idle time to thread_info

Browse Source 
These ones are useful across all threads and would be better placed
in struct thread_info than thread-local. There are very few users.
This commit is contained in:
Willy Tarreau 2019-05-20 19:24:50 +02:00
parent 8323a375bc
commit 81036f2738
7 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/common/hathreads.h
View File

@ -51,6 +51,9 @@ enum { tid = 0 };
extern struct thread_info { extern struct thread_info {
clockid_t clock_id; clockid_t clock_id;
uint64_t prev_cpu_time; /* previous per thread CPU time */
uint64_t prev_mono_time; /* previous system wide monotonic time */
unsigned int idle_pct; /* idle to total ratio over last sample (percent) */
/* pad to cache line (64B) */ /* pad to cache line (64B) */
char __pad[0]; /* unused except to check remaining room */ char __pad[0]; /* unused except to check remaining room */
char __end[0] __attribute__((aligned(64))); char __end[0] __attribute__((aligned(64)));
@ -382,6 +385,9 @@ void thread_release();
extern struct thread_info { extern struct thread_info {
pthread_t pthread; pthread_t pthread;
clockid_t clock_id; clockid_t clock_id;
uint64_t prev_cpu_time; /* previous per thread CPU time */
uint64_t prev_mono_time; /* previous system wide monotonic time */
unsigned int idle_pct; /* idle to total ratio over last sample (percent) */
/* pad to cache line (64B) */ /* pad to cache line (64B) */
char __pad[0]; /* unused except to check remaining room */ char __pad[0]; /* unused except to check remaining room */
char __end[0] __attribute__((aligned(64))); char __end[0] __attribute__((aligned(64)));

10
include/common/time.h
View File

@ -27,6 +27,7 @@
#include <unistd.h> #include <unistd.h>
#include <sys/time.h> #include <sys/time.h>
#include <common/config.h> #include <common/config.h>
#include <common/hathreads.h>
#include <common/standard.h> #include <common/standard.h>
/* eternity when exprimed in timeval */ /* eternity when exprimed in timeval */
@ -57,14 +58,11 @@ extern THREAD_LOCAL unsigned int curr_sec_ms_scaled; /* millisecond of curren
extern THREAD_LOCAL unsigned int now_ms; /* internal date in milliseconds (may wrap) */ extern THREAD_LOCAL unsigned int now_ms; /* internal date in milliseconds (may wrap) */
extern THREAD_LOCAL unsigned int samp_time; /* total elapsed time over current sample */ extern THREAD_LOCAL unsigned int samp_time; /* total elapsed time over current sample */
extern THREAD_LOCAL unsigned int idle_time; /* total idle time over current sample */ extern THREAD_LOCAL unsigned int idle_time; /* total idle time over current sample */
extern THREAD_LOCAL unsigned int idle_pct; /* idle to total ratio over last sample (percent) */
extern THREAD_LOCAL struct timeval now; /* internal date is a monotonic function of real clock */ extern THREAD_LOCAL struct timeval now; /* internal date is a monotonic function of real clock */
extern THREAD_LOCAL struct timeval date; /* the real current date */ extern THREAD_LOCAL struct timeval date; /* the real current date */
extern struct timeval start_date; /* the process's start date */ extern struct timeval start_date; /* the process's start date */
extern THREAD_LOCAL struct timeval before_poll; /* system date before calling poll() */ extern THREAD_LOCAL struct timeval before_poll; /* system date before calling poll() */
extern THREAD_LOCAL struct timeval after_poll; /* system date after leaving poll() */ extern THREAD_LOCAL struct timeval after_poll; /* system date after leaving poll() */
extern THREAD_LOCAL uint64_t prev_cpu_time; /* previous per thread CPU time */
extern THREAD_LOCAL uint64_t prev_mono_time; /* previous system wide monotonic time */
/**** exported functions *************************************************/ /**** exported functions *************************************************/
@ -567,7 +565,7 @@ static inline void measure_idle()
if (samp_time < 500000) if (samp_time < 500000)
return; return;
idle_pct = (100 * idle_time + samp_time / 2) / samp_time; ti->idle_pct = (100 * idle_time + samp_time / 2) / samp_time;
idle_time = samp_time = 0; idle_time = samp_time = 0;
} }
@ -587,8 +585,8 @@ static inline void tv_entering_poll()
static inline void tv_leaving_poll(int timeout, int interrupted) static inline void tv_leaving_poll(int timeout, int interrupted)
{ {
measure_idle(); measure_idle();
prev_cpu_time = now_cpu_time(); ti->prev_cpu_time = now_cpu_time();
prev_mono_time = now_mono_time(); ti->prev_mono_time = now_mono_time();
} }
#endif /* _COMMON_TIME_H */ #endif /* _COMMON_TIME_H */

6
include/proto/activity.h
View File

@ -63,9 +63,9 @@ static inline void activity_count_runtime()
new_cpu_time = now_cpu_time(); new_cpu_time = now_cpu_time();
new_mono_time = now_mono_time(); new_mono_time = now_mono_time();
if (prev_cpu_time && prev_mono_time) { if (ti->prev_cpu_time && ti->prev_mono_time) {
new_cpu_time -= prev_cpu_time; new_cpu_time -= ti->prev_cpu_time;
new_mono_time -= prev_mono_time; new_mono_time -= ti->prev_mono_time;
stolen = new_mono_time - new_cpu_time; stolen = new_mono_time - new_cpu_time;
if (unlikely(stolen >= 500000)) { if (unlikely(stolen >= 500000)) {
stolen /= 500000; stolen /= 500000;

4
src/compression.c
View File

@ -360,7 +360,7 @@ static int rfc195x_flush_or_finish(struct comp_ctx *comp_ctx, struct buffer *out
/* Verify compression rate limiting and CPU usage */ /* Verify compression rate limiting and CPU usage */
if ((global.comp_rate_lim > 0 && (read_freq_ctr(&global.comp_bps_out) > global.comp_rate_lim)) || /* rate */ if ((global.comp_rate_lim > 0 && (read_freq_ctr(&global.comp_bps_out) > global.comp_rate_lim)) || /* rate */
(idle_pct < compress_min_idle)) { /* idle */ (ti->idle_pct < compress_min_idle)) { /* idle */
if (comp_ctx->cur_lvl > 0) if (comp_ctx->cur_lvl > 0)
strm->level = --comp_ctx->cur_lvl; strm->level = --comp_ctx->cur_lvl;
} }
@ -613,7 +613,7 @@ static int deflate_flush_or_finish(struct comp_ctx *comp_ctx, struct buffer *out
/* compression limit */ /* compression limit */
if ((global.comp_rate_lim > 0 && (read_freq_ctr(&global.comp_bps_out) > global.comp_rate_lim)) || /* rate */ if ((global.comp_rate_lim > 0 && (read_freq_ctr(&global.comp_bps_out) > global.comp_rate_lim)) || /* rate */
(idle_pct < compress_min_idle)) { /* idle */ (ti->idle_pct < compress_min_idle)) { /* idle */
/* decrease level */ /* decrease level */
if (comp_ctx->cur_lvl > 0) { if (comp_ctx->cur_lvl > 0) {
comp_ctx->cur_lvl--; comp_ctx->cur_lvl--;

4
src/flt_http_comp.c
View File

@ -929,7 +929,7 @@ http_select_comp_reshdr(struct comp_state *st, struct stream *s, struct http_msg
goto fail; goto fail;
/* limit cpu usage */ /* limit cpu usage */
if (idle_pct < compress_min_idle) if (ti->idle_pct < compress_min_idle)
goto fail; goto fail;
/* initialize compression */ /* initialize compression */
@ -1040,7 +1040,7 @@ htx_select_comp_reshdr(struct comp_state *st, struct stream *s, struct http_msg
goto fail; goto fail;
/* limit cpu usage */ /* limit cpu usage */
if (idle_pct < compress_min_idle) if (ti->idle_pct < compress_min_idle)
goto fail; goto fail;
/* initialize compression */ /* initialize compression */

4
src/stats.c
View File

@ -2433,7 +2433,7 @@ static void stats_dump_html_info(struct stream_interface *si, struct uri_auth *u
global.rlimit_nofile, global.rlimit_nofile,
global.maxsock, global.maxconn, global.maxpipes, global.maxsock, global.maxconn, global.maxpipes,
actconn, pipes_used, pipes_used+pipes_free, read_freq_ctr(&global.conn_per_sec), actconn, pipes_used, pipes_used+pipes_free, read_freq_ctr(&global.conn_per_sec),
tasks_run_queue_cur, nb_tasks_cur, idle_pct tasks_run_queue_cur, nb_tasks_cur, ti->idle_pct
); );
/* scope_txt = search query, appctx->ctx.stats.scope_len is always <= STAT_SCOPE_TXT_MAXLEN */ /* scope_txt = search query, appctx->ctx.stats.scope_len is always <= STAT_SCOPE_TXT_MAXLEN */
@ -3643,7 +3643,7 @@ int stats_fill_info(struct field *info, int len)
#endif #endif
info[INF_TASKS] = mkf_u32(0, nb_tasks_cur); info[INF_TASKS] = mkf_u32(0, nb_tasks_cur);
info[INF_RUN_QUEUE] = mkf_u32(0, tasks_run_queue_cur); info[INF_RUN_QUEUE] = mkf_u32(0, tasks_run_queue_cur);
info[INF_IDLE_PCT] = mkf_u32(FN_AVG, idle_pct); info[INF_IDLE_PCT] = mkf_u32(FN_AVG, ti->idle_pct);
info[INF_NODE] = mkf_str(FO_CONFIG|FN_OUTPUT|FS_SERVICE, global.node); info[INF_NODE] = mkf_str(FO_CONFIG|FN_OUTPUT|FS_SERVICE, global.node);
if (global.desc) if (global.desc)
info[INF_DESCRIPTION] = mkf_str(FO_CONFIG|FN_OUTPUT|FS_SERVICE, global.desc); info[INF_DESCRIPTION] = mkf_str(FO_CONFIG|FN_OUTPUT|FS_SERVICE, global.desc);

5
src/time.c
View File

@ -23,14 +23,11 @@ THREAD_LOCAL unsigned int ms_left_scaled; /* milliseconds left for current se
THREAD_LOCAL unsigned int now_ms; /* internal date in milliseconds (may wrap) */ THREAD_LOCAL unsigned int now_ms; /* internal date in milliseconds (may wrap) */
THREAD_LOCAL unsigned int samp_time; /* total elapsed time over current sample */ THREAD_LOCAL unsigned int samp_time; /* total elapsed time over current sample */
THREAD_LOCAL unsigned int idle_time; /* total idle time over current sample */ THREAD_LOCAL unsigned int idle_time; /* total idle time over current sample */
THREAD_LOCAL unsigned int idle_pct; /* idle to total ratio over last sample (percent) */
THREAD_LOCAL struct timeval now; /* internal date is a monotonic function of real clock */ THREAD_LOCAL struct timeval now; /* internal date is a monotonic function of real clock */
THREAD_LOCAL struct timeval date; /* the real current date */ THREAD_LOCAL struct timeval date; /* the real current date */
struct timeval start_date; /* the process's start date */ struct timeval start_date; /* the process's start date */
THREAD_LOCAL struct timeval before_poll; /* system date before calling poll() */ THREAD_LOCAL struct timeval before_poll; /* system date before calling poll() */
THREAD_LOCAL struct timeval after_poll; /* system date after leaving poll() */ THREAD_LOCAL struct timeval after_poll; /* system date after leaving poll() */
THREAD_LOCAL uint64_t prev_cpu_time = 0; /* previous per thread CPU time */
THREAD_LOCAL uint64_t prev_mono_time = 0; /* previous system wide monotonic time */
static THREAD_LOCAL struct timeval tv_offset; /* per-thread time ofsset relative to global time */ static THREAD_LOCAL struct timeval tv_offset; /* per-thread time ofsset relative to global time */
volatile unsigned long long global_now; /* common date between all threads (32:32) */ volatile unsigned long long global_now; /* common date between all threads (32:32) */
@ -188,7 +185,7 @@ REGPRM2 void tv_update_date(int max_wait, int interrupted)
adjusted = date; adjusted = date;
after_poll = date; after_poll = date;
samp_time = idle_time = 0; samp_time = idle_time = 0;
idle_pct = 100; ti->idle_pct = 100;
global_now = (((unsigned long long)adjusted.tv_sec) << 32) + global_now = (((unsigned long long)adjusted.tv_sec) << 32) +
(unsigned int)adjusted.tv_usec; (unsigned int)adjusted.tv_usec;
goto to_ms; goto to_ms;