From ee6f5c5b51e5edf1766f58a96eabd03dd4ee37e3 Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Thu, 24 Feb 2011 12:16:12 +0000 Subject: [PATCH] - bug #361: Fix, time.elapsed variable not reset with stats_noreset. git-svn-id: file:///svn/unbound/trunk@2396 be551aaa-1e26-0410-a405-d3ace91eadb9 --- daemon/remote.c | 7 ++++--- doc/Changelog | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 4b10735fd..a5e10b4ff 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -702,13 +702,14 @@ print_mem(SSL* ssl, struct worker* worker, struct daemon* daemon) /** print uptime stats */ static int -print_uptime(SSL* ssl, struct worker* worker) +print_uptime(SSL* ssl, struct worker* worker, int reset) { struct timeval now = *worker->env.now_tv; struct timeval up, dt; timeval_subtract(&up, &now, &worker->daemon->time_boot); timeval_subtract(&dt, &now, &worker->daemon->time_last_stat); - worker->daemon->time_last_stat = now; + if(reset) + worker->daemon->time_last_stat = now; if(!ssl_printf(ssl, "time.now"SQ"%d.%6.6d\n", (unsigned)now.tv_sec, (unsigned)now.tv_usec)) return 0; if(!ssl_printf(ssl, "time.up"SQ"%d.%6.6d\n", @@ -892,7 +893,7 @@ do_stats(SSL* ssl, struct daemon_remote* rc, int reset) total.mesh_time_median /= (double)daemon->num; if(!print_stats(ssl, "total", &total)) return; - if(!print_uptime(ssl, rc->worker)) + if(!print_uptime(ssl, rc->worker, reset)) return; if(daemon->cfg->stat_extended) { if(!print_mem(ssl, rc->worker, daemon)) diff --git a/doc/Changelog b/doc/Changelog index 1930e578a..344e804a1 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,6 @@ +24 February 2011: Wouter + - bug #361: Fix, time.elapsed variable not reset with stats_noreset. + 23 February 2011: Wouter - iana portlist updated. - common.sh to version 3. -- 2.47.2