upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- bug #361: Fix, time.elapsed variable not reset with stats_noreset.

Browse source 
git-svn-id: file:///svn/unbound/trunk@2396 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2011-02-24 12:16:12 +00:00
parent c2299a3c5f
commit ee6f5c5b51
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
daemon/remote.c
View file

@ -702,13 +702,14 @@ print_mem(SSL* ssl, struct worker* worker, struct daemon* daemon)
/** print uptime stats */ /** print uptime stats */
static int 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 now = *worker->env.now_tv;
struct timeval up, dt; struct timeval up, dt;
timeval_subtract(&up, &now, &worker->daemon->time_boot); timeval_subtract(&up, &now, &worker->daemon->time_boot);
timeval_subtract(&dt, &now, &worker->daemon->time_last_stat); 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", if(!ssl_printf(ssl, "time.now"SQ"%d.%6.6d\n",
(unsigned)now.tv_sec, (unsigned)now.tv_usec)) return 0; (unsigned)now.tv_sec, (unsigned)now.tv_usec)) return 0;
if(!ssl_printf(ssl, "time.up"SQ"%d.%6.6d\n", 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; total.mesh_time_median /= (double)daemon->num;
if(!print_stats(ssl, "total", &total)) if(!print_stats(ssl, "total", &total))
return; return;
if(!print_uptime(ssl, rc->worker)) if(!print_uptime(ssl, rc->worker, reset))
return; return;
if(daemon->cfg->stat_extended) { if(daemon->cfg->stat_extended) {
if(!print_mem(ssl, rc->worker, daemon)) if(!print_mem(ssl, rc->worker, daemon))

3
doc/Changelog
View file

@ -1,3 +1,6 @@
24 February 2011: Wouter
- bug #361: Fix, time.elapsed variable not reset with stats_noreset.
23 February 2011: Wouter 23 February 2011: Wouter
- iana portlist updated. - iana portlist updated.
- common.sh to version 3. - common.sh to version 3.