* @file statistics/gnunet-service-statistics.c
* @brief program that tracks statistics
* @author Christian Grothoff
+ *
+ * TODO:
+ * - use BIO for IO operations
*/
#include "platform.h"
#include "gnunet_disk_lib.h"
};
/**
- * 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,
- struct GNUNET_CONFIGURATION_Handle *cfg)
+load (struct GNUNET_SERVER_Handle *server)
{
char *fn;
- int fd;
+ struct GNUNET_DISK_FileHandle *fh;
+ struct GNUNET_DISK_MapHandle *mh;
struct stat sb;
char *buf;
size_t off;
GNUNET_free (fn);
return;
}
- fd = GNUNET_DISK_file_open (fn, O_RDONLY);
- if (fd == -1)
+ fh = GNUNET_DISK_file_open (fn, GNUNET_DISK_OPEN_READ,
+ GNUNET_DISK_PERM_NONE);
+ if (!fh)
{
GNUNET_free (fn);
return;
}
- buf = MMAP (NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0);
- if (MAP_FAILED == buf)
+ buf = GNUNET_DISK_file_map (fh, &mh, GNUNET_DISK_MAP_TYPE_READ, sb.st_size);
+ if (NULL == buf)
{
GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "mmap", fn);
- GNUNET_break (0 == CLOSE (fd));
+ GNUNET_break (GNUNET_OK == GNUNET_DISK_file_close (fh));
GNUNET_free (fn);
return;
}
}
off += ntohs (msg->size);
}
- GNUNET_break (0 == MUNMAP (buf, sb.st_size));
- GNUNET_break (0 == CLOSE (fd));
+ GNUNET_break (GNUNET_OK == GNUNET_DISK_file_unmap (mh));
+ GNUNET_break (GNUNET_OK == GNUNET_DISK_file_close (fh));
GNUNET_free (fn);
}
-
/**
* Write persistent statistics to disk.
- *
- * @param cls closure
- * @param cfg configuration to use
*/
static void
-save (void *cls, struct GNUNET_CONFIGURATION_Handle *cfg)
+save ()
{
struct StatsEntry *pos;
char *fn;
- int fd;
+ struct GNUNET_DISK_FileHandle *fh;
uint16_t size;
unsigned long long total;
- fd = -1;
+ fh = NULL;
fn = GNUNET_DISK_get_home_filename (cfg,
"statistics", "statistics.data", NULL);
if (fn != NULL)
- fd =
- GNUNET_DISK_file_open (fn, O_WRONLY | O_CREAT | O_TRUNC,
- S_IRUSR | S_IWUSR);
+ fh = GNUNET_DISK_file_open (fn, GNUNET_DISK_OPEN_WRITE
+ | GNUNET_DISK_OPEN_CREATE | GNUNET_DISK_OPEN_TRUNCATE,
+ GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE);
total = 0;
while (NULL != (pos = start))
{
start = pos->next;
- if ((pos->persistent) && (fd != -1))
+ if ((pos->persistent) && (NULL != fh))
{
size = htons (pos->msg->header.size);
- if (size != WRITE (fd, pos->msg, size))
+ if (size != GNUNET_DISK_file_write (fh, pos->msg, size))
{
GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
"write", fn);
- GNUNET_DISK_file_close (fn, fd);
- fd = -1;
+ GNUNET_DISK_file_close (fh);
+ fh = NULL;
}
else
total += size;
}
GNUNET_free (pos);
}
- if (fd != -1)
+ if (NULL != fh)
{
- GNUNET_DISK_file_close (fn, fd);
+ GNUNET_DISK_file_close (fh);
if (total == 0)
GNUNET_break (0 == UNLINK (fn));
else
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,
- 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 */
projects / oweals / gnunet.git / blobdiff