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
#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.
uint64_t value, int is_persistent)
{
FPRINTF (stdout,
- "%s%-20s %-40s: %16llu\n",
+ "%s%-12s %-50s: %16llu\n",
is_persistent ? "!" : " ", subsystem, _(name),
(unsigned long long) value);
return GNUNET_OK;
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);
}
return;
}
GNUNET_STATISTICS_set (h, name, (uint64_t) val, persistent);
- GNUNET_STATISTICS_destroy (h);
+ GNUNET_STATISTICS_destroy (h, GNUNET_YES);
return;
}
h = GNUNET_STATISTICS_create (sched, "gnunet-statistics", cfg);
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.
*
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;