};
/**
- * Linked list of our active statistics.
+ * Our configuration.
*/
-static struct StatsEntry *start;
+static const struct GNUNET_CONFIGURATION_Handle *cfg;
/**
- * Counter used to generate unique values.
+ * Linked list of our active statistics.
*/
-static uint32_t uidgen;
+static struct StatsEntry *start;
/**
* 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
*/
static void
-load (struct GNUNET_SERVER_Handle *server,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+load (struct GNUNET_SERVER_Handle *server)
{
char *fn;
struct GNUNET_DISK_FileHandle *fh;
GNUNET_free (fn);
}
-
/**
* Write persistent statistics to disk.
- *
- * @param cls closure
- * @param cfg configuration to use
*/
static void
-save (void *cls,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+save ()
{
struct StatsEntry *pos;
char *fn;
const struct StatsEntry *e)
{
struct GNUNET_STATISTICS_ReplyMessage *m;
- struct GNUNET_MessageHeader *h;
size_t size;
- uint16_t msize;
size =
sizeof (struct GNUNET_STATISTICS_ReplyMessage) + strlen (e->service) + 1 +
strlen (e->name) + 1;
GNUNET_assert (size < GNUNET_SERVER_MAX_MESSAGE_SIZE);
- msize = size - sizeof (struct GNUNET_MessageHeader);
m = GNUNET_malloc (size);
+ m->header.type = htons (GNUNET_MESSAGE_TYPE_STATISTICS_VALUE);
+ m->header.size = htons (size);
m->uid = htonl (e->uid);
if (e->persistent)
m->uid |= htonl (GNUNET_STATISTICS_PERSIST_BIT);
"Transmitting value for `%s:%s': %llu\n",
e->service, e->name, e->value);
#endif
- h = &m->header;
- GNUNET_SERVER_transmit_context_append (tc,
- &h[1],
- msize,
- GNUNET_MESSAGE_TYPE_STATISTICS_VALUE);
+ GNUNET_SERVER_transmit_context_append_message (tc, &m->header);
GNUNET_free (m);
}
transmit (tc, pos);
pos = pos->next;
}
- GNUNET_SERVER_transmit_context_append (tc, NULL, 0,
- GNUNET_MESSAGE_TYPE_STATISTICS_END);
+ GNUNET_SERVER_transmit_context_append_data (tc, NULL, 0,
+ GNUNET_MESSAGE_TYPE_STATISTICS_END);
GNUNET_SERVER_transmit_context_run (tc, GNUNET_TIME_UNIT_FOREVER_REL);
}
struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
{
+ /**
+ * Counter used to generate unique values.
+ */
+ static uint32_t uidgen;
+
char *service;
char *name;
uint16_t msize;
/**
- * List of handlers for the messages understood by this
- * service.
+ * Task run during shutdown.
+ *
+ * @param cls unused
+ * @param tc unused
*/
-static struct GNUNET_SERVER_MessageHandler handlers[] = {
- {&handle_set, NULL, GNUNET_MESSAGE_TYPE_STATISTICS_SET, 0},
- {&handle_get, NULL, GNUNET_MESSAGE_TYPE_STATISTICS_GET, 0},
- {NULL, NULL, 0, 0}
-};
+static void
+shutdown_task (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ save ();
+}
/**
* @param cls closure
* @param sched scheduler to use
* @param server the initialized server
- * @param cfg configuration to use
+ * @param c configuration to use
*/
static void
run (void *cls,
struct GNUNET_SCHEDULER_Handle *sched,
struct GNUNET_SERVER_Handle *server,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+ const struct GNUNET_CONFIGURATION_Handle *c)
{
+ 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},
+ {NULL, NULL, 0, 0}
+ };
+ cfg = c;
GNUNET_SERVER_add_handlers (server, handlers);
- load (server, cfg);
+ load (server);
+ GNUNET_SCHEDULER_add_delayed (sched,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ &shutdown_task,
+ NULL);
}
return (GNUNET_OK ==
GNUNET_SERVICE_run (argc,
argv,
- "statistics", &run, NULL, &save, NULL)) ? 0 : 1;
+ "statistics",
+ GNUNET_SERVICE_OPTION_NONE,
+ &run, NULL)) ? 0 : 1;
}
/* end of gnunet-service-statistics.c */