spacing

[oweals/gnunet.git] / src / statistics / gnunet-statistics.c

diff --git a/src/statistics/gnunet-statistics.c b/src/statistics/gnunet-statistics.c
index bafb77c66b1aa640359f8715f9f900c078f266a4..0cbafa68faf30fe8e1b7c366f86131e648d015dc 100644 (file)
--- a/src/statistics/gnunet-statistics.c
+++ b/src/statistics/gnunet-statistics.c
@@ -4,7 +4,7 @@
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -30,7 +30,7 @@
 #include "gnunet_statistics_service.h"
 #include "statistics.h"
 
-#define GET_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15)
+#define GET_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1)
 
 /**
  * Final status code.
@@ -65,11 +65,13 @@ static int persistent;
 static int
 printer (void *cls,
          const char *subsystem,
-         const char *sname, unsigned long long value, int is_persistent)
+         const char *name, 
+        uint64_t value, int is_persistent)
 {
   FPRINTF (stdout,
-           "%s%-20s %-40s: %16llu\n",
-           is_persistent ? "!" : " ", subsystem, _(sname), value);
+           "%s%-12s %-50s: %16llu\n",
+           is_persistent ? "!" : " ", subsystem, _(name),
+          (unsigned long long) value);
   return GNUNET_OK;
 }
 
@@ -87,9 +89,14 @@ cleanup (void *cls, int success)
   struct GNUNET_STATISTICS_Handle *h = cls;
 
   if (success != GNUNET_OK)
-    ret = 1;
+    {
+      fprintf (stderr,
+              _("Failed to obtain statistics.\n"));
+      ret = 1;
+    }
   if (h != NULL)
-    GNUNET_STATISTICS_destroy (h);
+    GNUNET_STATISTICS_destroy (h,
+                              GNUNET_NO);
 }
 
 
@@ -97,16 +104,15 @@ cleanup (void *cls, int success)
  * Main function that will be run by the scheduler.
  *
  * @param cls closure
- * @param sched the scheduler to use
  * @param args remaining command-line arguments
  * @param cfgfile name of the configuration file used (for saving, can be NULL!)
  * @param cfg configuration
  */
 static void
 run (void *cls,
-     struct GNUNET_SCHEDULER_Handle *sched,
      char *const *args,
-     const char *cfgfile, struct GNUNET_CONFIGURATION_Handle *cfg)
+     const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   struct GNUNET_STATISTICS_Handle *h;
   unsigned long long val;
@@ -120,43 +126,27 @@ run (void *cls,
           ret = 1;
           return;
         }
-      h = GNUNET_STATISTICS_create (sched, subsystem, cfg);
+      h = GNUNET_STATISTICS_create (subsystem, cfg);
       if (h == NULL)
         {
           ret = 1;
           return;
         }
-      GNUNET_STATISTICS_set (h, name, val, persistent);
-      GNUNET_STATISTICS_destroy (h);
+      GNUNET_STATISTICS_set (h, name, (uint64_t) val, persistent);
+      GNUNET_STATISTICS_destroy (h, GNUNET_YES);
       return;
     }
-  h = GNUNET_STATISTICS_create (sched, "gnunet-statistics", cfg);
+  h = GNUNET_STATISTICS_create ("gnunet-statistics", cfg);
   if (h == NULL)
     {
       ret = 1;
       return;
     }
-  GNUNET_STATISTICS_get (h,
-                         subsystem, name, GET_TIMEOUT, &cleanup, &printer, h);
+  if (NULL == GNUNET_STATISTICS_get (h,
+                                    subsystem, name, GET_TIMEOUT, &cleanup, &printer, h))
+    cleanup (h, GNUNET_SYSERR);
 }
 
-/**
- * gnunet-statistics command line options
- */
-static struct GNUNET_GETOPT_CommandLineOption options[] = {
-  {'n', "name", "NAME",
-   gettext_noop ("limit output to statistcs for the given NAME"), 1,
-   &GNUNET_GETOPT_set_string, &name},
-  {'p', "persistent", NULL,
-   gettext_noop ("make the value being set persistent"), 0,
-   &GNUNET_GETOPT_set_one, &persistent},
-  {'s', "subsystem", "SUBSYSTEM",
-   gettext_noop ("limit output to the given SUBSYSTEM"), 1,
-   &GNUNET_GETOPT_set_string, &subsystem},
-  GNUNET_GETOPT_OPTION_END
-};
-
-
 /**
  * The main function to obtain statistics in GNUnet.
  *
@@ -167,10 +157,22 @@ static struct GNUNET_GETOPT_CommandLineOption options[] = {
 int
 main (int argc, char *const *argv)
 {
+  static const struct GNUNET_GETOPT_CommandLineOption options[] = {
+    {'n', "name", "NAME",
+     gettext_noop ("limit output to statistcs for the given NAME"), 1,
+     &GNUNET_GETOPT_set_string, &name},
+    {'p', "persistent", NULL,
+     gettext_noop ("make the value being set persistent"), 0,
+     &GNUNET_GETOPT_set_one, &persistent},
+    {'s', "subsystem", "SUBSYSTEM",
+     gettext_noop ("limit output to the given SUBSYSTEM"), 1,
+     &GNUNET_GETOPT_set_string, &subsystem},
+    GNUNET_GETOPT_OPTION_END
+  };
   return (GNUNET_OK ==
           GNUNET_PROGRAM_run (argc,
                               argv,
-                              "gnunet-statistics",
+                              "gnunet-statistics [options [value]]",
                               gettext_noop
                               ("Print statistics about GNUnet operations."),
                               options, &run, NULL)) ? ret : 1;