/*
This file is part of GNUnet.
- (C) 2009 Christian Grothoff (and other contributing authors)
+ (C) 2009, 2010 Christian Grothoff (and other contributing authors)
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
* @author Christian Grothoff
*
* TODO:
- * - multiple start-stop requests with RC>1 can result
- * in UP/DOWN signals based on "pending" that are inaccurate...
- * => have list of clients waiting for a resolution instead of
- * giving instant (but incorrect) replies
* - need to test auto-restart code on configuration changes;
* - should refine restart code to check if *relevant* parts of the
* configuration were changed (anything in the section for the service)
* - should have a way to specify dependencies between services and
* manage restarts of groups of services
+ *
+ * + install handler for disconnecting clients!?
*/
#include "platform.h"
-#include "gnunet_client_lib.h"
-#include "gnunet_getopt_lib.h"
-#include "gnunet_os_lib.h"
+#include "gnunet_util_lib.h"
#include "gnunet_protocols.h"
-#include "gnunet_service_lib.h"
-#include "gnunet_signal_lib.h"
+#include "gnunet-service-arm.h"
#include "arm.h"
*/
#define EXPONENTIAL_BACKOFF_THRESHOLD (1000 * 60 * 30)
-
/**
* List of our services.
*/
struct ServiceList;
+
/**
* List of our services.
*/
struct ServiceList
{
/**
- * This is a linked list.
+ * This is a doubly-linked list.
*/
struct ServiceList *next;
+ /**
+ * This is a doubly-linked list.
+ */
+ struct ServiceList *prev;
+
/**
* Name of the service.
*/
struct GNUNET_SERVER_Client *killing_client;
/**
- * Process ID of the child.
+ * Process structure pointer of the child.
*/
- pid_t pid;
+ struct GNUNET_OS_Process *proc;
/**
* Last time the config of this service was
time_t mtime;
/**
- * Process exponential backoff time
+ * Process exponential backoff time
*/
struct GNUNET_TIME_Relative backoff;
/**
- * Absolute time at which the process is scheduled to restart in case of death
+ * Absolute time at which the process is scheduled to restart in case of death
*/
struct GNUNET_TIME_Absolute restartAt;
- /**
- * Reference counter (counts how many times we've been
- * asked to start the service). We only actually stop
- * it once rc hits zero.
- */
- unsigned int rc;
-
};
/**
* List of running services.
*/
-static struct ServiceList *running;
+static struct ServiceList *running_head;
/**
- * Our configuration
+ * List of running services.
*/
-static const struct GNUNET_CONFIGURATION_Handle *cfg;
+static struct ServiceList *running_tail;
/**
- * Our scheduler.
+ * Our configuration
*/
-static struct GNUNET_SCHEDULER_Handle *sched;
+static const struct GNUNET_CONFIGURATION_Handle *cfg;
/**
* Command to prepend to each actual command.
*/
static char *prefix_command;
+/**
+ * Option to append to each actual command.
+ */
+static char *final_option;
+
/**
* ID of task called whenever we get a SIGCHILD.
*/
*/
static GNUNET_SCHEDULER_TaskIdentifier child_restart_task;
-/**
- * Context for our SIGCHILD handler.
- */
-static struct GNUNET_SIGNAL_Context *shc_chld;
+
/**
* Pipe used to communicate shutdown via signal.
* @param cls closure, NULL if we need to self-restart
* @param tc context
*/
-static void
+static void
config_change_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct ServiceList *pos;
struct stat sbuf;
- pos = running;
+ pos = running_head;
while (pos != NULL)
+ {
+ /* FIXME: this test for config change may be a bit too coarse grained */
+ if ((0 == STAT (pos->config, &sbuf)) && (pos->mtime < sbuf.st_mtime) &&
+ (pos->proc != NULL))
{
- /* FIXME: this test for config change is a bit too coarse grained */
- if ( (0 == STAT (pos->config, &sbuf)) &&
- (pos->mtime < sbuf.st_mtime) &&
- (pos->pid != 0) )
- {
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Restarting service `%s' due to configuration file change.\n"));
- if (0 != PLIBC_KILL (pos->pid, SIGTERM))
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
- else
- pos->backoff = GNUNET_TIME_UNIT_MILLISECONDS;
- }
- pos = pos->next;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ _
+ ("Restarting service `%s' due to configuration file change.\n"));
+ if (0 != GNUNET_OS_process_kill (pos->proc, SIGTERM))
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+ else
+ pos->backoff = GNUNET_TIME_UNIT_MILLISECONDS;
}
+ pos = pos->next;
+ }
}
-
/**
* Transmit a status result message.
*
struct GNUNET_MessageHeader *msg;
if (buf == NULL)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Could not send status result to client\n"));
- return 0; /* error, not much we can do */
- }
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Could not send status result to client\n"));
+ return 0; /* error, not much we can do */
+ }
#if DEBUG_ARM
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending status response %u to client\n",
- (unsigned int) *res);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending status response %u to client\n",
+ (unsigned int) *res);
#endif
GNUNET_assert (size >= sizeof (struct GNUNET_MessageHeader));
msg = buf;
}
-
/**
* Signal our client that we will start or stop the
* service.
* @return NULL if it was not found
*/
static void
-signal_result (struct GNUNET_SERVER_Client *client,
- const char *name, uint16_t result)
+signal_result (struct GNUNET_SERVER_Client *client, const char *name,
+ uint16_t result)
{
uint16_t *res;
if (NULL == client)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _
- ("Not sending status result to client: no client known\n"));
- return;
- }
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ _("Not sending status result to client: no client known\n"));
+ return;
+ }
#if DEBUG_ARM
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Telling client that service `%s' is now %s\n",
- name,
- result == GNUNET_MESSAGE_TYPE_ARM_IS_DOWN ? "down" : "up");
+ "Telling client that service `%s' is now %s\n", name,
+ result == GNUNET_MESSAGE_TYPE_ARM_IS_DOWN ? "down" : "up");
#endif
res = GNUNET_malloc (sizeof (uint16_t));
*res = result;
GNUNET_SERVER_notify_transmit_ready (client,
- sizeof (struct GNUNET_MessageHeader),
- GNUNET_TIME_UNIT_FOREVER_REL,
- &write_result, res);
+ sizeof (struct GNUNET_MessageHeader),
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ &write_result, res);
}
/**
* Find the process with the given service
- * name in the given list, remove it and return it.
+ * name in the given list and return it.
*
* @param name which service entry to look up
* @return NULL if it was not found
*/
static struct ServiceList *
-find_name (const char *name)
+find_service (const char *name)
{
struct ServiceList *pos;
- struct ServiceList *prev;
- pos = running;
- prev = NULL;
+ pos = running_head;
while (pos != NULL)
- {
- if (0 == strcmp (pos->name, name))
- {
- if (prev == NULL)
- running = pos->next;
- else
- prev->next = pos->next;
- pos->next = NULL;
- return pos;
- }
- prev = pos;
- pos = pos->next;
- }
+ {
+ if (0 == strcmp (pos->name, name))
+ return pos;
+ pos = pos->next;
+ }
return NULL;
}
/**
- * Free an entry in the service list.
+ * Remove and free an entry in the service list.
*
* @param pos entry to free
*/
static void
-free_entry (struct ServiceList *pos)
+free_service (struct ServiceList *pos)
{
+ GNUNET_CONTAINER_DLL_remove (running_head, running_tail, pos);
GNUNET_free_non_null (pos->config);
GNUNET_free_non_null (pos->binary);
GNUNET_free (pos->name);
}
+#include "do_start_process.c"
+
+
/**
* Actually start the process for the given service.
*
* @param sl identifies service to start
+ * @param lsocks -1 terminated list of listen sockets to pass (systemd style), or NULL
*/
static void
-start_process (struct ServiceList *sl)
+start_process (struct ServiceList *sl, const int *lsocks)
{
char *loprefix;
char *options;
- char **argv;
- unsigned int argv_size;
- char *lopos;
char *optpos;
- const char *firstarg;
+ char *optend;
+ const char *next;
int use_debug;
+ char b;
+ char *val;
/* start service */
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string (cfg,
- sl->name, "PREFIX", &loprefix))
+ GNUNET_CONFIGURATION_get_value_string (cfg, sl->name, "PREFIX",
+ &loprefix))
loprefix = GNUNET_strdup (prefix_command);
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string (cfg,
- sl->name, "OPTIONS", &options))
- options = GNUNET_strdup ("");
+ GNUNET_CONFIGURATION_get_value_string (cfg, sl->name, "OPTIONS",
+ &options))
+ {
+ options = GNUNET_strdup (final_option);
+ if (NULL == strstr (options, "%"))
+ {
+ /* replace '{}' with service name */
+ while (NULL != (optpos = strstr (options, "{}")))
+ {
+ optpos[0] = '%';
+ optpos[1] = 's';
+ GNUNET_asprintf (&optpos, options, sl->name);
+ GNUNET_free (options);
+ options = optpos;
+ }
+ /* replace '$PATH' with value associated with "PATH" */
+ while (NULL != (optpos = strstr (options, "$")))
+ {
+ optend = optpos + 1;
+ while (isupper ((unsigned char) *optend))
+ optend++;
+ b = *optend;
+ if ('\0' == b)
+ next = "";
+ else
+ next = optend + 1;
+ *optend = '\0';
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_string (cfg, "PATHS", optpos + 1,
+ &val))
+ val = GNUNET_strdup ("");
+ *optpos = '\0';
+ GNUNET_asprintf (&optpos, "%s%s%c%s", options, val, b, next);
+ GNUNET_free (options);
+ GNUNET_free (val);
+ options = optpos;
+ }
+ }
+ }
use_debug = GNUNET_CONFIGURATION_get_value_yesno (cfg, sl->name, "DEBUG");
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Starting service `%s'\n"), sl->name);
#if DEBUG_ARM
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Starting service `%s' using binary `%s' and configuration `%s'\n",
- sl->name, sl->binary, sl->config);
+ "Starting service `%s' using binary `%s' and configuration `%s'\n",
+ sl->name, sl->binary, sl->config);
#endif
- argv_size = 6;
- if (use_debug)
- argv_size += 2;
- lopos = loprefix;
- while ('\0' != *lopos)
- {
- if (*lopos == ' ')
- argv_size++;
- lopos++;
- }
- optpos = options;
- while ('\0' != *optpos)
- {
- if (*optpos == ' ')
- argv_size++;
- optpos++;
- }
- firstarg = NULL;
- argv = GNUNET_malloc (argv_size * sizeof (char *));
- argv_size = 0;
- lopos = loprefix;
-
- while ('\0' != *lopos)
- {
- while (*lopos == ' ')
- lopos++;
- if (*lopos == '\0')
- continue;
- if (argv_size == 0)
- firstarg = lopos;
- argv[argv_size++] = lopos;
- while (('\0' != *lopos) && (' ' != *lopos))
- lopos++;
- if ('\0' == *lopos)
- continue;
- *lopos = '\0';
- lopos++;
- }
- if (argv_size == 0)
- firstarg = sl->binary;
- argv[argv_size++] = sl->binary;
- argv[argv_size++] = "-c";
- argv[argv_size++] = sl->config;
if (GNUNET_YES == use_debug)
- {
- argv[argv_size++] = "-L";
- argv[argv_size++] = "DEBUG";
- }
- optpos = options;
- while ('\0' != *optpos)
- {
- while (*optpos == ' ')
- optpos++;
- if (*optpos == '\0')
- continue;
- argv[argv_size++] = optpos;
- while (('\0' != *optpos) && (' ' != *optpos))
- optpos++;
- if ('\0' == *optpos)
- continue;
- *optpos = '\0';
- optpos++;
- }
- argv[argv_size] = NULL;
- sl->pid = GNUNET_OS_start_process_v (firstarg, argv);
- /* FIXME: should check sl->pid */
- GNUNET_free (argv);
+ sl->proc =
+ do_start_process (lsocks, loprefix, sl->binary, "-c", sl->config, "-L",
+ "DEBUG", options, NULL);
+ else
+ sl->proc =
+ do_start_process (lsocks, loprefix, sl->binary, "-c", sl->config,
+ options, NULL);
+ if (sl->proc == NULL)
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Failed to start service `%s'\n"),
+ sl->name);
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Starting service `%s'\n"), sl->name);
GNUNET_free (loprefix);
GNUNET_free (options);
}
*
* @param client who is asking for this
* @param servicename name of the service to start
+ * @param lsocks -1 terminated list of listen sockets to pass (systemd style), or NULL
+ * @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
-static void
-start_service (struct GNUNET_SERVER_Client *client, const char *servicename)
+int
+start_service (struct GNUNET_SERVER_Client *client, const char *servicename,
+ const int *lsocks)
{
struct ServiceList *sl;
char *binary;
struct stat sbuf;
if (GNUNET_YES == in_shutdown)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("ARM is shutting down, service `%s' not started.\n"),
- servicename);
- signal_result (client, servicename, GNUNET_MESSAGE_TYPE_ARM_IS_DOWN);
- return;
- }
- sl = find_name (servicename);
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ _("ARM is shutting down, service `%s' not started.\n"),
+ servicename);
+ signal_result (client, servicename, GNUNET_MESSAGE_TYPE_ARM_IS_DOWN);
+ return GNUNET_SYSERR;
+ }
+ sl = find_service (servicename);
if (sl != NULL)
- {
- /* already running, just increment RC */
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Service `%s' already running.\n"), servicename);
- sl->rc++;
- sl->next = running;
- running = sl;
- signal_result (client, servicename, GNUNET_MESSAGE_TYPE_ARM_IS_UP);
- return;
- }
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Service `%s' already running.\n"),
+ servicename);
+ signal_result (client, servicename, GNUNET_MESSAGE_TYPE_ARM_IS_UP);
+ return GNUNET_SYSERR;
+ }
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string (cfg,
- servicename, "BINARY", &binary))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Binary implementing service `%s' not known!\n"),
- servicename);
- signal_result (client, servicename, GNUNET_MESSAGE_TYPE_ARM_IS_DOWN);
- return;
- }
+ GNUNET_CONFIGURATION_get_value_string (cfg, servicename, "BINARY",
+ &binary))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Binary implementing service `%s' not known!\n"),
+ servicename);
+ signal_result (client, servicename, GNUNET_MESSAGE_TYPE_ARM_IS_DOWN);
+ return GNUNET_SYSERR;
+ }
if ((GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_filename (cfg,
- servicename,
- "CONFIG",
- &config)) ||
+ GNUNET_CONFIGURATION_get_value_filename (cfg, servicename, "CONFIG",
+ &config)) ||
(0 != STAT (config, &sbuf)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Configuration file `%s' for service `%s' not known!\n"),
- config, servicename);
- signal_result (client, servicename, GNUNET_MESSAGE_TYPE_ARM_IS_DOWN);
- GNUNET_free (binary);
- GNUNET_free_non_null (config);
- return;
- }
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Configuration file `%s' for service `%s' not known!\n"),
+ config, servicename);
+ signal_result (client, servicename, GNUNET_MESSAGE_TYPE_ARM_IS_DOWN);
+ GNUNET_free (binary);
+ GNUNET_free_non_null (config);
+ return GNUNET_SYSERR;
+ }
+ (void) stop_listening (servicename);
sl = GNUNET_malloc (sizeof (struct ServiceList));
sl->name = GNUNET_strdup (servicename);
- sl->next = running;
- sl->rc = 1;
sl->binary = binary;
sl->config = config;
sl->mtime = sbuf.st_mtime;
sl->backoff = GNUNET_TIME_UNIT_MILLISECONDS;
sl->restartAt = GNUNET_TIME_UNIT_FOREVER_ABS;
-
- running = sl;
- start_process (sl);
+ GNUNET_CONTAINER_DLL_insert (running_head, running_tail, sl);
+ start_process (sl, lsocks);
if (NULL != client)
signal_result (client, servicename, GNUNET_MESSAGE_TYPE_ARM_IS_UP);
+ return GNUNET_OK;
}
{
struct ServiceList *pos;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Preparing to stop `%s'\n"), servicename);
- pos = find_name (servicename);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Preparing to stop `%s'\n"),
+ servicename);
+ pos = find_service (servicename);
if (pos == NULL)
- {
+ {
+ if (GNUNET_OK == stop_listening (servicename))
+ signal_result (client, servicename, GNUNET_MESSAGE_TYPE_ARM_IS_DOWN);
+ else
signal_result (client, servicename, GNUNET_MESSAGE_TYPE_ARM_IS_UNKNOWN);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
- return;
- }
- if (pos->rc > 1)
- {
- /* RC>1, just decrement RC */
- pos->rc--;
- pos->next = running;
- running = pos;
-#if DEBUG_ARM
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Service `%s' still used by %u clients, will keep it running!\n",
- servicename, pos->rc);
-#endif
- signal_result (client, servicename, GNUNET_MESSAGE_TYPE_ARM_IS_UP);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
- return;
- }
- if (pos->rc == 1)
- pos->rc--; /* decrement RC to zero */
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
+ }
if (pos->killing_client != NULL)
- {
- /* killing already in progress */
+ {
+ /* killing already in progress */
#if DEBUG_ARM
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Service `%s' is already down\n", servicename);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Service `%s' is already down\n",
+ servicename);
#endif
- signal_result (client, servicename, GNUNET_MESSAGE_TYPE_ARM_IS_DOWN);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
- pos->next = running;
- running = pos;
- return;
- }
+ signal_result (client, servicename, GNUNET_MESSAGE_TYPE_ARM_IS_DOWN);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
+ }
if (GNUNET_YES == in_shutdown)
- {
+ {
#if DEBUG_ARM
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Termination request already sent to `%s' (since ARM is in shutdown).\n",
- servicename);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Termination request already sent to `%s' (since ARM is in shutdown).\n",
+ servicename);
#endif
- signal_result (client, servicename, GNUNET_MESSAGE_TYPE_ARM_IS_DOWN);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
- pos->next = running;
- running = pos;
- return;
- }
- if (pos->pid == 0)
- {
- /* process is in delayed restart, simply remove it! */
- free_entry (pos);
- signal_result (client, servicename, GNUNET_MESSAGE_TYPE_ARM_IS_DOWN);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
- return;
- }
+ signal_result (client, servicename, GNUNET_MESSAGE_TYPE_ARM_IS_DOWN);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
+ }
+ if (pos->proc == NULL)
+ {
+ /* process is in delayed restart, simply remove it! */
+ free_service (pos);
+ signal_result (client, servicename, GNUNET_MESSAGE_TYPE_ARM_IS_DOWN);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
+ }
#if DEBUG_ARM
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending kill signal to service `%s', waiting for process to die.\n",
- servicename);
+ "Sending kill signal to service `%s', waiting for process to die.\n",
+ servicename);
#endif
- if (0 != PLIBC_KILL (pos->pid, SIGTERM))
+ if (0 != GNUNET_OS_process_kill (pos->proc, SIGTERM))
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
- pos->next = running;
- running = pos;
pos->killing_client = client;
GNUNET_SERVER_client_keep (client);
}
* GNUNET_SYSERR to close it (signal serious error)
*/
static void
-handle_start (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+handle_start (void *cls, struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
{
const char *servicename;
uint16_t size;
size -= sizeof (struct GNUNET_MessageHeader);
servicename = (const char *) &message[1];
if ((size == 0) || (servicename[size - 1] != '\0'))
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- start_service (client, servicename);
+ {
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
+ start_service (client, servicename, NULL);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
* GNUNET_SYSERR to close it (signal serious error)
*/
static void
-handle_stop (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+handle_stop (void *cls, struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
{
const char *servicename;
uint16_t size;
size -= sizeof (struct GNUNET_MessageHeader);
servicename = (const char *) &message[1];
if ((size == 0) || (servicename[size - 1] != '\0'))
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
+ {
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
stop_service (client, servicename);
}
/**
* Remove all entries for tasks that are not running
- * (pid = 0) from the running list (they will no longer
+ * (proc = NULL) from the running list (they will no longer
* be restarted since we are shutting down).
*/
static void
{
struct ServiceList *pos;
struct ServiceList *next;
- struct ServiceList *prev;
-
- pos = running;
- prev = NULL;
- while (NULL != pos)
- {
- next = pos->next;
- if (pos->pid == 0)
- {
- if (prev == NULL)
- running = next;
- else
- prev->next = next;
- free_entry (pos);
- }
- else
- prev = pos;
- pos = next;
- }
+
+ next = running_head;
+ while (NULL != (pos = next))
+ {
+ next = pos->next;
+ if (pos->proc == NULL)
+ free_service (pos);
+ }
}
/**
- * We are done with everything. Stop remaining
- * tasks, signal handler and the server.
+ * We are done with everything. Stop remaining
+ * tasks, signal handler and the server.
*/
static void
do_shutdown ()
{
- GNUNET_SERVER_destroy (server);
- server = NULL;
- GNUNET_SIGNAL_handler_uninstall (shc_chld);
- shc_chld = NULL;
- GNUNET_SCHEDULER_cancel (sched, child_death_task);
- child_death_task = GNUNET_SCHEDULER_NO_TASK;
+ if (NULL != server)
+ {
+ GNUNET_SERVER_destroy (server);
+ server = NULL;
+ }
+ if (GNUNET_SCHEDULER_NO_TASK != child_death_task)
+ {
+ GNUNET_SCHEDULER_cancel (child_death_task);
+ child_death_task = GNUNET_SCHEDULER_NO_TASK;
+ }
}
shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct ServiceList *pos;
-
+ struct ServiceList *nxt;
+
#if DEBUG_ARM
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Stopping all services\n"));
#endif
+ if (GNUNET_SCHEDULER_NO_TASK != child_restart_task)
+ {
+ GNUNET_SCHEDULER_cancel (child_restart_task);
+ child_restart_task = GNUNET_SCHEDULER_NO_TASK;
+ }
in_shutdown = GNUNET_YES;
- pos = running;
+ stop_listening (NULL);
+ pos = running_head;
while (NULL != pos)
+ {
+ nxt = pos->next;
+ if (pos->proc != NULL)
{
- if (pos->pid != 0)
- {
-#if DEBUG_ARM
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending SIGTERM to `%s'\n", pos->name);
-#endif
- if (0 != PLIBC_KILL (pos->pid, SIGTERM))
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
- }
- pos = pos->next;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stopping service `%s'\n", pos->name);
+ if (0 != GNUNET_OS_process_kill (pos->proc, SIGTERM))
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
}
- if (running == NULL)
+ else
+ {
+ free_service (pos);
+ }
+ pos = nxt;
+ }
+ if (running_head == NULL)
do_shutdown ();
}
child_restart_task = GNUNET_SCHEDULER_NO_TASK;
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
- {
- clean_up_running ();
- if (NULL == running)
- do_shutdown ();
- return;
- }
+ return;
+ GNUNET_assert (GNUNET_NO == in_shutdown);
lowestRestartDelay = GNUNET_TIME_UNIT_FOREVER_REL;
/* check for services that need to be restarted due to
- configuration changes or because the last restart failed */
- pos = running;
+ * configuration changes or because the last restart failed */
+ pos = running_head;
while (pos != NULL)
+ {
+ if (pos->proc == NULL)
{
- if ( (pos->pid == 0) &&
- (GNUNET_YES != in_shutdown) )
- {
- if (GNUNET_TIME_absolute_get_remaining (pos->restartAt).value == 0)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Restarting service `%s'.\n"), pos->name);
- start_process (pos);
- }
- else
- {
- lowestRestartDelay
- = GNUNET_TIME_relative_min (lowestRestartDelay,
- GNUNET_TIME_absolute_get_remaining
- (pos->restartAt));
- }
- }
- pos = pos->next;
- }
- if (lowestRestartDelay.value != GNUNET_TIME_UNIT_FOREVER_REL.value)
- {
+ if (GNUNET_TIME_absolute_get_remaining (pos->restartAt).rel_value == 0)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Restarting service `%s'.\n"),
+ pos->name);
+ start_process (pos, NULL);
+ }
+ else
+ {
+ lowestRestartDelay =
+ GNUNET_TIME_relative_min (lowestRestartDelay,
+ GNUNET_TIME_absolute_get_remaining
+ (pos->restartAt));
+ }
+ }
+ pos = pos->next;
+ }
+ if (lowestRestartDelay.rel_value != GNUNET_TIME_UNIT_FOREVER_REL.rel_value)
+ {
#if DEBUG_ARM
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Will restart process in %llums\n",
- (unsigned long long) lowestRestartDelay.value);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Will restart process in %llums\n",
+ (unsigned long long) lowestRestartDelay.rel_value);
#endif
- child_restart_task
- = GNUNET_SCHEDULER_add_delayed (sched,
- lowestRestartDelay,
- &delayed_restart_task,
- NULL);
- }
+ child_restart_task =
+ GNUNET_SCHEDULER_add_delayed (lowestRestartDelay, &delayed_restart_task,
+ NULL);
+ }
}
/**
* Task triggered whenever we receive a SIGCHLD (child
- * process died).
+ * process died).
*
* @param cls closure, NULL if we need to self-restart
* @param tc context
maint_child_death (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct ServiceList *pos;
- struct ServiceList *prev;
struct ServiceList *next;
const char *statstr;
int statcode;
child_death_task = GNUNET_SCHEDULER_NO_TASK;
if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY))
- {
- child_death_task =
- GNUNET_SCHEDULER_add_read_file (sched, GNUNET_TIME_UNIT_FOREVER_REL, pr,
- &maint_child_death, NULL);
- return;
- }
+ {
+ /* shutdown scheduled us, ignore! */
+ child_death_task =
+ GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL, pr,
+ &maint_child_death, NULL);
+ return;
+ }
/* consume the signal */
GNUNET_break (0 < GNUNET_DISK_file_read (pr, &c, sizeof (c)));
/* check for services that died (WAITPID) */
- prev = NULL;
- next = running;
+ next = running_head;
while (NULL != (pos = next))
+ {
+ next = pos->next;
+ if (pos->proc == NULL)
+ continue;
+ if ((GNUNET_SYSERR ==
+ (ret = GNUNET_OS_process_status (pos->proc, &statusType, &statusCode)))
+ || ((ret == GNUNET_NO) || (statusType == GNUNET_OS_PROCESS_STOPPED) ||
+ (statusType == GNUNET_OS_PROCESS_RUNNING)))
+ continue;
+
+ if (statusType == GNUNET_OS_PROCESS_EXITED)
{
- next = pos->next;
- if (pos->pid == 0)
- {
- prev = pos;
- continue;
- }
- if ((GNUNET_SYSERR == (ret = GNUNET_OS_process_status (pos->pid,
- &statusType,
- &statusCode))) ||
- ( (ret == GNUNET_NO) ||
- (statusType == GNUNET_OS_PROCESS_STOPPED) ||
- (statusType == GNUNET_OS_PROCESS_RUNNING)) )
- {
- prev = pos;
- continue;
- }
-
- if (statusType == GNUNET_OS_PROCESS_EXITED)
- {
- statstr = _( /* process termination method */ "exit");
- statcode = statusCode;
- }
- else if (statusType == GNUNET_OS_PROCESS_SIGNALED)
- {
- statstr = _( /* process termination method */ "signal");
- statcode = statusCode;
- }
- else
- {
- statstr = _( /* process termination method */ "unknown");
- statcode = 0;
- }
- pos->pid = 0;
- if (NULL != pos->killing_client)
- {
- if (prev == NULL)
- running = next;
- else
- prev->next = next;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Service `%s' stopped\n"),
- pos->name);
- signal_result (pos->killing_client,
- pos->name, GNUNET_MESSAGE_TYPE_ARM_IS_DOWN);
- GNUNET_SERVER_receive_done (pos->killing_client, GNUNET_OK);
- GNUNET_SERVER_client_drop (pos->killing_client);
- free_entry (pos);
- continue;
- }
- if (GNUNET_YES != in_shutdown)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _
- ("Service `%s' terminated with status %s/%d, will try to restart it!\n"),
- pos->name, statstr, statcode);
- /* schedule restart */
- pos->restartAt
- = GNUNET_TIME_relative_to_absolute (pos->backoff);
- if (pos->backoff.value < EXPONENTIAL_BACKOFF_THRESHOLD)
- pos->backoff
- = GNUNET_TIME_relative_multiply (pos->backoff, 2);
- if (GNUNET_SCHEDULER_NO_TASK != child_restart_task)
- GNUNET_SCHEDULER_cancel (sched, child_restart_task);
- child_restart_task
- = GNUNET_SCHEDULER_add_with_priority (sched,
- GNUNET_SCHEDULER_PRIORITY_IDLE,
- &delayed_restart_task,
- NULL);
- }
-#if DEBUG_ARM
- else
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Service `%s' terminated with status %s/%d\n",
- pos->name, statstr, statcode);
-#endif
- prev = pos;
+ statstr = _( /* process termination method */ "exit");
+ statcode = statusCode;
}
- if (in_shutdown)
- clean_up_running ();
- if ( (running == NULL) &&
- (in_shutdown) )
+ else if (statusType == GNUNET_OS_PROCESS_SIGNALED)
{
- GNUNET_SERVER_destroy (server);
- GNUNET_SIGNAL_handler_uninstall (shc_chld);
- shc_chld = NULL;
+ statstr = _( /* process termination method */ "signal");
+ statcode = statusCode;
}
- else
+ else
+ {
+ statstr = _( /* process termination method */ "unknown");
+ statcode = 0;
+ }
+ GNUNET_OS_process_close (pos->proc);
+ pos->proc = NULL;
+ if (NULL != pos->killing_client)
{
- child_death_task =
- GNUNET_SCHEDULER_add_read_file (sched, GNUNET_TIME_UNIT_FOREVER_REL, pr,
- &maint_child_death, NULL);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Service `%s' stopped\n"),
+ pos->name);
+ signal_result (pos->killing_client, pos->name,
+ GNUNET_MESSAGE_TYPE_ARM_IS_DOWN);
+ GNUNET_SERVER_receive_done (pos->killing_client, GNUNET_OK);
+ GNUNET_SERVER_client_drop (pos->killing_client);
+ free_service (pos);
+ continue;
}
+ if (GNUNET_YES != in_shutdown)
+ {
+ if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _
+ ("Service `%s' terminated with status %s/%d, will try to restart it!\n"),
+ pos->name, statstr, statcode);
+ /* schedule restart */
+ pos->restartAt = GNUNET_TIME_relative_to_absolute (pos->backoff);
+ if (pos->backoff.rel_value < EXPONENTIAL_BACKOFF_THRESHOLD)
+ pos->backoff = GNUNET_TIME_relative_multiply (pos->backoff, 2);
+ if (GNUNET_SCHEDULER_NO_TASK != child_restart_task)
+ GNUNET_SCHEDULER_cancel (child_restart_task);
+ child_restart_task =
+ GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE,
+ &delayed_restart_task, NULL);
+ }
+#if DEBUG_ARM
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Service `%s' terminated with status %s/%d\n", pos->name,
+ statstr, statcode);
+#endif
+ }
+ child_death_task =
+ GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL, pr,
+ &maint_child_death, NULL);
+ if (GNUNET_YES == in_shutdown)
+ clean_up_running ();
+ if ((NULL == running_head) && (GNUNET_YES == in_shutdown))
+ do_shutdown ();
+}
+
+
+static size_t
+transmit_shutdown_ack (void *cls, size_t size, void *buf)
+{
+ struct GNUNET_SERVER_Client *client = cls;
+ struct GNUNET_MessageHeader *msg;
+
+ if (size < sizeof (struct GNUNET_MessageHeader))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ _("Failed to transmit shutdown ACK.\n"));
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return 0; /* client disconnected */
+ }
+
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Transmitting shutdown ACK.\n"));
+
+ /* Make the connection flushing for the purpose of ACK transmitting,
+ * needed on W32 to ensure that the message is even received, harmless
+ * on other platforms... */
+ GNUNET_break (GNUNET_OK == GNUNET_SERVER_client_disable_corking (client));
+ msg = (struct GNUNET_MessageHeader *) buf;
+ msg->type = htons (GNUNET_MESSAGE_TYPE_ARM_SHUTDOWN_ACK);
+ msg->size = htons (sizeof (struct GNUNET_MessageHeader));
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_SERVER_client_drop (client);
+ return sizeof (struct GNUNET_MessageHeader);
}
/**
- * List of handlers for the messages understood by this service.
+ * Handler for SHUTDOWN message.
+ *
+ * @param cls closure (refers to service)
+ * @param client identification of the client
+ * @param message the actual message
*/
-static struct GNUNET_SERVER_MessageHandler handlers[] = {
- {&handle_start, NULL, GNUNET_MESSAGE_TYPE_ARM_START, 0},
- {&handle_stop, NULL, GNUNET_MESSAGE_TYPE_ARM_STOP, 0},
- {NULL, NULL, 0, 0}
-};
+static void
+handle_shutdown (void *cls, struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
+{
+ GNUNET_SERVER_client_keep (client);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ _("Initiating shutdown as requested by client.\n"));
+ GNUNET_SERVER_notify_transmit_ready (client,
+ sizeof (struct GNUNET_MessageHeader),
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ &transmit_shutdown_ack, client);
+ GNUNET_SERVER_client_persist_ (client);
+ GNUNET_SCHEDULER_shutdown ();
+}
+
/**
* Signal handler called for SIGCHLD. Triggers the
sighandler_child_death ()
{
static char c;
+ int old_errno = errno; /* back-up errno */
- GNUNET_break (1 ==
- GNUNET_DISK_file_write (GNUNET_DISK_pipe_handle
- (sigpipe, GNUNET_DISK_PIPE_END_WRITE), &c,
- sizeof (c)));
+ GNUNET_break (1 ==
+ GNUNET_DISK_file_write (GNUNET_DISK_pipe_handle
+ (sigpipe, GNUNET_DISK_PIPE_END_WRITE),
+ &c, sizeof (c)));
+ errno = old_errno; /* restore errno */
}
* Process arm requests.
*
* @param cls closure
- * @param s scheduler to use
* @param serv the initialized server
* @param c configuration to use
*/
static void
-run (void *cls,
- struct GNUNET_SCHEDULER_Handle *s,
- struct GNUNET_SERVER_Handle *serv,
+run (void *cls, struct GNUNET_SERVER_Handle *serv,
const struct GNUNET_CONFIGURATION_Handle *c)
{
+ static const struct GNUNET_SERVER_MessageHandler handlers[] = {
+ {&handle_start, NULL, GNUNET_MESSAGE_TYPE_ARM_START, 0},
+ {&handle_stop, NULL, GNUNET_MESSAGE_TYPE_ARM_STOP, 0},
+ {&handle_shutdown, NULL, GNUNET_MESSAGE_TYPE_ARM_SHUTDOWN,
+ sizeof (struct GNUNET_MessageHeader)},
+ {NULL, NULL, 0, 0}
+ };
char *defaultservices;
char *pos;
cfg = c;
- sched = s;
server = serv;
GNUNET_assert (serv != NULL);
- shc_chld = GNUNET_SIGNAL_handler_install (SIGCHLD, &sighandler_child_death);
- GNUNET_assert (sigpipe == NULL);
- sigpipe = GNUNET_DISK_pipe (GNUNET_NO);
- GNUNET_assert (sigpipe != NULL);
pr = GNUNET_DISK_pipe_handle (sigpipe, GNUNET_DISK_PIPE_END_READ);
GNUNET_assert (pr != NULL);
GNUNET_SERVER_ignore_shutdown (serv, GNUNET_YES);
- GNUNET_SCHEDULER_add_delayed (sched,
- GNUNET_TIME_UNIT_FOREVER_REL,
- &shutdown_task,
- NULL);
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
+ NULL);
child_death_task =
- GNUNET_SCHEDULER_add_read_file (sched, GNUNET_TIME_UNIT_FOREVER_REL, pr,
- &maint_child_death, NULL);
+ GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL, pr,
+ &maint_child_death, NULL);
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string (cfg,
- "ARM",
- "GLOBAL_PREFIX",
- &prefix_command))
+ GNUNET_CONFIGURATION_get_value_string (cfg, "ARM", "GLOBAL_PREFIX",
+ &prefix_command))
prefix_command = GNUNET_strdup ("");
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_string (cfg, "ARM", "GLOBAL_POSTFIX",
+ &final_option))
+ final_option = GNUNET_strdup ("");
/* start default services... */
if (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_string (cfg,
- "ARM",
- "DEFAULTSERVICES",
- &defaultservices))
- {
+ GNUNET_CONFIGURATION_get_value_string (cfg, "ARM", "DEFAULTSERVICES",
+ &defaultservices))
+ {
#if DEBUG_ARM
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Starting default services `%s'\n", defaultservices);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting default services `%s'\n",
+ defaultservices);
#endif
+ if (0 < strlen (defaultservices))
+ {
pos = strtok (defaultservices, " ");
while (pos != NULL)
- {
- start_service (NULL, pos);
- pos = strtok (NULL, " ");
- }
- GNUNET_free (defaultservices);
+ {
+ start_service (NULL, pos, NULL);
+ pos = strtok (NULL, " ");
+ }
}
+ GNUNET_free (defaultservices);
+ }
else
- {
+ {
#if DEBUG_ARM
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "No default services configured.\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "No default services configured.\n");
#endif
- }
+ }
+
+ /* create listening sockets for future services */
+ prepareServices (cfg);
/* process client requests */
GNUNET_SERVER_add_handlers (server, handlers);
/* manage services */
- GNUNET_SCHEDULER_add_with_priority (sched,
- GNUNET_SCHEDULER_PRIORITY_IDLE,
- &config_change_task, NULL);
+ GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE,
+ &config_change_task, NULL);
}
int
main (int argc, char *const *argv)
{
- return (GNUNET_OK ==
- GNUNET_SERVICE_run (argc,
- argv, "arm", GNUNET_YES, &run, NULL)) ? 0 : 1;
+ int ret;
+ struct GNUNET_SIGNAL_Context *shc_chld;
+
+ sigpipe = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO, GNUNET_NO);
+ GNUNET_assert (sigpipe != NULL);
+ shc_chld =
+ GNUNET_SIGNAL_handler_install (GNUNET_SIGCHLD, &sighandler_child_death);
+ ret =
+ (GNUNET_OK ==
+ GNUNET_SERVICE_run (argc, argv, "arm", GNUNET_YES, &run, NULL)) ? 0 : 1;
+ GNUNET_SIGNAL_handler_uninstall (shc_chld);
+ shc_chld = NULL;
+ GNUNET_DISK_pipe_close (sigpipe);
+ sigpipe = NULL;
+ return ret;
+}
+
+#ifdef LINUX
+#include <malloc.h>
+
+/**
+ * MINIMIZE heap size (way below 128k) since this process doesn't need much.
+ */
+void __attribute__ ((constructor)) GNUNET_ARM_memory_init ()
+{
+ mallopt (M_TRIM_THRESHOLD, 4 * 1024);
+ mallopt (M_TOP_PAD, 1 * 1024);
+ malloc_trim (0);
}
+#endif
+
/* end of gnunet-service-arm.c */
projects / oweals / gnunet.git / blobdiff