X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Farm%2Fgnunet-arm.c;h=3b024ea93f183b41ebea20bb91df2f2ae6daece6;hb=4ab32191fbd53680ff5192fc7d53a21c67ae772d;hp=a492fac5b14ea502888ec2fb75463c26dce615d1;hpb=2032baa561c7fefbe2605f5d6b979a295a61637d;p=oweals%2Fgnunet.git diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c index a492fac5b..3b024ea93 100644 --- a/src/arm/gnunet-arm.c +++ b/src/arm/gnunet-arm.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - (C) 2009, 2012, 2013 Christian Grothoff (and other contributing authors) + Copyright (C) 2009, 2012, 2013 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. */ /** @@ -28,28 +28,6 @@ #include "gnunet_constants.h" #include "gnunet_util_lib.h" -/** - * Timeout for stopping services. Long to give some services a real chance. - */ -#define STOP_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 1) - -/** - * Timeout for stopping ARM. Extra-long since ARM needs to stop everyone else. - */ -#define STOP_TIMEOUT_ARM GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 2) - -/** - * Timeout for starting services, very short because of the strange way start works - * (by checking if running before starting, so really this time is always waited on - * startup (annoying)). - */ -#define START_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1) - -/** - * Timeout for listing all running services. - */ -#define LIST_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 2) - /** * Set if we are to shutdown all services (including ARM). */ @@ -132,6 +110,7 @@ static unsigned int phase; /** * User defined timestamp for completing operations. + * FIXME: to be implemented! */ static struct GNUNET_TIME_Relative timeout; @@ -145,6 +124,15 @@ static unsigned int no_stdout; */ static unsigned int no_stderr; +/** + * Handle for the task running the #action_loop(). + */ +static struct GNUNET_SCHEDULER_Task *al_task; + +/** + * Current operation. + */ +static struct GNUNET_ARM_Operation *op; /** * Attempts to delete configuration file and GNUNET_HOME @@ -179,19 +167,28 @@ delete_files () * jobs that we've been asked to do in order. * * @param cls closure, unused - * @param tc context, unused */ static void -shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +shutdown_task (void *cls) { + if (NULL != al_task) + { + GNUNET_SCHEDULER_cancel (al_task); + al_task = NULL; + } + if (NULL != op) + { + GNUNET_ARM_operation_cancel (op); + op = NULL; + } if (NULL != h) { - GNUNET_ARM_disconnect_and_free (h); + GNUNET_ARM_disconnect (h); h = NULL; } if (NULL != m) { - GNUNET_ARM_monitor_disconnect_and_free (m); + GNUNET_ARM_monitor_stop (m); m = NULL; } if ((GNUNET_YES == end) && (GNUNET_YES == delete)) @@ -220,8 +217,6 @@ req_string (enum GNUNET_ARM_RequestStatus rs) return _("We disconnected from ARM before we could send a request"); case GNUNET_ARM_REQUEST_BUSY: return _("ARM API is busy"); - case GNUNET_ARM_REQUEST_TOO_LONG: - return _("Request does not fit into a message"); case GNUNET_ARM_REQUEST_TIMEOUT: return _("Request timed out"); } @@ -269,10 +264,9 @@ ret_string (enum GNUNET_ARM_Result result) * Main task that runs our various operations in order. * * @param cls closure - * @param tc scheudler context */ static void -action_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc); +action_loop (void *cls); /** @@ -281,8 +275,8 @@ action_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc); * our first attempt. * * @param cls closure - * @param connected GNUNET_YES if connected, GNUNET_NO if disconnected, - * GNUNET_SYSERR on error. + * @param connected #GNUNET_YES if connected, #GNUNET_NO if disconnected, + * #GNUNET_SYSERR on error. */ static void conn_status (void *cls, @@ -310,17 +304,17 @@ conn_status (void *cls, * * @param cls closure unused * @param rs what happened to our request - * @param service name of the service we tried to start ("arm") * @param result if the request was processed, this is the result * according to ARM */ static void start_callback (void *cls, - enum GNUNET_ARM_RequestStatus rs, const char *service, + enum GNUNET_ARM_RequestStatus rs, enum GNUNET_ARM_Result result) { char *msg; + op = NULL; if (GNUNET_ARM_REQUEST_SENT_OK != rs) { GNUNET_asprintf (&msg, "%s", _("Failed to start the ARM service: %s\n")); @@ -338,9 +332,10 @@ start_callback (void *cls, GNUNET_SCHEDULER_shutdown (); return; } - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM service [re]start successful\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "ARM service [re]start successful\n"); start = 0; - GNUNET_SCHEDULER_add_now (action_loop, NULL); + al_task = GNUNET_SCHEDULER_add_now (&action_loop, NULL); } @@ -352,17 +347,17 @@ start_callback (void *cls, * * @param cls closure unused * @param rs what happened to our request - * @param service name of the service we tried to start ("arm") * @param result if the request was processed, this is the result * according to ARM */ static void stop_callback (void *cls, - enum GNUNET_ARM_RequestStatus rs, const char *service, + enum GNUNET_ARM_RequestStatus rs, enum GNUNET_ARM_Result result) { char *msg; + op = NULL; if (GNUNET_ARM_REQUEST_SENT_OK != rs) { GNUNET_asprintf (&msg, "%s", @@ -376,7 +371,8 @@ stop_callback (void *cls, (GNUNET_ARM_RESULT_STOPPED != result) && (GNUNET_ARM_RESULT_IS_STOPPED_ALREADY != result)) { - GNUNET_asprintf (&msg, "%s", _("Failed to stop the ARM service: %s\n")); + GNUNET_asprintf (&msg, "%s", + _("Failed to stop the ARM service: %s\n")); FPRINTF (stdout, msg, ret_string (result)); GNUNET_free (msg); GNUNET_SCHEDULER_shutdown (); @@ -392,7 +388,7 @@ stop_callback (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Initiating an ARM restart\n"); } - GNUNET_SCHEDULER_add_now (&action_loop, NULL); + al_task = GNUNET_SCHEDULER_add_now (&action_loop, NULL); } @@ -404,20 +400,22 @@ stop_callback (void *cls, * * @param cls closure unused * @param rs what happened to our request - * @param service name of the service we tried to start * @param result if the request was processed, this is the result * according to ARM */ static void init_callback (void *cls, - enum GNUNET_ARM_RequestStatus rs, const char *service, + enum GNUNET_ARM_RequestStatus rs, enum GNUNET_ARM_Result result) { char *msg; + op = NULL; if (GNUNET_ARM_REQUEST_SENT_OK != rs) { - GNUNET_asprintf (&msg, _("Failed to send a request to start the `%s' service: %%s\n"), init); + GNUNET_asprintf (&msg, + _("Failed to send a request to start the `%s' service: %%s\n"), + init); FPRINTF (stdout, msg, req_string (rs)); GNUNET_free (msg); GNUNET_SCHEDULER_shutdown (); @@ -426,9 +424,11 @@ init_callback (void *cls, if ((GNUNET_ARM_RESULT_STARTING != result) && (GNUNET_ARM_RESULT_IS_STARTED_ALREADY != result)) { - GNUNET_asprintf (&msg, _("Failed to start the `%s' service: %s\n"), - init, ret_string (result)); - FPRINTF (stdout, msg, service); + GNUNET_asprintf (&msg, + _("Failed to start the `%s' service: %s\n"), + init, + ret_string (result)); + FPRINTF (stdout, "%s", msg); GNUNET_free (msg); GNUNET_SCHEDULER_shutdown (); return; @@ -436,8 +436,9 @@ init_callback (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Service %s [re]started successfully\n", init); + GNUNET_free (init); init = NULL; - GNUNET_SCHEDULER_add_now (&action_loop, NULL); + al_task = GNUNET_SCHEDULER_add_now (&action_loop, NULL); } @@ -449,16 +450,17 @@ init_callback (void *cls, * * @param cls closure unused * @param rs what happened to our request - * @param service name of the service we tried to start * @param result if the request was processed, this is the result * according to ARM */ static void term_callback (void *cls, - enum GNUNET_ARM_RequestStatus rs, const char *service, + enum GNUNET_ARM_RequestStatus rs, enum GNUNET_ARM_Result result) { char *msg; + + op = NULL; if (GNUNET_ARM_REQUEST_SENT_OK != rs) { GNUNET_asprintf (&msg, @@ -475,16 +477,18 @@ term_callback (void *cls, GNUNET_asprintf (&msg, _("Failed to kill the `%s' service: %s\n"), term, ret_string (result)); - FPRINTF (stdout, msg, service); + FPRINTF (stdout, "%s", msg); GNUNET_free (msg); GNUNET_SCHEDULER_shutdown (); return; } GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Service %s stopped successfully\n", term); + "Service %s stopped successfully\n", + term); + GNUNET_free (term); term = NULL; - GNUNET_SCHEDULER_add_now (&action_loop, NULL); + al_task = GNUNET_SCHEDULER_add_now (&action_loop, NULL); } @@ -500,30 +504,37 @@ term_callback (void *cls, */ static void list_callback (void *cls, - enum GNUNET_ARM_RequestStatus rs, unsigned int count, + enum GNUNET_ARM_RequestStatus rs, + unsigned int count, const char *const*list) { unsigned int i; + op = NULL; if (GNUNET_ARM_REQUEST_SENT_OK != rs) { char *msg; - GNUNET_asprintf (&msg, "%s", _("Failed to request a list of services: %s\n")); + GNUNET_asprintf (&msg, "%s", + _("Failed to request a list of services: %s\n")); FPRINTF (stdout, msg, req_string (rs)); GNUNET_free (msg); + ret = 3; GNUNET_SCHEDULER_shutdown (); } if (NULL == list) { - FPRINTF (stderr, "%s", _("Error communicating with ARM. ARM not running?\n")); + FPRINTF (stderr, "%s", + _("Error communicating with ARM. ARM not running?\n")); GNUNET_SCHEDULER_shutdown (); + ret = 3; return; } - FPRINTF (stdout, "%s", _("Running services:\n")); + if (! quiet) + FPRINTF (stdout, "%s", _("Running services:\n")); for (i = 0; i < count; i++) FPRINTF (stdout, "%s\n", list[i]); - GNUNET_SCHEDULER_add_now (&action_loop, NULL); + al_task = GNUNET_SCHEDULER_add_now (&action_loop, NULL); } @@ -532,14 +543,13 @@ list_callback (void *cls, * do, in order. * * @param cls closure, unused - * @param tc context, unused */ static void -action_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +action_loop (void *cls) { - if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) - return; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Running requested actions\n"); + al_task = NULL; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Running requested actions\n"); while (1) { switch (phase++) @@ -547,42 +557,49 @@ action_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) case 0: if (NULL != term) { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Termination action\n"); - GNUNET_ARM_request_service_stop (h, term, - (0 == timeout.rel_value_us) ? STOP_TIMEOUT : timeout, - &term_callback, NULL); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Termination action\n"); + op = GNUNET_ARM_request_service_stop (h, + term, + &term_callback, + NULL); return; } break; case 1: if (end || restart) { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "End action\n"); - GNUNET_ARM_request_service_stop (h, "arm", - (0 == timeout.rel_value_us) ? STOP_TIMEOUT_ARM : timeout, - &stop_callback, NULL); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "End action\n"); + op = GNUNET_ARM_request_service_stop (h, + "arm", + &stop_callback, + NULL); return; } break; case 2: if (start) { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Start action\n"); - GNUNET_ARM_request_service_start (h, "arm", - (no_stdout ? 0 : GNUNET_OS_INHERIT_STD_OUT) | - (no_stderr ? 0 : GNUNET_OS_INHERIT_STD_ERR), - (0 == timeout.rel_value_us) ? START_TIMEOUT: timeout, - start_callback, NULL); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Start action\n"); + op = GNUNET_ARM_request_service_start (h, "arm", + (no_stdout ? 0 : GNUNET_OS_INHERIT_STD_OUT) | + (no_stderr ? 0 : GNUNET_OS_INHERIT_STD_ERR), + &start_callback, + NULL); return; } break; case 3: if (NULL != init) { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Initialization action\n"); - GNUNET_ARM_request_service_start (h, init, GNUNET_OS_INHERIT_STD_NONE, - (0 == timeout.rel_value_us) ? STOP_TIMEOUT : timeout, - &init_callback, NULL); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Initialization action\n"); + op = GNUNET_ARM_request_service_start (h, init, + GNUNET_OS_INHERIT_STD_NONE, + &init_callback, + NULL); return; } break; @@ -591,9 +608,9 @@ action_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Going to list all running services controlled by ARM.\n"); - GNUNET_ARM_request_service_list (h, - (0 == timeout.rel_value_us) ? LIST_TIMEOUT : timeout, - &list_callback, &list); + op = GNUNET_ARM_request_service_list (h, + &list_callback, + &list); return; } break; @@ -624,7 +641,8 @@ action_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) */ static void srv_status (void *cls, - const char *service, enum GNUNET_ARM_ServiceStatus status) + const char *service, + enum GNUNET_ARM_ServiceStatus status) { const char *msg; @@ -646,13 +664,21 @@ srv_status (void *cls, break; } if (! quiet) - { - if (NULL != msg) - FPRINTF (stderr, msg, service); - else - FPRINTF (stderr, _("Unknown status %u for service %s.\n"), status, service); - } - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got service %s status %d\n", service, (int) status); + { + if (NULL != msg) + FPRINTF (stderr, + msg, + service); + else + FPRINTF (stderr, + _("Unknown status %u for service %s.\n"), + status, + service); + } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Got service %s status %d\n", + service, (int) + status); } @@ -675,31 +701,44 @@ run (void *cls, cfg = GNUNET_CONFIGURATION_dup (c); config_file = cfgfile; if (GNUNET_OK != - GNUNET_CONFIGURATION_get_value_string (cfg, "PATHS", "GNUNET_HOME", &dir)) + GNUNET_CONFIGURATION_get_value_string (cfg, + "PATHS", + "GNUNET_HOME", + &dir)) { GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, - "PATHS", "GNUNET_HOME"); + "PATHS", + "GNUNET_HOME"); return; } if (NULL != cfgfile) { if (GNUNET_OK != - GNUNET_CONFIGURATION_get_value_filename (cfg, "arm", "CONFIG", + GNUNET_CONFIGURATION_get_value_filename (cfg, + "arm", + "CONFIG", &armconfig)) { - GNUNET_CONFIGURATION_set_value_string (cfg, "arm", "CONFIG", + GNUNET_CONFIGURATION_set_value_string (cfg, + "arm", + "CONFIG", cfgfile); } else GNUNET_free (armconfig); } - if (NULL == (h = GNUNET_ARM_connect (cfg, &conn_status, NULL))) + if (NULL == (h = GNUNET_ARM_connect (cfg, + &conn_status, + NULL))) return; if (monitor) - m = GNUNET_ARM_monitor (cfg, &srv_status, NULL); - GNUNET_SCHEDULER_add_now (&action_loop, NULL); - GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, - &shutdown_task, NULL); + m = GNUNET_ARM_monitor_start (cfg, + &srv_status, + NULL); + al_task = GNUNET_SCHEDULER_add_now (&action_loop, + NULL); + GNUNET_SCHEDULER_add_shutdown (&shutdown_task, + NULL); } @@ -733,8 +772,8 @@ main (int argc, char *const *argv) GNUNET_NO, &GNUNET_GETOPT_set_one, &monitor}, {'q', "quiet", NULL, gettext_noop ("don't print status messages"), GNUNET_NO, &GNUNET_GETOPT_set_one, &quiet}, - {'T', "timeout", "MSECS", - gettext_noop ("timeout in MSECS milliseconds for completing current operation"), + {'T', "timeout", "DELAY", + gettext_noop ("exit with error status if operation does not finish after DELAY"), GNUNET_YES, &GNUNET_GETOPT_set_relative_time, &timeout}, {'I', "info", NULL, gettext_noop ("list currently running services"), GNUNET_NO, &GNUNET_GETOPT_set_one, &list}, @@ -745,7 +784,8 @@ main (int argc, char *const *argv) GNUNET_GETOPT_OPTION_END }; - 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; if (GNUNET_OK ==