qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Print reload count in nscd statistics.

This commit is contained in:
Ulrich Drepper 2010-04-08 19:58:29 -07:00
parent 42464d7fe8
commit d55d558b4e
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,5 +1,10 @@
2010-04-08 Ulrich Drepper <drepper@redhat.com> 2010-04-08 Ulrich Drepper <drepper@redhat.com>
[BZ #10915]
* nscd/nscd_stat.c (struct statdata): Add reload_count field.
(send_stats): Fill in reload_count.
(receive_print_stats): Print reload_count.
* sysdeps/unix/sysv/linux/getlogin_r.c (__getlogin_r_loginuid): When * sysdeps/unix/sysv/linux/getlogin_r.c (__getlogin_r_loginuid): When
reading the loginuid file use a buffer which is always large enough. reading the loginuid file use a buffer which is always large enough.
NUL-terminate the string. NUL-terminate the string.

9
nscd/nscd_stat.c
View File

@ -1,4 +1,4 @@
/* Copyright (c) 1998, 2003, 2004, 2005 Free Software Foundation, Inc. /* Copyright (c) 1998, 2003, 2004, 2005, 2010 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1998. Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1998.
@ -80,6 +80,7 @@ struct statdata
int max_nthreads; int max_nthreads;
int paranoia; int paranoia;
time_t restart_interval; time_t restart_interval;
unsigned int reload_count;
int ndbs; int ndbs;
struct dbstat dbs[lastdb]; struct dbstat dbs[lastdb];
#ifdef HAVE_SELINUX #ifdef HAVE_SELINUX
@ -102,6 +103,7 @@ send_stats (int fd, struct database_dyn dbs[lastdb])
data.max_nthreads = max_nthreads; data.max_nthreads = max_nthreads;
data.paranoia = paranoia; data.paranoia = paranoia;
data.restart_interval = restart_interval; data.restart_interval = restart_interval;
data.reload_count = reload_count;
data.ndbs = lastdb; data.ndbs = lastdb;
for (cnt = 0; cnt < lastdb; ++cnt) for (cnt = 0; cnt < lastdb; ++cnt)
@ -240,10 +242,11 @@ receive_print_stats (void)
"%15d maximum number of threads\n" "%15d maximum number of threads\n"
"%15lu number of times clients had to wait\n" "%15lu number of times clients had to wait\n"
"%15s paranoia mode enabled\n" "%15s paranoia mode enabled\n"
"%15lu restart internal\n"), "%15lu restart internal\n"
"%15u reload count\n"),
data.nthreads, data.max_nthreads, data.client_queued, data.nthreads, data.max_nthreads, data.client_queued,
data.paranoia ? yesstr : nostr, data.paranoia ? yesstr : nostr,
(unsigned long int) data.restart_interval); (unsigned long int) data.restart_interval, data.reload_count);
for (i = 0; i < lastdb; ++i) for (i = 0; i < lastdb; ++i)
{ {