From 487556e68e0b4f3a7f06b4d507ac075c8d7b7f99 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 17 Nov 2014 12:58:25 +0100 Subject: [PATCH] s3:smbprofile: report idle state of 'idle_count' and 'idle_time' Signed-off-by: Stefan Metzmacher Reviewed-by: Jeremy Allison --- source3/include/smbprofile.h | 2 +- source3/smbd/process.c | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/source3/include/smbprofile.h b/source3/include/smbprofile.h index ba7a0b33fce..bafd693b34c 100644 --- a/source3/include/smbprofile.h +++ b/source3/include/smbprofile.h @@ -27,12 +27,12 @@ SMBPROFILE_STATS_START \ \ SMBPROFILE_STATS_SECTION_START("SMBD loop") \ + SMBPROFILE_STATS_BASIC(idle) \ SMBPROFILE_STATS_COUNT(request) \ SMBPROFILE_STATS_BASIC(push_sec_ctx) \ SMBPROFILE_STATS_BASIC(set_sec_ctx) \ SMBPROFILE_STATS_BASIC(set_root_sec_ctx) \ SMBPROFILE_STATS_BASIC(pop_sec_ctx) \ - SMBPROFILE_STATS_BASIC(smbd_idle) \ SMBPROFILE_STATS_SECTION_END \ \ SMBPROFILE_STATS_SECTION_START("System Calls") \ diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 9d19829f29d..2e611e2537e 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -3500,7 +3500,7 @@ NTSTATUS smbXsrv_connection_init_tables(struct smbXsrv_connection *conn, struct smbd_tevent_trace_state { TALLOC_CTX *frame; - uint64_t smbd_idle_profstamp; + SMBPROFILE_BASIC_ASYNC_STATE(profile_idle); }; static void smbd_tevent_trace_callback(enum tevent_trace_point point, @@ -3511,15 +3511,10 @@ static void smbd_tevent_trace_callback(enum tevent_trace_point point, switch (point) { case TEVENT_TRACE_BEFORE_WAIT: - /* - * This just removes compiler warning - * without profile support - */ - state->smbd_idle_profstamp = 0; - START_PROFILE_STAMP(smbd_idle, state->smbd_idle_profstamp); + SMBPROFILE_BASIC_ASYNC_START(idle, profile_p, state->profile_idle); break; case TEVENT_TRACE_AFTER_WAIT: - END_PROFILE_STAMP(smbd_idle, state->smbd_idle_profstamp); + SMBPROFILE_BASIC_ASYNC_END(state->profile_idle); break; case TEVENT_TRACE_BEFORE_LOOP_ONCE: TALLOC_FREE(state->frame); -- 2.11.4.GIT