/*
This file is part of GNUnet.
- (C) 2009 Christian Grothoff (and other contributing authors)
+ (C) 2009, 2010, 2011 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
* @file arm/gnunet-service-arm.c
* @brief the automated restart manager service
* @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
- * - code could go into restart-loop for a service
- * if service crashes instantly -- need exponential back-off
- * - 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
*/
#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_arm_service.h"
#include "gnunet_protocols.h"
-#include "gnunet_service_lib.h"
#include "arm.h"
-
-/**
- * Run normal maintenance every 2s.
- */
-#define MAINT_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 2)
-
-/**
- * Run fast maintenance after 100ms. This is used for an extra-job
- * that is run to check for a process that we just killed.
- */
-#define MAINT_FAST_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 100)
-
/**
- * How long do we wait until we decide that a service
- * did not start?
+ * How many messages do we queue up at most for optional
+ * notifications to a client? (this can cause notifications
+ * about outgoing messages to be dropped).
*/
-#define CHECK_TIMEOUT GNUNET_TIME_UNIT_MINUTES
+#define MAX_NOTIFY_QUEUE 1024
/**
* List of our services.
*/
struct ServiceList;
+
/**
- * Function to call if waitpid informs us that
- * a process has died.
- *
- * @param cls closure
- * @param pos entry in the service list of the process that died
+ * Record with information about a listen socket we have open.
*/
-typedef void (*CleanCallback) (void *cls, struct ServiceList * pos);
+struct ServiceListeningInfo
+{
+ /**
+ * This is a linked list.
+ */
+ struct ServiceListeningInfo *next;
+
+ /**
+ * This is a linked list.
+ */
+ struct ServiceListeningInfo *prev;
+
+ /**
+ * Address this socket is listening on.
+ */
+ struct sockaddr *service_addr;
+
+ /**
+ * Service this listen socket is for.
+ */
+ struct ServiceList *sl;
+
+ /**
+ * Number of bytes in 'service_addr'
+ */
+ socklen_t service_addr_len;
+
+ /**
+ * Our listening socket.
+ */
+ struct GNUNET_NETWORK_Handle *listen_socket;
+
+ /**
+ * Task doing the accepting.
+ */
+ GNUNET_SCHEDULER_TaskIdentifier accept_task;
+
+};
+
/**
* 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;
+
+ /**
+ * Linked list of listen sockets associated with this service.
+ */
+ struct ServiceListeningInfo *listen_head;
+
+ /**
+ * Linked list of listen sockets associated with this service.
+ */
+ struct ServiceListeningInfo *listen_tail;
+
/**
* Name of the service.
*/
char *config;
/**
- * Function to call upon kill completion (waitpid), NULL
+ * Client to notify upon kill completion (waitpid), NULL
* if we should simply restart the process.
*/
- CleanCallback kill_continuation;
+ struct GNUNET_SERVER_Client *killing_client;
+
+ /**
+ * ID of the request that killed the service (for reporting back).
+ */
+ uint64_t killing_client_request_id;
+
+ /**
+ * Process structure pointer of the child.
+ */
+ struct GNUNET_OS_Process *proc;
/**
- * Closure for kill_continuation.
+ * Process exponential backoff time
*/
- void *kill_continuation_cls;
+ struct GNUNET_TIME_Relative backoff;
/**
- * Process ID of the child.
+ * Absolute time at which the process is scheduled to restart in case of death
*/
- pid_t pid;
+ struct GNUNET_TIME_Absolute restart_at;
/**
- * Last time the config of this service was
- * modified.
+ * Time we asked the service to shut down (used to calculate time it took
+ * the service to terminate).
*/
- time_t mtime;
+ struct GNUNET_TIME_Absolute killed_at;
/**
- * Reference counter (counts how many times we've been
- * asked to start the service). We only actually stop
- * it once rc hits zero.
+ * Is this service to be started by default (or did a client tell us explicitly
+ * to start it)? GNUNET_NO if the service is started only upon 'accept' on a
+ * listen socket or possibly explicitly by a client changing the value.
*/
- unsigned int rc;
+ int is_default;
+ /**
+ * Should we use pipes to signal this process? (YES for Java binaries and if we
+ * are on Windoze).
+ */
+ int pipe_control;
};
/**
* 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_death_task;
+
+/**
+ * ID of task called whenever the timeout for restarting a child
+ * expires.
+ */
+static GNUNET_SCHEDULER_TaskIdentifier child_restart_task;
+
+/**
+ * Pipe used to communicate shutdown via signal.
+ */
+static struct GNUNET_DISK_PipeHandle *sigpipe;
+
/**
* Are we in shutdown mode?
*/
static struct GNUNET_SERVER_Handle *server;
/**
- * Background task doing maintenance.
- *
- * @param cls closure, NULL if we need to self-restart
- * @param tc context
+ * Context for notifications we need to send to our clients.
*/
-static void
-maint (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+static struct GNUNET_SERVER_NotificationContext *notifier;
+
+#include "do_start_process.c"
/**
* Transmit a status result message.
*
- * @param cls pointer to "unit16_t*" with message type
- * @param size number of bytes available in buf
+ * @param cls a `unit16_t *` with message type
+ * @param size number of bytes available in @a buf
* @param buf where to copy the message, NULL on error
- * @return number of bytes copied to buf
+ * @return number of bytes copied to @a buf
*/
static size_t
write_result (void *cls, size_t size, void *buf)
{
- uint16_t *res = cls;
- struct GNUNET_MessageHeader *msg;
+ struct GNUNET_ARM_ResultMessage *msg = cls;
+ size_t msize;
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_assert (size >= sizeof (struct GNUNET_MessageHeader));
- msg = buf;
- msg->size = htons (sizeof (struct GNUNET_MessageHeader));
- msg->type = htons (*res);
- GNUNET_free (res);
- return sizeof (struct GNUNET_MessageHeader);
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Could not send status result to client\n"));
+ GNUNET_free (msg);
+ return 0; /* error, not much we can do */
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending status response %u to client\n",
+ (unsigned int) msg->result);
+ msize = msg->arm_msg.header.size;
+ GNUNET_assert (size >= msize);
+ msg->arm_msg.header.size = htons (msg->arm_msg.header.size);
+ msg->arm_msg.header.type = htons (msg->arm_msg.header.type);
+ msg->result = htonl (msg->result);
+ msg->arm_msg.request_id = GNUNET_htonll (msg->arm_msg.request_id);
+ memcpy (buf, msg, msize);
+ GNUNET_free (msg);
+ return msize;
}
+/**
+ * Transmit the list of running services.
+ *
+ * @param cls pointer to `struct GNUNET_ARM_ListResultMessage` with the message
+ * @param size number of bytes available in @a buf
+ * @param buf where to copy the message, NULL on error
+ * @return number of bytes copied to @a buf
+ */
+static size_t
+write_list_result (void *cls, size_t size, void *buf)
+{
+ struct GNUNET_ARM_ListResultMessage *msg = cls;
+ size_t rslt_size;
+
+ if (buf == NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Could not send list result to client\n"));
+ GNUNET_free (msg);
+ return 0; /* error, not much we can do */
+ }
+
+ rslt_size = msg->arm_msg.header.size;
+ GNUNET_assert (size >= rslt_size);
+ msg->arm_msg.header.size = htons (msg->arm_msg.header.size);
+ msg->arm_msg.header.type = htons (msg->arm_msg.header.type);
+ msg->arm_msg.request_id = GNUNET_htonll (msg->arm_msg.request_id);
+ msg->count = htons (msg->count);
+
+ memcpy (buf, msg, rslt_size);
+ GNUNET_free (msg);
+ return rslt_size;
+}
+
/**
* Signal our client that we will start or stop the
*
* @param client who is being signalled
* @param name name of the service
+ * @param request_id id of the request that is being responded to.
* @param result message type to send
* @return NULL if it was not found
*/
static void
signal_result (struct GNUNET_SERVER_Client *client,
- const char *name, uint16_t result)
+ const char *name,
+ uint64_t request_id,
+ enum GNUNET_ARM_Result result)
{
- uint16_t *res;
+ struct GNUNET_ARM_ResultMessage *msg;
+ size_t msize;
+
+ msize = sizeof (struct GNUNET_ARM_ResultMessage);
+ msg = GNUNET_malloc (msize);
+ msg->arm_msg.header.size = msize;
+ msg->arm_msg.header.type = GNUNET_MESSAGE_TYPE_ARM_RESULT;
+ msg->result = result;
+ msg->arm_msg.request_id = request_id;
+
+ GNUNET_SERVER_notify_transmit_ready (client, msize,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ write_result, msg);
+}
- if (NULL == client)
+
+/**
+ * Tell all clients about status change of a service.
+ *
+ * @param name name of the service
+ * @param status message type to send
+ * @param unicast if not NULL, send to this client only.
+ * otherwise, send to all clients in the notifier
+ */
+static void
+broadcast_status (const char *name,
+ enum GNUNET_ARM_ServiceStatus status,
+ struct GNUNET_SERVER_Client *unicast)
+{
+ struct GNUNET_ARM_StatusMessage *msg;
+ size_t namelen;
+
+ if (NULL == notifier)
+ return;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending status %u of service `%s' to client\n",
+ (unsigned int) status, name);
+ namelen = strlen (name);
+ msg = GNUNET_malloc (sizeof (struct GNUNET_ARM_StatusMessage) + namelen + 1);
+ msg->header.size = htons (sizeof (struct GNUNET_ARM_StatusMessage) + namelen + 1);
+ msg->header.type = htons (GNUNET_MESSAGE_TYPE_ARM_STATUS);
+ msg->status = htonl ((uint32_t) (status));
+ memcpy ((char *) &msg[1], name, namelen + 1);
+
+ if (NULL == unicast)
+ GNUNET_SERVER_notification_context_broadcast (notifier,
+ (struct GNUNET_MessageHeader *) msg, GNUNET_YES);
+ else
+ GNUNET_SERVER_notification_context_unicast (notifier, unicast,
+ (const struct GNUNET_MessageHeader *) msg, GNUNET_NO);
+ GNUNET_free (msg);
+}
+
+
+/**
+ * Actually start the process for the given service.
+ *
+ * @param sl identifies service to start
+ * @param client that asked to start the service (may be NULL)
+ * @param request_id id of the request in response to which the process is
+ * being started. 0 if starting was not requested.
+ */
+static void
+start_process (struct ServiceList *sl, struct GNUNET_SERVER_Client *client, uint64_t request_id)
+{
+ char *loprefix;
+ char *options;
+ char *optpos;
+ char *optend;
+ const char *next;
+ int use_debug;
+ char b;
+ char *val;
+ struct ServiceListeningInfo *sli;
+ SOCKTYPE *lsocks;
+ unsigned int ls;
+ char *binary;
+
+ /* calculate listen socket list */
+ lsocks = NULL;
+ ls = 0;
+ for (sli = sl->listen_head; NULL != sli; sli = sli->next)
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Not sending status result to client: no client known\n"));
- return;
+ GNUNET_array_append (lsocks, ls,
+ GNUNET_NETWORK_get_fd (sli->listen_socket));
+ if (sli->accept_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (sli->accept_task);
+ sli->accept_task = GNUNET_SCHEDULER_NO_TASK;
+ }
}
-#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");
+#if WINDOWS
+ GNUNET_array_append (lsocks, ls, INVALID_SOCKET);
+#else
+ GNUNET_array_append (lsocks, ls, -1);
#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);
+
+ /* obtain configuration */
+ if (GNUNET_OK !=
+ 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 (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");
+
+ /* actually start process */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Starting service `%s' using binary `%s' and configuration `%s'\n",
+ sl->name, sl->binary, sl->config);
+ binary = GNUNET_OS_get_libexec_binary_path (sl->binary);
+ GNUNET_assert (NULL == sl->proc);
+ if (GNUNET_YES == use_debug)
+ {
+ if (NULL == sl->config)
+ sl->proc =
+ do_start_process (sl->pipe_control, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+ lsocks, loprefix, binary, "-L",
+ "DEBUG", options, NULL);
+ else
+ sl->proc =
+ do_start_process (sl->pipe_control, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+ lsocks, loprefix, binary, "-c", sl->config, "-L",
+ "DEBUG", options, NULL);
+ }
+ else
+ {
+ if (NULL == sl->config)
+ sl->proc =
+ do_start_process (sl->pipe_control, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+ lsocks, loprefix, binary,
+ options, NULL);
+ else
+ sl->proc =
+ do_start_process (sl->pipe_control, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+ lsocks, loprefix, binary, "-c", sl->config,
+ options, NULL);
+ }
+ GNUNET_free (binary);
+ if (sl->proc == NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Failed to start service `%s'\n"),
+ sl->name);
+ if (client)
+ signal_result (client, sl->name, request_id, GNUNET_ARM_RESULT_START_FAILED);
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Starting service `%s'\n"),
+ sl->name);
+ broadcast_status (sl->name, GNUNET_ARM_SERVICE_STARTING, NULL);
+ if (client)
+ signal_result (client, sl->name, request_id, GNUNET_ARM_RESULT_STARTING);
+ }
+ /* clean up */
+ GNUNET_free (loprefix);
+ GNUNET_free (options);
+ GNUNET_array_grow (lsocks, ls, 0);
}
/**
* 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;
+ struct ServiceList *sl;
- pos = running;
- prev = NULL;
- while (pos != NULL)
+ sl = running_head;
+ while (sl != 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 == strcasecmp (sl->name, name))
+ return sl;
+ sl = sl->next;
}
return NULL;
}
/**
- * Free an entry in the service list.
+ * First connection has come to the listening socket associated with the service,
+ * create the service in order to relay the incoming connection to it
*
- * @param pos entry to free
+ * @param cls callback data, `struct ServiceListeningInfo` describing a listen socket
+ * @param tc context
*/
static void
-free_entry (struct ServiceList *pos)
+accept_connection (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- GNUNET_free_non_null (pos->config);
- GNUNET_free_non_null (pos->binary);
- GNUNET_free (pos->name);
- GNUNET_free (pos);
+ struct ServiceListeningInfo *sli = cls;
+ struct ServiceList *sl = sli->sl;
+
+ sli->accept_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_assert (GNUNET_NO == in_shutdown);
+ if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
+ return;
+ start_process (sl, NULL, 0);
}
/**
- * Actually start the process for the given service.
+ * Creating a listening socket for each of the service's addresses and
+ * wait for the first incoming connection to it
*
- * @param sl identifies service to start
+ * @param sa address associated with the service
+ * @param addr_len length of @a sa
+ * @param sl service entry for the service in question
*/
static void
-start_process (struct ServiceList *sl)
+create_listen_socket (struct sockaddr *sa, socklen_t addr_len,
+ struct ServiceList *sl)
{
- char *loprefix;
- char *options;
- char **argv;
- unsigned int argv_size;
- char *lopos;
- char *optpos;
- const char *firstarg;
- int use_debug;
+ static int on = 1;
+ struct GNUNET_NETWORK_Handle *sock;
+ struct ServiceListeningInfo *sli;
- /* start service */
- if (GNUNET_OK !=
- 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 ("");
- 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);
-#endif
- argv_size = 6;
- if (use_debug)
- argv_size += 2;
- lopos = loprefix;
- while ('\0' != *lopos)
+ switch (sa->sa_family)
{
- if (*lopos == ' ')
- argv_size++;
- lopos++;
+ case AF_INET:
+ sock = GNUNET_NETWORK_socket_create (PF_INET, SOCK_STREAM, 0);
+ break;
+ case AF_INET6:
+ sock = GNUNET_NETWORK_socket_create (PF_INET6, SOCK_STREAM, 0);
+ break;
+ case AF_UNIX:
+ if (strcmp (GNUNET_a2s (sa, addr_len), "@") == 0) /* Do not bind to blank UNIX path! */
+ return;
+ sock = GNUNET_NETWORK_socket_create (PF_UNIX, SOCK_STREAM, 0);
+ break;
+ default:
+ GNUNET_break (0);
+ sock = NULL;
+ errno = EAFNOSUPPORT;
+ break;
}
- optpos = options;
- while ('\0' != *optpos)
+ if (NULL == sock)
{
- if (*optpos == ' ')
- argv_size++;
- optpos++;
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Unable to create socket for service `%s': %s\n"),
+ sl->name, STRERROR (errno));
+ GNUNET_free (sa);
+ return;
}
- firstarg = NULL;
- argv = GNUNET_malloc (argv_size * sizeof (char *));
- argv_size = 0;
- lopos = loprefix;
+ if (GNUNET_NETWORK_socket_setsockopt
+ (sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) != GNUNET_OK)
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+ "setsockopt");
+#ifdef IPV6_V6ONLY
+ if ((sa->sa_family == AF_INET6) &&
+ (GNUNET_NETWORK_socket_setsockopt
+ (sock, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof (on)) != GNUNET_OK))
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+ "setsockopt");
+#endif
- 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)
+ if (GNUNET_NETWORK_socket_bind
+ (sock, (const struct sockaddr *) sa, addr_len, 0) != GNUNET_OK)
{
- argv[argv_size++] = "-L";
- argv[argv_size++] = "DEBUG";
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _
+ ("Unable to bind listening socket for service `%s' to address `%s': %s\n"),
+ sl->name, GNUNET_a2s (sa, addr_len), STRERROR (errno));
+ GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (sock));
+ GNUNET_free (sa);
+ return;
}
- optpos = options;
- while ('\0' != *optpos)
+ if (GNUNET_NETWORK_socket_listen (sock, 5) != GNUNET_OK)
{
- while (*optpos == ' ')
- optpos++;
- if (*optpos == '\0')
- continue;
- argv[argv_size++] = optpos;
- while (('\0' != *optpos) && (' ' != *optpos))
- optpos++;
- if ('\0' == *optpos)
- continue;
- *optpos = '\0';
- optpos++;
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "listen");
+ GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (sock));
+ GNUNET_free (sa);
+ return;
}
- argv[argv_size++] = NULL;
- sl->pid = GNUNET_OS_start_process_v (firstarg, argv);
- GNUNET_free (argv);
- GNUNET_free (loprefix);
- GNUNET_free (options);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ _("ARM now monitors connections to service `%s' at `%s'\n"),
+ sl->name, GNUNET_a2s (sa, addr_len));
+ sli = GNUNET_malloc (sizeof (struct ServiceListeningInfo));
+ sli->service_addr = sa;
+ sli->service_addr_len = addr_len;
+ sli->listen_socket = sock;
+ sli->sl = sl;
+ sli->accept_task =
+ GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, sock,
+ &accept_connection, sli);
+ GNUNET_CONTAINER_DLL_insert (sl->listen_head, sl->listen_tail, sli);
}
/**
- * Start the specified service.
+ * Remove and free an entry in the service list. Listen sockets
+ * must have already been cleaned up. Only to be called during shutdown.
*
- * @param client who is asking for this
- * @param servicename name of the service to start
+ * @param sl entry to free
*/
static void
-start_service (struct GNUNET_SERVER_Client *client, const char *servicename)
+free_service (struct ServiceList *sl)
{
- struct ServiceList *sl;
- char *binary;
- char *config;
- struct stat sbuf;
+ GNUNET_assert (GNUNET_YES == in_shutdown);
+ GNUNET_CONTAINER_DLL_remove (running_head, running_tail, sl);
+ GNUNET_assert (NULL == sl->listen_head);
+ GNUNET_free_non_null (sl->config);
+ GNUNET_free_non_null (sl->binary);
+ GNUNET_free (sl->name);
+ GNUNET_free (sl);
+}
- if (GNUNET_YES == in_shutdown)
+
+/**
+ * Handle START-message.
+ *
+ * @param cls closure (always NULL)
+ * @param client identification of the client
+ * @param message the actual message
+ * @return #GNUNET_OK to keep the connection open,
+ * #GNUNET_SYSERR to close it (signal serious error)
+ */
+static void
+handle_start (void *cls, struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
+{
+ const char *servicename;
+ struct ServiceList *sl;
+ uint16_t size;
+ uint64_t request_id;
+ struct GNUNET_ARM_Message *amsg;
+
+ amsg = (struct GNUNET_ARM_Message *) message;
+ request_id = GNUNET_ntohll (amsg->request_id);
+ size = ntohs (amsg->header.size);
+ size -= sizeof (struct GNUNET_ARM_Message);
+ servicename = (const char *) &amsg[1];
+ if ((size == 0) || (servicename[size - 1] != '\0'))
{
- 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);
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
- sl = find_name (servicename);
- if (sl != NULL)
+ if (GNUNET_YES == in_shutdown)
{
- /* 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);
+ signal_result (client, servicename, request_id, GNUNET_ARM_RESULT_IN_SHUTDOWN);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string (cfg,
- servicename, "BINARY", &binary))
+ sl = find_service (servicename);
+ if (NULL == sl)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Binary implementing service `%s' not known!\n"),
- servicename);
- signal_result (client, servicename, GNUNET_MESSAGE_TYPE_ARM_IS_DOWN);
+ signal_result (client, servicename, request_id, GNUNET_ARM_RESULT_IS_NOT_KNOWN);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
- if ((GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_filename (cfg,
- servicename,
- "CONFIG",
- &config)) ||
- (0 != STAT (config, &sbuf)))
+ sl->is_default = GNUNET_YES;
+ if (sl->proc != NULL)
{
- 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);
+ signal_result (client, servicename, request_id, GNUNET_ARM_RESULT_IS_STARTED_ALREADY);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
- 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;
- running = sl;
- start_process (sl);
- if (NULL != client)
- signal_result (client, servicename, GNUNET_MESSAGE_TYPE_ARM_IS_UP);
+ start_process (sl, client, request_id);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
/**
- * Free the given entry in the service list and signal
- * the given client that the service is now down.
+ * Start a shutdown sequence.
*
- * @param cls pointer to the client ("struct GNUNET_SERVER_Client*")
- * @param pos entry for the service
+ * @param cls closure (refers to service)
+ * @param tc task context
*/
static void
-free_and_signal (void *cls, struct ServiceList *pos)
+trigger_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct GNUNET_SERVER_Client *client = cls;
- /* find_name will remove "pos" from the list! */
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Service `%s' stopped\n", pos->name);
- signal_result (client, pos->name, GNUNET_MESSAGE_TYPE_ARM_IS_DOWN);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
- GNUNET_SERVER_client_drop (client);
- free_entry (pos);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Triggering shutdown\n");
+ GNUNET_SCHEDULER_shutdown ();
}
/**
- * Stop the specified service.
+ * Handle STOP-message.
*
- * @param client who is asking for this
- * @param servicename name of the service to stop
+ * @param cls closure (always NULL)
+ * @param client identification of the client
+ * @param message the actual message
+ * @return #GNUNET_OK to keep the connection open,
+ * #GNUNET_SYSERR to close it (signal serious error)
*/
static void
-stop_service (struct GNUNET_SERVER_Client *client,
- const char *servicename)
+handle_stop (void *cls, struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
{
- struct ServiceList *pos;
-
+ struct ServiceList *sl;
+ const char *servicename;
+ uint16_t size;
+ uint64_t request_id;
+ struct GNUNET_ARM_Message *amsg;
+
+ amsg = (struct GNUNET_ARM_Message *) message;
+ request_id = GNUNET_ntohll (amsg->request_id);
+ size = ntohs (amsg->header.size);
+ size -= sizeof (struct GNUNET_ARM_Message);
+ servicename = (const char *) &amsg[1];
+ if ((size == 0) || (servicename[size - 1] != '\0'))
+ {
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Preparing to stop `%s'\n"), servicename);
- pos = find_name (servicename);
- if (pos == NULL)
+ _("Preparing to stop `%s'\n"), servicename);
+ if (0 == strcasecmp (servicename, "arm"))
+ {
+ broadcast_status (servicename, GNUNET_ARM_SERVICE_STOPPING, NULL);
+ signal_result (client, servicename, request_id, GNUNET_ARM_RESULT_STOPPING);
+ GNUNET_SERVER_client_persist_ (client);
+ GNUNET_SCHEDULER_add_now (trigger_shutdown, NULL);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
+ }
+ sl = find_service (servicename);
+ if (sl == NULL)
{
- signal_result (client, servicename, GNUNET_MESSAGE_TYPE_ARM_IS_UNKNOWN);
+ signal_result (client, servicename, request_id, GNUNET_ARM_RESULT_IS_NOT_KNOWN);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
- if (pos->rc > 1)
+ sl->is_default = GNUNET_NO;
+ if (GNUNET_YES == in_shutdown)
{
- /* 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);
+ /* shutdown in progress */
+ signal_result (client, servicename, request_id, GNUNET_ARM_RESULT_IN_SHUTDOWN);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
- if (pos->rc == 1)
- pos->rc--; /* decrement RC to zero */
- if (pos->kill_continuation != NULL)
+ if (sl->killing_client != NULL)
{
/* killing already in progress */
-#if DEBUG_ARM
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Service `%s' is already down\n", servicename);
-#endif
- signal_result (client, servicename, GNUNET_MESSAGE_TYPE_ARM_IS_DOWN);
+ signal_result (client, servicename, request_id,
+ GNUNET_ARM_RESULT_IS_STOPPING_ALREADY);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
-
- if (GNUNET_YES == in_shutdown)
+ if (sl->proc == NULL)
{
-#if DEBUG_ARM
- 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);
+ /* process is down */
+ signal_result (client, servicename, request_id,
+ GNUNET_ARM_RESULT_IS_STOPPED_ALREADY);
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);
-#endif
- if (0 != PLIBC_KILL (pos->pid, SIGTERM))
+ broadcast_status (servicename, GNUNET_ARM_SERVICE_STOPPING, NULL);
+ /* no signal_start - only when it's STOPPED */
+ sl->killed_at = GNUNET_TIME_absolute_get ();
+ if (0 != GNUNET_OS_process_kill (sl->proc, SIGTERM))
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
- pos->next = running;
- running = pos;
- pos->kill_continuation = &free_and_signal;
- pos->kill_continuation_cls = client;
+ sl->killing_client = client;
+ sl->killing_client_request_id = request_id;
GNUNET_SERVER_client_keep (client);
- GNUNET_SCHEDULER_add_delayed (sched,
- MAINT_FAST_FREQUENCY, &maint, "non-null");
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
/**
- * Handle START-message.
+ * Handle LIST-message.
*
* @param cls closure (always NULL)
* @param client identification of the client
* @param message the actual message
- * @return GNUNET_OK to keep the connection open,
- * 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_list (void *cls, struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
{
- const char *servicename;
- uint16_t size;
+ struct GNUNET_ARM_ListResultMessage *msg;
+ struct GNUNET_ARM_Message *request;
+ size_t string_list_size;
+ size_t total_size;
+ struct ServiceList *sl;
+ uint16_t count;
- size = ntohs (message->size);
- size -= sizeof (struct GNUNET_MessageHeader);
- servicename = (const char *) &message[1];
- if ((size == 0) || (servicename[size - 1] != '\0'))
+ if (NULL == client)
+ return;
+
+ request = (struct GNUNET_ARM_Message *) message;
+ count = 0;
+ string_list_size = 0;
+ /* first count the running processes get their name's size */
+ for (sl = running_head; sl != NULL; sl = sl->next)
+ {
+ if (sl->proc != NULL)
{
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
+ string_list_size += strlen (sl->name);
+ string_list_size += strlen (sl->binary);
+ string_list_size += 4;
+ count++;
+ }
+ }
+
+ total_size = sizeof (struct GNUNET_ARM_ListResultMessage)
+ + string_list_size;
+ msg = GNUNET_malloc (total_size);
+ msg->arm_msg.header.size = total_size;
+ msg->arm_msg.header.type = GNUNET_MESSAGE_TYPE_ARM_LIST_RESULT;
+ msg->arm_msg.request_id = GNUNET_ntohll (request->request_id);
+ msg->count = count;
+
+ char *pos = (char *)&msg[1];
+ for (sl = running_head; sl != NULL; sl = sl->next)
+ {
+ if (sl->proc != NULL)
+ {
+ size_t s = strlen (sl->name) + strlen (sl->binary) + 4;
+ GNUNET_snprintf(pos, s, "%s (%s)", sl->name, sl->binary);
+ pos += s;
}
- start_service (client, servicename);
+ }
+
+ GNUNET_SERVER_notify_transmit_ready (client,
+ total_size,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ write_list_result, msg);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
/**
- * Handle STOP-message.
+ * We are done with everything. Stop remaining
+ * tasks, signal handler and the server.
+ */
+static void
+do_shutdown ()
+{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Last shutdown phase\n");
+ if (NULL != notifier)
+ {
+ GNUNET_SERVER_notification_context_destroy (notifier);
+ notifier = NULL;
+ }
+ 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;
+ }
+}
+
+
+static unsigned int
+list_count (struct ServiceList *running_head)
+{
+ struct ServiceList *i;
+ unsigned int res = 0;
+
+ for (res = 0, i = running_head; i; i = i->next, res++)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "%s\n",
+ i->name);
+ return res;
+}
+
+
+/**
+ * Task run for shutdown.
*
- * @param cls closure (always NULL)
- * @param client identification of the client
- * @param message the actual message
- * @return GNUNET_OK to keep the connection open,
- * GNUNET_SYSERR to close it (signal serious error)
+ * @param cls closure, NULL if we need to self-restart
+ * @param tc context
*/
static void
-handle_stop (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- const char *servicename;
- uint16_t size;
+ struct ServiceList *pos;
+ struct ServiceList *nxt;
+ struct ServiceListeningInfo *sli;
- size = ntohs (message->size);
- size -= sizeof (struct GNUNET_MessageHeader);
- servicename = (const char *) &message[1];
- if ((size == 0) || (servicename[size - 1] != '\0'))
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "First shutdown phase\n");
+ 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;
+ /* first, stop listening */
+ for (pos = running_head; NULL != pos; pos = pos->next)
+ {
+ while (NULL != (sli = pos->listen_head))
+ {
+ GNUNET_CONTAINER_DLL_remove (pos->listen_head,
+ pos->listen_tail, sli);
+ if (sli->accept_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (sli->accept_task);
+ sli->accept_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ GNUNET_break (GNUNET_OK ==
+ GNUNET_NETWORK_socket_close (sli->listen_socket));
+ GNUNET_free (sli->service_addr);
+ GNUNET_free (sli);
+ }
+ }
+ /* then, shutdown all existing service processes */
+ nxt = running_head;
+ while (NULL != (pos = nxt))
+ {
+ nxt = pos->next;
+ if (pos->proc != NULL)
{
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Stopping service `%s'\n",
+ pos->name);
+ pos->killed_at = GNUNET_TIME_absolute_get ();
+ if (0 != GNUNET_OS_process_kill (pos->proc, SIGTERM))
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+ }
+ else
+ {
+ free_service (pos);
}
- stop_service (client, servicename);
+ }
+ /* finally, should all service processes be already gone, terminate for real */
+ if (running_head == NULL)
+ do_shutdown ();
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Delaying shutdown, have %u childs still running\n",
+ list_count (running_head));
}
/**
- * Background task doing maintenance.
+ * Task run whenever it is time to restart a child that died.
+ *
+ * @param cls closure, always NULL
+ * @param tc context
+ */
+static void
+delayed_restart_task (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct ServiceList *sl;
+ struct GNUNET_TIME_Relative lowestRestartDelay;
+ struct ServiceListeningInfo *sli;
+
+ child_restart_task = GNUNET_SCHEDULER_NO_TASK;
+ if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
+ 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 */
+ for (sl = running_head; NULL != sl; sl = sl->next)
+ {
+ if (NULL != sl->proc)
+ continue;
+ /* service is currently not running */
+ if (0 == GNUNET_TIME_absolute_get_remaining (sl->restart_at).rel_value_us)
+ {
+ /* restart is now allowed */
+ if (sl->is_default)
+ {
+ /* process should run by default, start immediately */
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ _("Restarting service `%s'.\n"), sl->name);
+ start_process (sl, NULL, 0);
+ }
+ else
+ {
+ /* process is run on-demand, ensure it is re-started if there is demand */
+ for (sli = sl->listen_head; NULL != sli; sli = sli->next)
+ if (GNUNET_SCHEDULER_NO_TASK == sli->accept_task)
+ {
+ /* accept was actually paused, so start it again */
+ sli->accept_task =
+ GNUNET_SCHEDULER_add_read_net
+ (GNUNET_TIME_UNIT_FOREVER_REL, sli->listen_socket,
+ &accept_connection, sli);
+ }
+ }
+ }
+ else
+ {
+ /* update calculation for earliest time to reactivate a service */
+ lowestRestartDelay =
+ GNUNET_TIME_relative_min (lowestRestartDelay,
+ GNUNET_TIME_absolute_get_remaining
+ (sl->restart_at));
+ }
+ }
+ if (lowestRestartDelay.rel_value_us != GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Will restart process in %s\n",
+ GNUNET_STRINGS_relative_time_to_string (lowestRestartDelay, GNUNET_YES));
+ child_restart_task =
+ GNUNET_SCHEDULER_add_delayed_with_priority (lowestRestartDelay,
+ GNUNET_SCHEDULER_PRIORITY_IDLE,
+ &delayed_restart_task, NULL);
+ }
+}
+
+
+/**
+ * Task triggered whenever we receive a SIGCHLD (child
+ * process died).
*
* @param cls closure, NULL if we need to self-restart
* @param tc context
*/
static void
-maint (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+maint_child_death (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct ServiceList *pos;
- struct ServiceList *prev;
struct ServiceList *next;
+ struct ServiceListeningInfo *sli;
const char *statstr;
int statcode;
- struct stat sbuf;
int ret;
-
- if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
+ char c[16];
+ enum GNUNET_OS_ProcessStatusType statusType;
+ unsigned long statusCode;
+ const struct GNUNET_DISK_FileHandle *pr;
+
+ pr = GNUNET_DISK_pipe_handle (sigpipe, GNUNET_DISK_PIPE_END_READ);
+ child_death_task = GNUNET_SCHEDULER_NO_TASK;
+ if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY))
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Stopping all services\n"));
- in_shutdown = GNUNET_YES;
- pos = running;
- while (NULL != pos)
- {
- 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;
- }
- }
- if (cls == NULL)
- {
- if ( (in_shutdown == GNUNET_YES) &&
- (running == NULL) )
- {
-#if DEBUG_ARM
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "ARM service terminates.\n");
-#endif
- GNUNET_assert (server != NULL);
- GNUNET_SERVER_destroy (server);
- server = NULL;
- return; /* we are done! */
- }
- GNUNET_SCHEDULER_add_delayed (tc->sched,
- (in_shutdown == GNUNET_YES)
- ? MAINT_FAST_FREQUENCY
- : MAINT_FREQUENCY,
- &maint, NULL);
+ /* 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))
{
- enum GNUNET_OS_ProcessStatusType statusType;
- unsigned long statusCode;
-
next = pos->next;
- if ( (NULL != pos->kill_continuation) ||
- ( (GNUNET_YES == in_shutdown) &&
- (pos->pid == 0) ) )
- {
- if (prev == NULL)
- running = next;
- else
- prev->next = next;
- if (NULL != pos->kill_continuation)
- pos->kill_continuation (pos->kill_continuation_cls, pos);
- else
- free_entry (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 (pos->proc == NULL)
+ {
+ if (GNUNET_YES == in_shutdown)
+ free_service (pos);
+ 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)
- {
- statstr = _( /* process termination method */ "exit");
- statcode = statusCode;
- }
+ {
+ statstr = _( /* process termination method */ "exit");
+ statcode = statusCode;
+ }
else if (statusType == GNUNET_OS_PROCESS_SIGNALED)
- {
- statstr = _( /* process termination method */ "signal");
- statcode = statusCode;
- }
+ {
+ statstr = _( /* process termination method */ "signal");
+ statcode = statusCode;
+ }
else
- {
- statstr = _( /* process termination method */ "unknown");
- statcode = 0;
- }
+ {
+ statstr = _( /* process termination method */ "unknown");
+ statcode = 0;
+ }
+ if (0 != pos->killed_at.abs_value_us)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ _("Service `%s' took %s to terminate\n"),
+ pos->name,
+ GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_duration (pos->killed_at), GNUNET_YES));
+ }
+ GNUNET_OS_process_destroy (pos->proc);
+ pos->proc = NULL;
+ broadcast_status (pos->name, GNUNET_ARM_SERVICE_STOPPED, NULL);
+ if (NULL != pos->killing_client)
+ {
+ signal_result (pos->killing_client, pos->name,
+ pos->killing_client_request_id, GNUNET_ARM_RESULT_STOPPED);
+ GNUNET_SERVER_client_drop (pos->killing_client);
+ pos->killing_client = NULL;
+ pos->killing_client_request_id = 0;
+ }
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);
-#if DEBUG_ARM
- else
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Service `%s' terminated with status %s/%d\n",
- pos->name, statstr, statcode);
-#endif
- /* schedule restart */
- pos->pid = 0;
- prev = pos;
- }
-
- /* check for services that need to be restarted due to
- configuration changes or because the last restart failed */
- pos = running;
- while (pos != NULL)
- {
- if ((0 == STAT (pos->config, &sbuf)) && (pos->mtime < sbuf.st_mtime))
+ {
+ if ((statusType == GNUNET_OS_PROCESS_EXITED) && (statcode == 0))
{
+ /* process terminated normally, allow restart at any time */
+ pos->restart_at.abs_value_us = 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");
- }
- if ( (pos->pid == 0) &&
- (GNUNET_YES != in_shutdown) )
+ _("Service `%s' terminated normally, will restart at any time\n"),
+ pos->name);
+ /* process can still be re-started on-demand, ensure it is re-started if there is demand */
+ for (sli = pos->listen_head; NULL != sli; sli = sli->next)
+ {
+ GNUNET_break (GNUNET_SCHEDULER_NO_TASK == sli->accept_task);
+ sli->accept_task =
+ GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
+ sli->listen_socket, &accept_connection, sli);
+ }
+ }
+ else
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Restarting service `%s'.\n"), pos->name);
- /* FIXME: should have some exponentially
- increasing timer to avoid tight restart loops */
- start_process (pos);
+ if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ _("Service `%s' terminated with status %s/%d, will restart in %s\n"),
+ pos->name, statstr, statcode,
+ GNUNET_STRINGS_relative_time_to_string (pos->backoff, GNUNET_YES));
+ /* schedule restart */
+ pos->restart_at = GNUNET_TIME_relative_to_absolute (pos->backoff);
+ pos->backoff = GNUNET_TIME_STD_BACKOFF (pos->backoff);
+ 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);
}
- pos = pos->next;
+ }
+ else
+ {
+ free_service (pos);
+ }
}
+ child_death_task = GNUNET_SCHEDULER_add_read_file (
+ GNUNET_TIME_UNIT_FOREVER_REL, pr, &maint_child_death, NULL);
+ if ((NULL == running_head) && (GNUNET_YES == in_shutdown))
+ do_shutdown ();
+ else if (GNUNET_YES == in_shutdown)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Delaying shutdown after child's death, still have %u children\n",
+ list_count (running_head));
+
}
/**
- * List of handlers for the messages understood by this service.
+ * Signal handler called for SIGCHLD. Triggers the
+ * respective handler by writing to the trigger pipe.
*/
-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
+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)));
+ errno = old_errno; /* restore errno */
+}
+
+
+/**
+ * Setup our service record for the given section in the configuration file
+ * (assuming the section is for a service).
+ *
+ * @param cls unused
+ * @param section a section in the configuration file
+ * @return #GNUNET_OK (continue)
+ */
+static void
+setup_service (void *cls, const char *section)
+{
+ struct ServiceList *sl;
+ char *binary;
+ char *config;
+ struct stat sbuf;
+ struct sockaddr **addrs;
+ socklen_t *addr_lens;
+ int ret;
+ unsigned int i;
+
+ if (strcasecmp (section, "arm") == 0)
+ return;
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_string (cfg, section, "BINARY", &binary))
+ {
+ /* not a service section */
+ return;
+ }
+ sl = find_service (section);
+ if (NULL != sl)
+ {
+ /* got the same section twice!? */
+ GNUNET_break (0);
+ GNUNET_free (binary);
+ return;
+ }
+ config = NULL;
+ if (( (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_filename (cfg, section, "CONFIG",
+ &config)) &&
+ (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_filename (cfg, "PATHS", "DEFAULTCONFIG",
+ &config)) ) ||
+ (0 != STAT (config, &sbuf)))
+ {
+ if (NULL != config)
+ {
+ GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_WARNING,
+ section, "CONFIG",
+ STRERROR (errno));
+ GNUNET_free (config);
+ config = NULL;
+ }
+ }
+ sl = GNUNET_new (struct ServiceList);
+ sl->name = GNUNET_strdup (section);
+ sl->binary = binary;
+ sl->config = config;
+ sl->backoff = GNUNET_TIME_UNIT_MILLISECONDS;
+ sl->restart_at = GNUNET_TIME_UNIT_FOREVER_ABS;
+#if WINDOWS
+ sl->pipe_control = GNUNET_YES;
+#else
+ if (GNUNET_CONFIGURATION_have_value (cfg, section, "PIPECONTROL"))
+ sl->pipe_control = GNUNET_CONFIGURATION_get_value_yesno (cfg, section, "PIPECONTROL");
+#endif
+ GNUNET_CONTAINER_DLL_insert (running_head, running_tail, sl);
+ if (GNUNET_YES !=
+ GNUNET_CONFIGURATION_get_value_yesno (cfg, section, "AUTOSTART"))
+ return;
+ if (0 >= (ret = GNUNET_SERVICE_get_server_addresses (section, cfg,
+ &addrs, &addr_lens)))
+ return;
+ /* this will free (or capture) addrs[i] */
+ for (i = 0; i < ret; i++)
+ create_listen_socket (addrs[i], addr_lens[i], sl);
+ GNUNET_free (addrs);
+ GNUNET_free (addr_lens);
+}
+
+
+/**
+ * A client connected, add it to the notification context.
+ *
+ * @param cls closure
+ * @param client identification of the client
+ */
+static void
+handle_client_connecting (void *cls, struct GNUNET_SERVER_Client *client)
+{
+ /* All clients are considered to be of the "monitor" kind
+ * (that is, they don't affect ARM shutdown).
+ */
+ if (NULL != client)
+ GNUNET_SERVER_client_mark_monitor (client);
+}
+
+
+/**
+ * Handle MONITOR-message.
+ *
+ * @param cls closure (always NULL)
+ * @param client identification of the client
+ * @param message the actual message
+ * @return #GNUNET_OK to keep the connection open,
+ * #GNUNET_SYSERR to close it (signal serious error)
+ */
+static void
+handle_monitor (void *cls, struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
+{
+ /* Removal is handled by the server implementation, internally. */
+ if ((NULL != client) && (NULL != notifier))
+ {
+ GNUNET_SERVER_notification_context_add (notifier, client);
+ broadcast_status ("arm", GNUNET_ARM_SERVICE_MONITORING_STARTED, client);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ }
+}
/**
* 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_monitor, NULL, GNUNET_MESSAGE_TYPE_ARM_MONITOR,
+ sizeof (struct GNUNET_MessageHeader)},
+ {&handle_list, NULL, GNUNET_MESSAGE_TYPE_ARM_LIST,
+ sizeof (struct GNUNET_ARM_Message)},
+ {NULL, NULL, 0, 0}
+ };
char *defaultservices;
- char *pos;
+ const char *pos;
+ struct ServiceList *sl;
- GNUNET_SERVER_ignore_shutdown (serv, GNUNET_YES);
- GNUNET_assert (serv != NULL);
cfg = c;
- sched = s;
server = serv;
+ GNUNET_assert (serv != NULL);
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
+ NULL);
+ child_death_task =
+ GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
+ GNUNET_DISK_pipe_handle (sigpipe,
+ GNUNET_DISK_PIPE_END_READ),
+ &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 ("");
+
+ GNUNET_CONFIGURATION_iterate_sections (cfg, &setup_service, NULL);
+
/* 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);
-#endif
- pos = strtok (defaultservices, " ");
- while (pos != NULL)
- {
- start_service (NULL, pos);
- pos = strtok (NULL, " ");
- }
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ _("Starting default services `%s'\n"), defaultservices);
+ if (0 < strlen (defaultservices))
+ {
+ for (pos = strtok (defaultservices, " "); NULL != pos;
+ pos = strtok (NULL, " "))
+ {
+ sl = find_service (pos);
+ if (NULL == sl)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _
+ ("Default service `%s' not configured correctly!\n"),
+ pos);
+ continue;
+ }
+ sl->is_default = GNUNET_YES;
+ start_process (sl, NULL, 0);
+ }
+ }
GNUNET_free (defaultservices);
}
else
{
-#if DEBUG_ARM
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "No default services configured.\n");
-#endif
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ _
+ ("No default services configured, GNUnet will not really start right now.\n"));
}
+ notifier =
+ GNUNET_SERVER_notification_context_create (server, MAX_NOTIFY_QUEUE);
+ GNUNET_SERVER_connect_notify (server, handle_client_connecting, NULL);
/* process client requests */
GNUNET_SERVER_add_handlers (server, handlers);
-
- /* manage services */
- GNUNET_SCHEDULER_add_with_priority (sched,
- GNUNET_SCHEDULER_PRIORITY_IDLE,
- &maint, 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_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_SERVICE_OPTION_MANUAL_SHUTDOWN, &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