/*
This file is part of GNUnet.
- (C) 2009, 2010, 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2009, 2010, 2012, 2014, 2016 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
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.
*/
/**
/**
* For which client is this watch entry?
*/
- struct GNUNET_SERVER_Client *client;
+ struct ClientEntry *ce;
/**
* Last value we communicated to the client for this watch entry.
/**
* Is last_value valid
- * GNUNET_NO : last_value is n/a, GNUNET_YES: last_value is valid
+ * #GNUNET_NO : last_value is n/a, #GNUNET_YES: last_value is valid
*/
int last_value_set;
/**
- * Client entry.
+ * We keep the statistics organized by subsystem for faster
+ * lookup during SET operations.
*/
-struct ClientEntry
-{
- /**
- * Clients are kept in a linked list.
- */
- struct ClientEntry *next;
+struct SubsystemEntry;
- /**
- * Clients are kept in a linked list.
- */
- struct ClientEntry *prev;
-
- /**
- * Corresponding server handle.
- */
- struct GNUNET_SERVER_Client *client;
-
- /**
- * Maximum watch ID used by this client so far.
- */
- uint32_t max_wid;
-
-};
/**
* Entry in the statistics list.
struct StatsEntry *next;
/**
- * Name of the service, points into the
- * middle of msg.
+ * This is a linked list.
*/
- const char *service;
+ struct StatsEntry *prev;
/**
- * Name for the value, points into
- * the middle of msg.
+ * Subsystem this entry belongs to.
*/
- const char *name;
+ struct SubsystemEntry *subsystem;
/**
- * Message that can be used to set this value,
- * stored at the end of the memory used by
+ * Name for the value stored by this entry, allocated at the end of
* this struct.
*/
- struct GNUNET_STATISTICS_SetMessage *msg;
+ const char *name;
/**
- * Watch context for changes to this
- * value, or NULL for none.
+ * Watch context for changes to this value, or NULL for none.
*/
struct WatchEntry *we_head;
/**
- * Watch context for changes to this
- * value, or NULL for none.
+ * Watch context for changes to this value, or NULL for none.
*/
struct WatchEntry *we_tail;
/**
* Is this value set?
- * GNUNET_NO : value is n/a, GNUNET_YES: value is valid
+ * #GNUNET_NO: value is n/a, #GNUNET_YES: value is valid
*/
int set;
};
-/**
- * Our configuration.
- */
-static const struct GNUNET_CONFIGURATION_Handle *cfg;
/**
- * Linked list of our active statistics.
+ * We keep the statistics organized by subsystem for faster
+ * lookup during SET operations.
*/
-static struct StatsEntry *start;
+struct SubsystemEntry
+{
+ /**
+ * Subsystems are kept in a DLL.
+ */
+ struct SubsystemEntry *next;
+
+ /**
+ * Subsystems are kept in a DLL.
+ */
+ struct SubsystemEntry *prev;
+
+ /**
+ * Head of list of values kept for this subsystem.
+ */
+ struct StatsEntry *stat_head;
+
+ /**
+ * Tail of list of values kept for this subsystem.
+ */
+ struct StatsEntry *stat_tail;
+
+ /**
+ * Name of the subsystem this entry is for, allocated at
+ * the end of this struct, do not free().
+ */
+ const char *service;
+
+};
+
/**
- * Head of linked list of connected clients.
+ * Client entry.
*/
-static struct ClientEntry *client_head;
+struct ClientEntry
+{
+ /**
+ * Corresponding server handle.
+ */
+ struct GNUNET_SERVICE_Client *client;
+
+ /**
+ * Corresponding message queue.
+ */
+ struct GNUNET_MQ_Handle *mq;
+
+ /**
+ * Which subsystem is this client writing to (SET/UPDATE)?
+ */
+ struct SubsystemEntry *subsystem;
+
+ /**
+ * Maximum watch ID used by this client so far.
+ */
+ uint32_t max_wid;
+
+};
+
/**
- * Tail of linked list of connected clients.
+ * Our configuration.
*/
-static struct ClientEntry *client_tail;
+static const struct GNUNET_CONFIGURATION_Handle *cfg;
/**
- * Handle to our server.
+ * Head of linked list of subsystems with active statistics.
*/
-static struct GNUNET_SERVER_Handle *srv;
+static struct SubsystemEntry *sub_head;
/**
- * Our notification context.
+ * Tail of linked list of subsystems with active statistics.
*/
-static struct GNUNET_SERVER_NotificationContext *nc;
+static struct SubsystemEntry *sub_tail;
/**
- * Counter used to generate unique values.
+ * Number of connected clients.
*/
-static uint32_t uidgen;
+static unsigned int client_count;
/**
- * Set to YES if we are shutting down as soon as possible.
+ * Our notification context.
*/
-static int in_shutdown;
-
+static struct GNUNET_NotificationContext *nc;
/**
- * Inject a message to our server with a client of 'NULL'.
- *
- * @param cls the 'struct GNUNET_SERVER_Handle'
- * @param client unused
- * @param msg message to inject
+ * Counter used to generate unique values.
*/
-static int
-inject_message (void *cls, void *client, const struct GNUNET_MessageHeader *msg)
-{
- struct GNUNET_SERVER_Handle *server = cls;
-
- GNUNET_break (GNUNET_OK == GNUNET_SERVER_inject (server, NULL, msg));
- return GNUNET_OK;
-}
-
+static uint32_t uidgen;
/**
- * Load persistent values from disk. Disk format is
- * exactly the same format that we also use for
- * setting the values over the network.
- *
- * @param server handle to the server context
+ * Set to #GNUNET_YES if we are shutting down as soon as possible.
*/
-static void
-load (struct GNUNET_SERVER_Handle *server)
-{
- char *fn;
- struct GNUNET_BIO_ReadHandle *rh;
- uint64_t fsize;
- char *buf;
- struct GNUNET_SERVER_MessageStreamTokenizer *mst;
- char *emsg;
-
- fn = GNUNET_DISK_get_home_filename (cfg, "statistics", "statistics.data",
- NULL);
- if (fn == NULL)
- return;
- if ((GNUNET_OK != GNUNET_DISK_file_size (fn, &fsize, GNUNET_NO, GNUNET_YES)) || (fsize == 0))
- {
- GNUNET_free (fn);
- return;
- }
- buf = GNUNET_malloc (fsize);
- rh = GNUNET_BIO_read_open (fn);
- if (!rh)
- {
- GNUNET_free (buf);
- GNUNET_free (fn);
- return;
- }
- if (GNUNET_OK != GNUNET_BIO_read (rh, fn, buf, fsize))
- {
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "read", fn);
- GNUNET_break (GNUNET_OK == GNUNET_BIO_read_close (rh, &emsg));
- GNUNET_free (buf);
- GNUNET_free_non_null (emsg);
- GNUNET_free (fn);
- return;
- }
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Loading %llu bytes of statistics from `%s'\n"),
- fsize, fn);
- mst = GNUNET_SERVER_mst_create (&inject_message, server);
- GNUNET_break (GNUNET_OK ==
- GNUNET_SERVER_mst_receive (mst, NULL, buf, fsize,
- GNUNET_YES, GNUNET_NO));
- GNUNET_SERVER_mst_destroy (mst);
- GNUNET_free (buf);
- GNUNET_break (GNUNET_OK == GNUNET_BIO_read_close (rh, &emsg));
- GNUNET_free_non_null (emsg);
- GNUNET_free (fn);
-}
+static int in_shutdown;
/**
static void
save ()
{
+ struct SubsystemEntry *se;
struct StatsEntry *pos;
char *fn;
struct GNUNET_BIO_WriteHandle *wh;
-
uint16_t size;
unsigned long long total;
+ size_t nlen;
+ size_t slen;
+ struct GNUNET_STATISTICS_SetMessage *msg;
- wh = NULL;
- fn = GNUNET_DISK_get_home_filename (cfg, "statistics", "statistics.data",
- NULL);
- if (fn != NULL)
- wh = GNUNET_BIO_write_open (fn);
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_filename (cfg,
+ "STATISTICS",
+ "DATABASE",
+ &fn))
+ {
+ GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+ "STATISTICS",
+ "DATABASE");
+ return;
+ }
+ (void) GNUNET_DISK_directory_create_for_file (fn);
+ wh = GNUNET_BIO_write_open (fn);
total = 0;
- while (NULL != (pos = start))
+ while (NULL != (se = sub_head))
{
- start = pos->next;
- if ((pos->persistent) && (NULL != wh))
+ GNUNET_CONTAINER_DLL_remove (sub_head,
+ sub_tail,
+ se);
+ slen = strlen (se->service) + 1;
+ while (NULL != (pos = se->stat_head))
{
- size = htons (pos->msg->header.size);
- if (GNUNET_OK != GNUNET_BIO_write (wh, pos->msg, size))
+ GNUNET_CONTAINER_DLL_remove (se->stat_head,
+ se->stat_tail,
+ pos);
+ if ( (pos->persistent) &&
+ (NULL != wh) )
{
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "write", fn);
- if (GNUNET_OK != GNUNET_BIO_write_close (wh))
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "close", fn);
- wh = NULL;
+ nlen = strlen (pos->name) + 1;
+ size = sizeof (struct GNUNET_STATISTICS_SetMessage) + nlen + slen;
+ GNUNET_assert (size < UINT16_MAX);
+ msg = GNUNET_malloc (size);
+
+ msg->header.size = htons ((uint16_t) size);
+ msg->header.type = htons (GNUNET_MESSAGE_TYPE_STATISTICS_SET);
+ GNUNET_assert (nlen + slen ==
+ GNUNET_STRINGS_buffer_fill ((char *) &msg[1],
+ nlen + slen,
+ 2,
+ se->service,
+ pos->name));
+ msg->flags = htonl (pos->persistent ? GNUNET_STATISTICS_SETFLAG_PERSISTENT : 0);
+ msg->value = GNUNET_htonll (pos->value);
+ if (GNUNET_OK != GNUNET_BIO_write (wh,
+ msg,
+ size))
+ {
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
+ "write",
+ fn);
+ if (GNUNET_OK != GNUNET_BIO_write_close (wh))
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
+ "close",
+ fn);
+ wh = NULL;
+ }
+ else
+ {
+ total += size;
+ }
+ GNUNET_free (msg);
}
- else
- total += size;
+ GNUNET_free (pos);
}
- GNUNET_free (pos);
+ GNUNET_free (se);
}
if (NULL != wh)
{
- if (GNUNET_OK != GNUNET_BIO_write_close (wh))
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "close", fn);
- if (total == 0)
- GNUNET_break (0 == UNLINK (fn));
+ if (GNUNET_OK !=
+ GNUNET_BIO_write_close (wh))
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
+ "close",
+ fn);
+ if (0 == total)
+ GNUNET_break (0 ==
+ UNLINK (fn));
else
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Wrote %llu bytes of statistics to `%s'\n"), total, fn);
+ _("Wrote %llu bytes of statistics to `%s'\n"),
+ total,
+ fn);
}
GNUNET_free_non_null (fn);
}
* @param e value to transmit
*/
static void
-transmit (struct GNUNET_SERVER_Client *client, const struct StatsEntry *e)
+transmit (struct ClientEntry *ce,
+ const struct StatsEntry *e)
{
+ struct GNUNET_MQ_Envelope *env;
struct GNUNET_STATISTICS_ReplyMessage *m;
size_t size;
- size =
- sizeof (struct GNUNET_STATISTICS_ReplyMessage) + strlen (e->service) + 1 +
- strlen (e->name) + 1;
- GNUNET_assert (size < GNUNET_SERVER_MAX_MESSAGE_SIZE);
- m = GNUNET_malloc (size);
- m->header.type = htons (GNUNET_MESSAGE_TYPE_STATISTICS_VALUE);
- m->header.size = htons (size);
+ size = strlen (e->subsystem->service) + 1 +
+ strlen (e->name) + 1;
+ GNUNET_assert (size < GNUNET_MAX_MESSAGE_SIZE);
+ env = GNUNET_MQ_msg_extra (m,
+ size,
+ GNUNET_MESSAGE_TYPE_STATISTICS_VALUE);
m->uid = htonl (e->uid);
if (e->persistent)
m->uid |= htonl (GNUNET_STATISTICS_PERSIST_BIT);
m->value = GNUNET_htonll (e->value);
- size -= sizeof (struct GNUNET_STATISTICS_ReplyMessage);
GNUNET_assert (size ==
- GNUNET_STRINGS_buffer_fill ((char *) &m[1], size, 2,
- e->service, e->name));
+ GNUNET_STRINGS_buffer_fill ((char *) &m[1],
+ size,
+ 2,
+ e->subsystem->service,
+ e->name));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Transmitting value for `%s:%s' (%d): %llu\n", e->service,
- e->name, e->persistent, e->value);
- GNUNET_SERVER_notification_context_unicast (nc, client, &m->header,
- GNUNET_NO);
- GNUNET_free (m);
+ "Transmitting value for `%s:%s' (%d): %llu\n",
+ e->subsystem->service,
+ e->name,
+ e->persistent,
+ (unsigned long long) e->value);
+ GNUNET_MQ_send (ce->mq,
+ env);
}
/**
- * Does this entry match the request?
+ * Callback called when a client connects to the service.
*
- * @param e an entry
- * @param service name of service to match
- * @param name value to match
- * @return 1 if they match, 0 if not
+ * @param cls closure for the service
+ * @param c the new client that connected to the service
+ * @param mq the message queue used to send messages to the client
+ * @return @a c
*/
-static int
-matches (const struct StatsEntry *e, const char *service, const char *name)
+static void *
+client_connect_cb (void *cls,
+ struct GNUNET_SERVICE_Client *c,
+ struct GNUNET_MQ_Handle *mq)
{
- return ((0 == strlen (service)) || (0 == strcmp (service, e->service))) &&
- ((0 == strlen (name)) || (0 == strcmp (name, e->name)));
+ struct ClientEntry *ce;
+
+ ce = GNUNET_new (struct ClientEntry);
+ ce->client = c;
+ ce->mq = mq;
+ client_count++;
+ GNUNET_notification_context_add (nc,
+ mq);
+ return ce;
}
/**
- * Find a client entry for the given client handle, or create one.
+ * Check integrity of GET-message.
*
- * @param client handle to match
- * @return corresponding client entry struct
+ * @param cls identification of the client
+ * @param message the actual message
+ * @return #GNUNET_OK if @a message is well-formed
*/
-static struct ClientEntry *
-make_client_entry (struct GNUNET_SERVER_Client *client)
+static int
+check_get (void *cls,
+ const struct GNUNET_MessageHeader *message)
{
- struct ClientEntry *ce;
+ const char *service;
+ const char *name;
+ size_t size;
- GNUNET_assert (client != NULL);
- ce = client_head;
- while (ce != NULL)
- {
- if (ce->client == client)
- return ce;
- ce = ce->next;
- }
- if (NULL == nc)
+ size = ntohs (message->size) - sizeof (struct GNUNET_MessageHeader);
+ if (size !=
+ GNUNET_STRINGS_buffer_tokenize ((const char *) &message[1],
+ size,
+ 2,
+ &service,
+ &name))
{
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return NULL;
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
}
- ce = GNUNET_new (struct ClientEntry);
- ce->client = client;
- GNUNET_CONTAINER_DLL_insert (client_head, client_tail, ce);
- GNUNET_SERVER_notification_context_add (nc, client);
- return ce;
+ return GNUNET_OK;
}
/**
* Handle GET-message.
*
- * @param cls closure
- * @param client identification of the client
+ * @param cls 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_get (void *cls, struct GNUNET_SERVER_Client *client,
+handle_get (void *cls,
const struct GNUNET_MessageHeader *message)
{
- struct GNUNET_MessageHeader end;
- char *service;
- char *name;
+ struct ClientEntry *ce = cls;
+ struct GNUNET_MQ_Envelope *env;
+ struct GNUNET_MessageHeader *end;
+ const char *service;
+ const char *name;
+ size_t slen;
+ size_t nlen;
+ struct SubsystemEntry *se;
struct StatsEntry *pos;
size_t size;
- if ( (NULL != client) &&
- (NULL == make_client_entry (client)) )
- return; /* new client during shutdown */
size = ntohs (message->size) - sizeof (struct GNUNET_MessageHeader);
- if (size !=
- GNUNET_STRINGS_buffer_tokenize ((const char *) &message[1], size, 2,
- &service, &name))
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
+ GNUNET_assert (size ==
+ GNUNET_STRINGS_buffer_tokenize ((const char *) &message[1],
+ size,
+ 2,
+ &service,
+ &name));
+ slen = strlen (service);
+ nlen = strlen (name);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received request for statistics on `%s:%s'\n",
- strlen (service) ? service : "*", strlen (name) ? name : "*");
- for (pos = start; NULL != pos; pos = pos->next)
- if (matches (pos, service, name))
- transmit (client, pos);
- end.size = htons (sizeof (struct GNUNET_MessageHeader));
- end.type = htons (GNUNET_MESSAGE_TYPE_STATISTICS_END);
- GNUNET_SERVER_notification_context_unicast (nc, client, &end, GNUNET_NO);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ slen ? service : "*",
+ nlen ? name : "*");
+ for (se = sub_head; NULL != se; se = se->next)
+ {
+ if (! ( (0 == slen) ||
+ (0 == strcmp (service, se->service))) )
+ continue;
+ for (pos = se->stat_head; NULL != pos; pos = pos->next)
+ {
+ if (! ( (0 == nlen) ||
+ (0 == strcmp (name,
+ pos->name))) )
+ continue;
+ transmit (ce,
+ pos);
+ }
+ }
+ env = GNUNET_MQ_msg (end,
+ GNUNET_MESSAGE_TYPE_STATISTICS_END);
+ GNUNET_MQ_send (ce->mq,
+ env);
+ GNUNET_SERVICE_client_continue (ce->client);
}
static void
notify_change (struct StatsEntry *se)
{
- struct GNUNET_STATISTICS_WatchValueMessage wvm;
+ struct GNUNET_MQ_Envelope *env;
+ struct GNUNET_STATISTICS_WatchValueMessage *wvm;
struct WatchEntry *pos;
for (pos = se->we_head; NULL != pos; pos = pos->next)
{
pos->last_value_set = GNUNET_YES;
}
- wvm.header.type = htons (GNUNET_MESSAGE_TYPE_STATISTICS_WATCH_VALUE);
- wvm.header.size =
- htons (sizeof (struct GNUNET_STATISTICS_WatchValueMessage));
- wvm.flags = htonl (se->persistent ? GNUNET_STATISTICS_PERSIST_BIT : 0);
- wvm.wid = htonl (pos->wid);
- wvm.reserved = htonl (0);
- wvm.value = GNUNET_htonll (se->value);
- GNUNET_SERVER_notification_context_unicast (nc, pos->client, &wvm.header,
- GNUNET_NO);
+ env = GNUNET_MQ_msg (wvm,
+ GNUNET_MESSAGE_TYPE_STATISTICS_WATCH_VALUE);
+ wvm->flags = htonl (se->persistent ? GNUNET_STATISTICS_SETFLAG_PERSISTENT : 0);
+ wvm->wid = htonl (pos->wid);
+ wvm->reserved = htonl (0);
+ wvm->value = GNUNET_htonll (se->value);
+ GNUNET_MQ_send (pos->ce->mq,
+ env);
pos->last_value = se->value;
}
}
+/**
+ * Find the subsystem entry of the given name for the specified client.
+ *
+ * @param ce client looking for the subsystem, may contain a hint
+ * to find the entry faster, can be NULL
+ * @param service name of the subsystem to look for
+ * @return subsystem entry, never NULL (subsystem entry is created if necessary)
+ */
+static struct SubsystemEntry *
+find_subsystem_entry (struct ClientEntry *ce,
+ const char *service)
+{
+ size_t slen;
+ struct SubsystemEntry *se;
+
+ if (NULL != ce)
+ se = ce->subsystem;
+ else
+ se = NULL;
+ if ( (NULL == se) ||
+ (0 != strcmp (service,
+ se->service)) )
+ {
+ for (se = sub_head; NULL != se; se = se->next)
+ if (0 == strcmp (service,
+ se->service))
+ break;
+ if (NULL != ce)
+ ce->subsystem = se;
+ }
+ if (NULL != se)
+ return se;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Allocating new subsystem entry `%s'\n",
+ service);
+ slen = strlen (service) + 1;
+ se = GNUNET_malloc (sizeof (struct SubsystemEntry) +
+ slen);
+ GNUNET_memcpy (&se[1],
+ service,
+ slen);
+ se->service = (const char *) &se[1];
+ GNUNET_CONTAINER_DLL_insert (sub_head,
+ sub_tail,
+ se);
+ if (NULL != ce)
+ ce->subsystem = se;
+ return se;
+}
+
+
+/**
+ * Find the statistics entry of the given subsystem.
+ *
+ * @param subsystem subsystem to look in
+ * @param name name of the entry to look for
+ * @return statistis entry, or NULL if not found
+ */
+static struct StatsEntry *
+find_stat_entry (struct SubsystemEntry *se,
+ const char *name)
+{
+ struct StatsEntry *pos;
+
+ for (pos = se->stat_head; NULL != pos; pos = pos->next)
+ if (0 == strcmp (name, pos->name))
+ return pos;
+ return NULL;
+}
+
+
+/**
+ * Check format of SET-message.
+ *
+ * @param cls the `struct ClientEntry`
+ * @param message the actual message
+ * @return #GNUNET_OK if message is well-formed
+ */
+static int
+check_set (void *cls,
+ const struct GNUNET_STATISTICS_SetMessage *msg)
+{
+ const char *service;
+ const char *name;
+ size_t msize;
+
+ msize = ntohs (msg->header.size) - sizeof (*msg);
+ if (msize !=
+ GNUNET_STRINGS_buffer_tokenize ((const char *) &msg[1],
+ msize,
+ 2,
+ &service,
+ &name))
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ return GNUNET_OK;
+}
+
+
/**
* Handle SET-message.
*
- * @param cls closure
- * @param client identification of the client
+ * @param cls the `struct ClientEntry`
* @param message the actual message
*/
static void
-handle_set (void *cls, struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+handle_set (void *cls,
+ const struct GNUNET_STATISTICS_SetMessage *msg)
{
- char *service;
- char *name;
+ struct ClientEntry *ce = cls;
+ const char *service;
+ const char *name;
+ size_t nlen;
uint16_t msize;
uint16_t size;
- const struct GNUNET_STATISTICS_SetMessage *msg;
+ struct SubsystemEntry *se;
struct StatsEntry *pos;
- struct StatsEntry *prev;
uint32_t flags;
uint64_t value;
int64_t delta;
int changed;
int initial_set;
- if ( (NULL != client) &&
- (NULL == make_client_entry (client)) )
- return; /* new client during shutdown */
- msize = ntohs (message->size);
- if (msize < sizeof (struct GNUNET_STATISTICS_SetMessage))
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
+ msize = ntohs (msg->header.size);
size = msize - sizeof (struct GNUNET_STATISTICS_SetMessage);
- msg = (const struct GNUNET_STATISTICS_SetMessage *) message;
-
- if (size !=
- GNUNET_STRINGS_buffer_tokenize ((const char *) &msg[1], size, 2, &service,
- &name))
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
+ GNUNET_assert (size ==
+ GNUNET_STRINGS_buffer_tokenize ((const char *) &msg[1],
+ size,
+ 2,
+ &service,
+ &name));
+ se = find_subsystem_entry (ce,
+ service);
flags = ntohl (msg->flags);
value = GNUNET_ntohll (msg->value);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received request to update statistic on `%s:%s' (%u) to/by %llu\n",
- service, name, (unsigned int) flags, (unsigned long long) value);
- pos = start;
- prev = NULL;
- while (pos != NULL)
+ service,
+ name,
+ (unsigned int) flags,
+ (unsigned long long) value);
+ pos = find_stat_entry (se,
+ name);
+ if (NULL != pos)
{
- if (matches (pos, service, name))
+ initial_set = 0;
+ if (0 == (flags & GNUNET_STATISTICS_SETFLAG_RELATIVE))
{
- initial_set = 0;
- if ((flags & GNUNET_STATISTICS_SETFLAG_RELATIVE) == 0)
+ changed = (pos->value != value);
+ pos->value = value;
+ }
+ else
+ {
+ delta = (int64_t) value;
+ if ((delta < 0) && (pos->value < -delta))
{
- changed = (pos->value != value);
- pos->value = value;
+ changed = (0 != pos->value);
+ pos->value = 0;
}
else
{
- delta = (int64_t) value;
- if ((delta < 0) && (pos->value < -delta))
- {
- changed = (pos->value != 0);
- pos->value = 0;
- }
- else
- {
- changed = (delta != 0);
- GNUNET_break ((delta <= 0) || (pos->value + delta > pos->value));
- pos->value += delta;
- }
- }
- if (GNUNET_NO == pos->set)
- {
- pos->set = GNUNET_YES;
- initial_set = 1;
- }
- pos->msg->value = GNUNET_htonll (pos->value);
- pos->msg->flags = msg->flags;
- pos->persistent = (0 != (flags & GNUNET_STATISTICS_SETFLAG_PERSISTENT));
- if (prev != NULL)
- {
- /* move to front for faster setting next time! */
- prev->next = pos->next;
- pos->next = start;
- start = pos;
+ changed = (0 != delta);
+ GNUNET_break ( (delta <= 0) ||
+ (pos->value + delta > pos->value) );
+ pos->value += delta;
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Statistic `%s:%s' updated to value %llu.\n", service, name,
- pos->value);
- if ((changed) || (1 == initial_set))
- notify_change (pos);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
- return;
}
- prev = pos;
- pos = pos->next;
+ if (GNUNET_NO == pos->set)
+ {
+ pos->set = GNUNET_YES;
+ initial_set = 1;
+ }
+ pos->persistent = (0 != (flags & GNUNET_STATISTICS_SETFLAG_PERSISTENT));
+ if (pos != se->stat_head)
+ {
+ /* move to front for faster setting next time! */
+ GNUNET_CONTAINER_DLL_remove (se->stat_head,
+ se->stat_tail,
+ pos);
+ GNUNET_CONTAINER_DLL_insert (se->stat_head,
+ se->stat_tail,
+ pos);
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Statistic `%s:%s' updated to value %llu (%d).\n",
+ service,
+ name,
+ (unsigned long long) pos->value,
+ pos->persistent);
+ if ( (changed) ||
+ (1 == initial_set) )
+ notify_change (pos);
+ GNUNET_SERVICE_client_continue (ce->client);
+ return;
}
- pos = GNUNET_malloc (sizeof (struct StatsEntry) + msize);
- pos->next = start;
- if (((flags & GNUNET_STATISTICS_SETFLAG_RELATIVE) == 0) ||
- (0 < (int64_t) GNUNET_ntohll (msg->value)))
+ /* not found, create a new entry */
+ nlen = strlen (name) + 1;
+ pos = GNUNET_malloc (sizeof (struct StatsEntry) + nlen);
+ GNUNET_memcpy (&pos[1],
+ name,
+ nlen);
+ pos->name = (const char *) &pos[1];
+ pos->subsystem = se;
+ if ( (0 == (flags & GNUNET_STATISTICS_SETFLAG_RELATIVE)) ||
+ (0 < (int64_t) GNUNET_ntohll (msg->value)) )
{
pos->value = GNUNET_ntohll (msg->value);
pos->set = GNUNET_YES;
}
pos->uid = uidgen++;
pos->persistent = (0 != (flags & GNUNET_STATISTICS_SETFLAG_PERSISTENT));
- pos->msg = (void *) &pos[1];
- memcpy (pos->msg, message, ntohs (message->size));
- pos->service = (const char *) &pos->msg[1];
- pos->name = &pos->service[strlen (pos->service) + 1];
-
- start = pos;
+ GNUNET_CONTAINER_DLL_insert (se->stat_head,
+ se->stat_tail,
+ pos);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "New statistic on `%s:%s' with value %llu created.\n", service,
- name, pos->value);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ "New statistic on `%s:%s' with value %llu created.\n",
+ service,
+ name,
+ (unsigned long long) pos->value);
+ if (NULL != ce)
+ GNUNET_SERVICE_client_continue (ce->client);
+}
+
+
+/**
+ * Check integrity of WATCH-message.
+ *
+ * @param cls the `struct ClientEntry *`
+ * @param message the actual message
+ * @return #GNUNET_OK if message is well-formed
+ */
+static int
+check_watch (void *cls,
+ const struct GNUNET_MessageHeader *message)
+{
+ size_t size;
+ const char *service;
+ const char *name;
+
+ size = ntohs (message->size) - sizeof (struct GNUNET_MessageHeader);
+ if (size !=
+ GNUNET_STRINGS_buffer_tokenize ((const char *) &message[1],
+ size,
+ 2,
+ &service,
+ &name))
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ return GNUNET_OK;
}
/**
* Handle WATCH-message.
*
- * @param cls closure
- * @param client identification of the client
+ * @param cls the `struct ClientEntry *`
* @param message the actual message
*/
static void
-handle_watch (void *cls, struct GNUNET_SERVER_Client *client,
+handle_watch (void *cls,
const struct GNUNET_MessageHeader *message)
{
- char *service;
- char *name;
+ struct ClientEntry *ce = cls;
+ const char *service;
+ const char *name;
uint16_t msize;
uint16_t size;
+ struct SubsystemEntry *se;
struct StatsEntry *pos;
- struct ClientEntry *ce;
struct WatchEntry *we;
- size_t slen;
+ size_t nlen;
if (NULL == nc)
{
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ GNUNET_SERVICE_client_drop (ce->client);
return;
}
- GNUNET_SERVER_client_mark_monitor (client);
- ce = make_client_entry (client);
+ GNUNET_SERVICE_client_mark_monitor (ce->client);
msize = ntohs (message->size);
- if (msize < sizeof (struct GNUNET_MessageHeader))
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
size = msize - sizeof (struct GNUNET_MessageHeader);
- if (size !=
- GNUNET_STRINGS_buffer_tokenize ((const char *) &message[1], size, 2,
- &service, &name))
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
+ GNUNET_assert (size ==
+ GNUNET_STRINGS_buffer_tokenize ((const char *) &message[1],
+ size,
+ 2,
+ &service,
+ &name));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received request to watch statistic on `%s:%s'\n", service,
+ "Received request to watch statistic on `%s:%s'\n",
+ service,
name);
- pos = start;
- while (pos != NULL)
+ se = find_subsystem_entry (ce,
+ service);
+ pos = find_stat_entry (se,
+ name);
+ if (NULL == pos)
{
- if (matches (pos, service, name))
- break;
- pos = pos->next;
- }
- if (pos == NULL)
- {
- pos =
- GNUNET_malloc (sizeof (struct StatsEntry) +
- sizeof (struct GNUNET_STATISTICS_SetMessage) + size);
- pos->next = start;
+ nlen = strlen (name) + 1;
+ pos = GNUNET_malloc (sizeof (struct StatsEntry) +
+ nlen);
+ GNUNET_memcpy (&pos[1],
+ name,
+ nlen);
+ pos->name = (const char *) &pos[1];
+ pos->subsystem = se;
+ GNUNET_CONTAINER_DLL_insert (se->stat_head,
+ se->stat_tail,
+ pos);
pos->uid = uidgen++;
pos->set = GNUNET_NO;
- pos->msg = (void *) &pos[1];
- pos->msg->header.size =
- htons (sizeof (struct GNUNET_STATISTICS_SetMessage) + size);
- pos->msg->header.type = htons (GNUNET_MESSAGE_TYPE_STATISTICS_SET);
- pos->service = (const char *) &pos->msg[1];
- slen = strlen (service) + 1;
- memcpy ((void *) pos->service, service, slen);
- pos->name = &pos->service[slen];
- memcpy ((void *) pos->name, name, strlen (name) + 1);
- start = pos;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "New statistic on `%s:%s' with value %llu created.\n", service,
- name, pos->value);
+ "New statistic on `%s:%s' with value %llu created.\n",
+ service,
+ name,
+ (unsigned long long) pos->value);
}
we = GNUNET_new (struct WatchEntry);
- we->client = client;
+ we->ce = ce;
we->last_value_set = GNUNET_NO;
we->wid = ce->max_wid++;
- GNUNET_CONTAINER_DLL_insert (pos->we_head, pos->we_tail, we);
- if (pos->value != 0)
+ GNUNET_CONTAINER_DLL_insert (pos->we_head,
+ pos->we_tail,
+ we);
+ if (0 != pos->value)
notify_change (pos);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_SERVICE_client_continue (ce->client);
+}
+
+
+/**
+ * Handle DISCONNECT-message. Sync to disk and send
+ * back a #GNUNET_MESSAGE_TYPE_STATISTICS_DISCONNECT_CONFIRM
+ * message.
+ *
+ * @param cls the `struct ClientEntry *`
+ * @param message the actual message
+ */
+static void
+handle_disconnect (void *cls,
+ const struct GNUNET_MessageHeader *message)
+{
+ struct ClientEntry *ce = cls;
+ struct GNUNET_MQ_Envelope *env;
+ struct GNUNET_MessageHeader *msg;
+
+ env = GNUNET_MQ_msg (msg,
+ GNUNET_MESSAGE_TYPE_STATISTICS_DISCONNECT_CONFIRM);
+ GNUNET_MQ_send (ce->mq,
+ env);
+ GNUNET_SERVICE_client_continue (ce->client);
}
/**
* Actually perform the shutdown.
*/
-static void
+static void
do_shutdown ()
{
struct WatchEntry *we;
- struct StatsEntry *se;
+ struct StatsEntry *pos;
+ struct SubsystemEntry *se;
if (NULL == nc)
return;
save ();
- GNUNET_SERVER_notification_context_destroy (nc);
- nc = NULL;
- GNUNET_assert (NULL == client_head);
- while (NULL != (se = start))
+ GNUNET_notification_context_destroy (nc);
+ nc = NULL;
+ GNUNET_assert (0 == client_count);
+ while (NULL != (se = sub_head))
{
- start = se->next;
- while (NULL != (we = se->we_head))
+ GNUNET_CONTAINER_DLL_remove (sub_head,
+ sub_tail,
+ se);
+ while (NULL != (pos = se->stat_head))
{
- GNUNET_CONTAINER_DLL_remove (se->we_head, se->we_tail, we);
- GNUNET_free (we);
+ GNUNET_CONTAINER_DLL_remove (se->stat_head,
+ se->stat_tail,
+ pos);
+ while (NULL != (we = pos->we_head))
+ {
+ GNUNET_break (0);
+ GNUNET_CONTAINER_DLL_remove (pos->we_head,
+ pos->we_tail,
+ we);
+ GNUNET_free (we);
+ }
+ GNUNET_free (pos);
}
GNUNET_free (se);
}
* Task run during shutdown.
*
* @param cls unused
- * @param tc unused
*/
static void
-shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls)
{
in_shutdown = GNUNET_YES;
- if (NULL != client_head)
+ if (0 != client_count)
return;
do_shutdown ();
}
*
* @param cls closure, NULL
* @param client identification of the client
+ * @param app_cls the `struct ClientEntry *`
*/
static void
-handle_client_disconnect (void *cls, struct GNUNET_SERVER_Client *client)
+client_disconnect_cb (void *cls,
+ struct GNUNET_SERVICE_Client *client,
+ void *app_cls)
{
- struct ClientEntry *ce;
+ struct ClientEntry *ce = app_cls;
struct WatchEntry *we;
struct WatchEntry *wen;
- struct StatsEntry *se;
+ struct StatsEntry *pos;
+ struct SubsystemEntry *se;
- ce = client_head;
- while (NULL != ce)
+ client_count--;
+ for (se = sub_head; NULL != se; se = se->next)
{
- if (ce->client == client)
+ for (pos = se->stat_head; NULL != pos; pos = pos->next)
{
- GNUNET_CONTAINER_DLL_remove (client_head, client_tail, ce);
- GNUNET_free (ce);
- break;
- }
- ce = ce->next;
- }
- se = start;
- while (NULL != se)
- {
- wen = se->we_head;
- while (NULL != (we = wen))
- {
- wen = we->next;
- if (we->client != client)
- continue;
- GNUNET_CONTAINER_DLL_remove (se->we_head, se->we_tail, we);
- GNUNET_free (we);
+ wen = pos->we_head;
+ while (NULL != (we = wen))
+ {
+ wen = we->next;
+ if (we->ce != ce)
+ continue;
+ GNUNET_CONTAINER_DLL_remove (pos->we_head,
+ pos->we_tail,
+ we);
+ GNUNET_free (we);
+ }
}
- se = se->next;
}
- if ( (NULL == client_head) &&
+ GNUNET_free (ce);
+ if ( (0 == client_count) &&
(GNUNET_YES == in_shutdown) )
do_shutdown ();
}
/**
- * Process statistics requests.
+ * We've read a `struct GNUNET_STATISTICS_SetMessage *` from
+ * disk. Check that it is well-formed, and if so pass it to
+ * the handler for set messages.
*
- * @param cls closure
- * @param server the initialized server
- * @param c configuration to use
+ * @param cls NULL
+ * @param message the message found on disk
+ * @return #GNUNET_OK on success,
+ * #GNUNET_NO to stop further processing (no error)
+ * #GNUNET_SYSERR to stop further processing with error
+ */
+static int
+inject_message (void *cls,
+ const struct GNUNET_MessageHeader *message)
+{
+ uint16_t msize = ntohs (message->size);
+ const struct GNUNET_STATISTICS_SetMessage *sm;
+
+ sm = (const struct GNUNET_STATISTICS_SetMessage *) message;
+ if ( (sizeof (struct GNUNET_STATISTICS_SetMessage) > msize) ||
+ (GNUNET_OK !=
+ check_set (NULL,
+ sm)) )
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ handle_set (NULL,
+ sm);
+ return GNUNET_OK;
+}
+
+
+/**
+ * Load persistent values from disk. Disk format is exactly the same
+ * format that we also use for setting the values over the network.
*/
static void
-run (void *cls, struct GNUNET_SERVER_Handle *server,
- const struct GNUNET_CONFIGURATION_Handle *c)
+load ()
{
- static const struct GNUNET_SERVER_MessageHandler handlers[] = {
- {&handle_set, NULL, GNUNET_MESSAGE_TYPE_STATISTICS_SET, 0},
- {&handle_get, NULL, GNUNET_MESSAGE_TYPE_STATISTICS_GET, 0},
- {&handle_watch, NULL, GNUNET_MESSAGE_TYPE_STATISTICS_WATCH, 0},
- {NULL, NULL, 0, 0}
- };
- cfg = c;
- srv = server;
- GNUNET_SERVER_add_handlers (server, handlers);
- nc = GNUNET_SERVER_notification_context_create (server, 16);
- GNUNET_SERVER_disconnect_notify (server, &handle_client_disconnect, NULL);
- load (server);
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
- NULL);
+ char *fn;
+ struct GNUNET_BIO_ReadHandle *rh;
+ uint64_t fsize;
+ char *buf;
+ struct GNUNET_MessageStreamTokenizer *mst;
+
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_filename (cfg,
+ "STATISTICS",
+ "DATABASE",
+ &fn))
+ {
+ GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+ "STATISTICS",
+ "DATABASE");
+ return;
+ }
+ if ( (GNUNET_OK !=
+ GNUNET_DISK_file_size (fn,
+ &fsize,
+ GNUNET_NO,
+ GNUNET_YES)) ||
+ (0 == fsize) )
+ {
+ GNUNET_free (fn);
+ return;
+ }
+ buf = GNUNET_malloc (fsize);
+ rh = GNUNET_BIO_read_open (fn);
+ if (! rh)
+ {
+ GNUNET_free (buf);
+ GNUNET_free (fn);
+ return;
+ }
+ if (GNUNET_OK !=
+ GNUNET_BIO_read (rh,
+ fn,
+ buf,
+ fsize))
+ {
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
+ "read",
+ fn);
+ GNUNET_break (GNUNET_OK ==
+ GNUNET_BIO_read_close (rh,
+ NULL));
+ GNUNET_free (buf);
+ GNUNET_free (fn);
+ return;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ _("Loading %llu bytes of statistics from `%s'\n"),
+ (unsigned long long) fsize,
+ fn);
+ mst = GNUNET_MST_create (&inject_message,
+ NULL);
+ GNUNET_break (GNUNET_OK ==
+ GNUNET_MST_from_buffer (mst,
+ buf,
+ (size_t) fsize,
+ GNUNET_YES,
+ GNUNET_NO));
+ GNUNET_MST_destroy (mst);
+ GNUNET_free (buf);
+ GNUNET_break (GNUNET_OK ==
+ GNUNET_BIO_read_close (rh,
+ NULL));
+ GNUNET_free (fn);
}
/**
- * The main function for the statistics service.
+ * Process statistics requests.
*
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
+ * @param cls closure
+ * @param c configuration to use
+ * @param service the initialized service
*/
-int
-main (int argc, char *const *argv)
+static void
+run (void *cls,
+ const struct GNUNET_CONFIGURATION_Handle *c,
+ struct GNUNET_SERVICE_Handle *service)
{
- return (GNUNET_OK ==
- GNUNET_SERVICE_run (argc, argv, "statistics",
- GNUNET_SERVICE_OPTION_SOFT_SHUTDOWN, &run, NULL)) ? 0 : 1;
+ cfg = c;
+ nc = GNUNET_notification_context_create (16);
+ load ();
+ GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
+ NULL);
}
-#ifdef LINUX
+
+/**
+ * Define "main" method using service macro.
+ */
+GNUNET_SERVICE_MAIN
+("statistics",
+ GNUNET_SERVICE_OPTION_SOFT_SHUTDOWN,
+ &run,
+ &client_connect_cb,
+ &client_disconnect_cb,
+ NULL,
+ GNUNET_MQ_hd_var_size (set,
+ GNUNET_MESSAGE_TYPE_STATISTICS_SET,
+ struct GNUNET_STATISTICS_SetMessage,
+ NULL),
+ GNUNET_MQ_hd_var_size (get,
+ GNUNET_MESSAGE_TYPE_STATISTICS_GET,
+ struct GNUNET_MessageHeader,
+ NULL),
+ GNUNET_MQ_hd_var_size (watch,
+ GNUNET_MESSAGE_TYPE_STATISTICS_WATCH,
+ struct GNUNET_MessageHeader,
+ NULL),
+ GNUNET_MQ_hd_fixed_size (disconnect,
+ GNUNET_MESSAGE_TYPE_STATISTICS_DISCONNECT,
+ struct GNUNET_MessageHeader,
+ NULL),
+ GNUNET_MQ_handler_end ());
+
+
+#if defined(LINUX) && defined(__GLIBC__)
#include <malloc.h>
/**
* MINIMIZE heap size (way below 128k) since this process doesn't need much.
*/
-void __attribute__ ((constructor)) GNUNET_ARM_memory_init ()
+void __attribute__ ((constructor))
+GNUNET_STATISTICS_memory_init ()
{
mallopt (M_TRIM_THRESHOLD, 4 * 1024);
mallopt (M_TOP_PAD, 1 * 1024);
projects / oweals / gnunet.git / blobdiff