X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fstatistics%2Fgnunet-statistics.c;h=159afda53c5a7f919421312ad68e8defb1a92286;hb=09e5676aa96c2f98ba2a3914b8b2848978930b4d;hp=d05765c4acd7338a91275146845a1105bc284123;hpb=427dd6f998fb1fde515a3b5c800f9f6d308197b2;p=oweals%2Fgnunet.git diff --git a/src/statistics/gnunet-statistics.c b/src/statistics/gnunet-statistics.c index d05765c4a..159afda53 100644 --- a/src/statistics/gnunet-statistics.c +++ b/src/statistics/gnunet-statistics.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009 Christian Grothoff (and other contributing authors) + Copyright (C) 2001, 2002, 2004-2007, 2009, 2016 GNUnet e.V. GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /** @@ -29,7 +29,6 @@ #include "gnunet_statistics_service.h" #include "statistics.h" -#define GET_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1) /** * Final status code. @@ -69,7 +68,7 @@ static char *remote_host; /** * Remote host's port */ -static unsigned long long remote_port; +static unsigned long long remote_port; /** * Value to set @@ -81,6 +80,11 @@ static unsigned long long set_val; */ static int set_value; +/** + * Handle for pending GET operation. + */ +static struct GNUNET_STATISTICS_GetHandle *gh; + /** * Callback function to process statistic values. @@ -93,31 +97,42 @@ static int set_value; * @return #GNUNET_OK to continue, #GNUNET_SYSERR to abort iteration */ static int -printer (void *cls, const char *subsystem, const char *name, uint64_t value, +printer (void *cls, + const char *subsystem, + const char *name, + uint64_t value, int is_persistent) { struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get(); - const char * now_str; + const char *now_str; if (quiet == GNUNET_NO) { if (GNUNET_YES == watch) { - now_str = GNUNET_STRINGS_absolute_time_to_string(now); - FPRINTF (stdout, "%24s %s%12s %50s: %16llu \n", + now_str = GNUNET_STRINGS_absolute_time_to_string (now); + FPRINTF (stdout, + "%24s %s%12s %50s: %16llu\n", now_str, is_persistent ? "!" : " ", - subsystem, _(name), (unsigned long long) value); + subsystem, + _(name), + (unsigned long long) value); } else { - FPRINTF (stdout, "%s%12s %50s: %16llu \n", + FPRINTF (stdout, + "%s%12s %50s: %16llu\n", is_persistent ? "!" : " ", - subsystem, _(name), (unsigned long long) value); + subsystem, + _(name), + (unsigned long long) value); } } else - FPRINTF (stdout, "%llu\n", (unsigned long long) value); + FPRINTF (stdout, + "%llu\n", + (unsigned long long) value); return GNUNET_OK; } @@ -131,16 +146,21 @@ printer (void *cls, const char *subsystem, const char *name, uint64_t value, * successfully obtained, #GNUNET_SYSERR if not. */ static void -cleanup (void *cls, int success) +cleanup (void *cls, + int success) { - - if (success != GNUNET_OK) + gh = NULL; + if (GNUNET_OK != success) { if (NULL == remote_host) - FPRINTF (stderr, "%s", _("Failed to obtain statistics.\n")); + FPRINTF (stderr, + "%s", + _("Failed to obtain statistics.\n")); else - FPRINTF (stderr, _("Failed to obtain statistics from host `%s:%llu'\n"), - remote_host, remote_port); + FPRINTF (stderr, + _("Failed to obtain statistics from host `%s:%llu'\n"), + remote_host, + remote_port); ret = 1; } GNUNET_SCHEDULER_shutdown (); @@ -151,22 +171,31 @@ cleanup (void *cls, int success) * Function run on shutdown to clean up. * * @param cls the statistics handle - * @param tc scheduler context */ static void -shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +shutdown_task (void *cls) { struct GNUNET_STATISTICS_Handle *h = cls; if (NULL == h) return; + if (NULL != gh) + { + GNUNET_STATISTICS_get_cancel (gh); + gh = NULL; + } if ( (GNUNET_YES == watch) && (NULL != subsystem) && (NULL != name) ) GNUNET_assert (GNUNET_OK == - GNUNET_STATISTICS_watch_cancel (h, subsystem, name, &printer, h)); - GNUNET_STATISTICS_destroy (h, GNUNET_NO); - h = NULL; + GNUNET_STATISTICS_watch_cancel (h, + subsystem, + name, + &printer, + h)); + GNUNET_STATISTICS_destroy (h, + GNUNET_NO); + h = NULL; } @@ -174,40 +203,49 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) * Main task that does the actual work. * * @param cls closure with our configuration - * @param tc schedueler context */ static void -main_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +main_task (void *cls) { const struct GNUNET_CONFIGURATION_Handle *cfg = cls; struct GNUNET_STATISTICS_Handle *h; if (set_value) { - if (subsystem == NULL) + if (NULL == subsystem) { - FPRINTF (stderr, "%s", _("Missing argument: subsystem \n")); + FPRINTF (stderr, + "%s", + _("Missing argument: subsystem \n")); ret = 1; return; } - if (name == NULL) + if (NULL == name) { - FPRINTF (stderr, "%s", _("Missing argument: name\n")); + FPRINTF (stderr, + "%s", + _("Missing argument: name\n")); ret = 1; return; } - h = GNUNET_STATISTICS_create (subsystem, cfg); + h = GNUNET_STATISTICS_create (subsystem, + cfg); if (NULL == h) { ret = 1; return; } - GNUNET_STATISTICS_set (h, name, (uint64_t) set_val, persistent); - GNUNET_STATISTICS_destroy (h, GNUNET_YES); + GNUNET_STATISTICS_set (h, + name, + (uint64_t) set_val, + persistent); + GNUNET_STATISTICS_destroy (h, + GNUNET_YES); h = NULL; return; } - if (NULL == (h = GNUNET_STATISTICS_create ("gnunet-statistics", cfg))) + if (NULL == (h = GNUNET_STATISTICS_create ("gnunet-statistics", + cfg))) { ret = 1; return; @@ -215,76 +253,43 @@ main_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) if (GNUNET_NO == watch) { if (NULL == - GNUNET_STATISTICS_get (h, subsystem, name, GET_TIMEOUT, &cleanup, - &printer, h)) - cleanup (h, GNUNET_SYSERR); + (gh = GNUNET_STATISTICS_get (h, + subsystem, + name, + &cleanup, + &printer, + h)) ) + cleanup (h, + GNUNET_SYSERR); } else { - if ((NULL == subsystem) || (NULL == name)) + if ( (NULL == subsystem) || + (NULL == name) ) { printf (_("No subsystem or name given\n")); - GNUNET_STATISTICS_destroy (h, GNUNET_NO); + GNUNET_STATISTICS_destroy (h, + GNUNET_NO); h = NULL; ret = 1; return; } - if (GNUNET_OK != GNUNET_STATISTICS_watch (h, subsystem, name, &printer, h)) - { - fprintf (stderr, _("Failed to initialize watch routine\n")); - GNUNET_SCHEDULER_add_now (&shutdown_task, h); - return; - } - } - GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, - &shutdown_task, h); - -} - - -/** - * Function called with th test result to see if the resolver is - * running. - * - * @param cls closure with our configuration - * @param result #GNUNET_YES if the resolver is running - */ -static void -resolver_test_task (void *cls, - int result) -{ - struct GNUNET_CONFIGURATION_Handle *cfg = cls; - - if (GNUNET_YES != result) - { - FPRINTF (stderr, - _("Trying to connect to remote host, but service `%s' is not running\n"), "resolver"); - return; - } - /* connect to a remote host */ - if (0 == remote_port) - { - if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (cfg, "statistics", "PORT", &remote_port)) + if (GNUNET_OK != + GNUNET_STATISTICS_watch (h, + subsystem, + name, + &printer, + h)) { - FPRINTF (stderr, _("A port is required to connect to host `%s'\n"), remote_host); + fprintf (stderr, + _("Failed to initialize watch routine\n")); + GNUNET_SCHEDULER_add_now (&shutdown_task, + h); return; } } - else if (65535 <= remote_port) - { - FPRINTF (stderr, - _("A port has to be between 1 and 65535 to connect to host `%s'\n"), remote_host); - return; - } - - /* Manipulate configuration */ - GNUNET_CONFIGURATION_set_value_string (cfg, - "statistics", "UNIXPATH", ""); - GNUNET_CONFIGURATION_set_value_string (cfg, - "statistics", "HOSTNAME", remote_host); - GNUNET_CONFIGURATION_set_value_number (cfg, - "statistics", "PORT", remote_port); - GNUNET_SCHEDULER_add_now (&main_task, cfg); + GNUNET_SCHEDULER_add_shutdown (&shutdown_task, + h); } @@ -297,25 +302,69 @@ resolver_test_task (void *cls, * @param cfg configuration */ static void -run (void *cls, char *const *args, const char *cfgfile, +run (void *cls, + char *const *args, + const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) { + struct GNUNET_CONFIGURATION_Handle *c; + + c = (struct GNUNET_CONFIGURATION_Handle *) cfg; set_value = GNUNET_NO; if (NULL != args[0]) { - if (1 != SSCANF (args[0], "%llu", &set_val)) + if (1 != SSCANF (args[0], + "%llu", + &set_val)) { - FPRINTF (stderr, _("Invalid argument `%s'\n"), args[0]); + FPRINTF (stderr, + _("Invalid argument `%s'\n"), + args[0]); ret = 1; return; } set_value = GNUNET_YES; } if (NULL != remote_host) - GNUNET_CLIENT_service_test ("resolver", cfg, GNUNET_TIME_UNIT_SECONDS, - &resolver_test_task, (void *) cfg); - else - GNUNET_SCHEDULER_add_now (&main_task, (void *) cfg); + { + if (0 == remote_port) + { + if (GNUNET_SYSERR == + GNUNET_CONFIGURATION_get_value_number (cfg, + "statistics", + "PORT", + &remote_port)) + { + FPRINTF (stderr, + _("A port is required to connect to host `%s'\n"), + remote_host); + return; + } + } + else if (65535 <= remote_port) + { + FPRINTF (stderr, + _("A port has to be between 1 and 65535 to connect to host `%s'\n"), + remote_host); + return; + } + + /* Manipulate configuration */ + GNUNET_CONFIGURATION_set_value_string (c, + "statistics", + "UNIXPATH", + ""); + GNUNET_CONFIGURATION_set_value_string (c, + "statistics", + "HOSTNAME", + remote_host); + GNUNET_CONFIGURATION_set_value_number (c, + "statistics", + "PORT", + remote_port); + } + GNUNET_SCHEDULER_add_now (&main_task, + c); } @@ -329,40 +378,62 @@ run (void *cls, char *const *args, const char *cfgfile, int main (int argc, char *const *argv) { - static const struct GNUNET_GETOPT_CommandLineOption options[] = { - {'n', "name", "NAME", - gettext_noop ("limit output to statistics 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}, - {'q', "quiet", NULL, - gettext_noop ("just print the statistics value"), 0, - &GNUNET_GETOPT_set_one, &quiet}, - {'w', "watch", NULL, - gettext_noop ("watch value continuously"), 0, - &GNUNET_GETOPT_set_one, &watch}, - {'r', "remote", NULL, - gettext_noop ("connect to remote host"), 1, - &GNUNET_GETOPT_set_string, &remote_host}, - {'o', "port", NULL, - gettext_noop ("port for remote host"), 1, - &GNUNET_GETOPT_set_uint, &remote_port}, + struct GNUNET_GETOPT_CommandLineOption options[] = { + GNUNET_GETOPT_option_string ('n', + "name", + "NAME", + gettext_noop ("limit output to statistics for the given NAME"), + &name), + + GNUNET_GETOPT_option_flag ('p', + "persistent", + gettext_noop ("make the value being set persistent"), + &persistent), + + GNUNET_GETOPT_option_string ('s', + "subsystem", + "SUBSYSTEM", + gettext_noop ("limit output to the given SUBSYSTEM"), + &subsystem), + + GNUNET_GETOPT_option_flag ('q', + "quiet", + gettext_noop ("just print the statistics value"), + &quiet), + + GNUNET_GETOPT_option_flag ('w', + "watch", + gettext_noop ("watch value continuously"), + &watch), + + GNUNET_GETOPT_option_string ('r', + "remote", + "REMOTE", + gettext_noop ("connect to remote host"), + &remote_host), + GNUNET_GETOPT_option_ulong ('o', + "port", + "PORT", + gettext_noop ("port for remote host"), + &remote_port), GNUNET_GETOPT_OPTION_END }; remote_port = 0; remote_host = NULL; - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) + if (GNUNET_OK != + GNUNET_STRINGS_get_utf8_args (argc, argv, + &argc, &argv)) return 2; ret = (GNUNET_OK == - GNUNET_PROGRAM_run (argc, argv, "gnunet-statistics [options [value]]", + GNUNET_PROGRAM_run (argc, + argv, + "gnunet-statistics [options [value]]", gettext_noop ("Print statistics about GNUnet operations."), - options, &run, NULL)) ? ret : 1; + options, + &run, + NULL)) ? ret : 1; GNUNET_free_non_null (remote_host); GNUNET_free ((void*) argv); return ret;