Print reload count in nscd statistics.

diff --git a/ChangeLog b/ChangeLog
index 540d1b4f5e8ba11047664833ed5a5674d6b6a2da..fe493ba40888c114fa87d8f8a17f171f9faedb47 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 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
        reading the loginuid file use a buffer which is always large enough.
        NUL-terminate the string.

diff --git a/nscd/nscd_stat.c b/nscd/nscd_stat.c
index 7f6bd1c83e53a300742a5ccf21b4c12d630cc8a4..658fd56fa364476ec2347adb5fbc3fc9fcf4cd3a 100644 (file)
--- a/nscd/nscd_stat.c
+++ b/nscd/nscd_stat.c
@@ -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.
    Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1998.
 
@@ -80,6 +80,7 @@ struct statdata
   int max_nthreads;
   int paranoia;
   time_t restart_interval;
+  unsigned int reload_count;
   int ndbs;
   struct dbstat dbs[lastdb];
 #ifdef HAVE_SELINUX
@@ -102,6 +103,7 @@ send_stats (int fd, struct database_dyn dbs[lastdb])
   data.max_nthreads = max_nthreads;
   data.paranoia = paranoia;
   data.restart_interval = restart_interval;
+  data.reload_count = reload_count;
   data.ndbs = lastdb;
 
   for (cnt = 0; cnt < lastdb; ++cnt)
@@ -240,10 +242,11 @@ receive_print_stats (void)
            "%15d  maximum number of threads\n"
            "%15lu  number of times clients had to wait\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.paranoia ? yesstr : nostr,
-         (unsigned long int) data.restart_interval);
+         (unsigned long int) data.restart_interval, data.reload_count);
 
   for (i = 0; i < lastdb; ++i)
     {