struct WatchEntry
{
+ /**
+ * Watch entries are kept in a linked list.
+ */
struct WatchEntry *next;
+ /**
+ * Watch entries are kept in a linked list.
+ */
struct WatchEntry *prev;
+ /**
+ * For which client is this watch entry?
+ */
struct GNUNET_SERVER_Client *client;
+ /**
+ * Last value we communicated to the client for this watch entry.
+ */
uint64_t last_value;
+ /**
+ * Unique watch number for this client and this watched value.
+ */
uint32_t wid;
+ /**
+ * Is last_value valid
+ * GNUNET_NO : last_value is n/a, GNUNET_YES: last_value is valid
+ */
+ int last_value_set;
+
};
*/
struct ClientEntry
{
-
+ /**
+ * Clients are kept in a linked list.
+ */
struct ClientEntry *next;
+ /**
+ * 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;
};
*/
int persistent;
+ /**
+ * Is this value set?
+ * GNUNET_NO : value is n/a, GNUNET_YES: value is valid
+ */
+ int set;
+
};
/**
*/
static struct StatsEntry *start;
+/**
+ * Head of linked list of connected clients.
+ */
static struct ClientEntry *client_head;
+/**
+ * Tail of linked list of connected clients.
+ */
static struct ClientEntry *client_tail;
+/**
+ * Handle to our server.
+ */
+static struct GNUNET_SERVER_Handle *srv;
+
/**
* Our notification context.
*/
*/
static uint32_t uidgen;
+/**
+ * Set to YES if we are shutting down as soon as possible.
+ */
+static int in_shutdown;
+
-static void
+/**
+ * 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
+ */
+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;
}
{
char *fn;
struct GNUNET_BIO_ReadHandle *rh;
- struct stat sb;
+ uint64_t fsize;
char *buf;
struct GNUNET_SERVER_MessageStreamTokenizer *mst;
char *emsg;
NULL);
if (fn == NULL)
return;
- if ((0 != stat (fn, &sb)) || (sb.st_size == 0))
+ if ((GNUNET_OK != GNUNET_DISK_file_size (fn, &fsize, GNUNET_NO, GNUNET_YES)) || (fsize == 0))
{
GNUNET_free (fn);
return;
}
- buf = GNUNET_malloc (sb.st_size);
+ 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, sb.st_size))
+ 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"),
- (unsigned long long) sb.st_size, fn);
+ fsize, fn);
mst = GNUNET_SERVER_mst_create (&inject_message, server);
GNUNET_break (GNUNET_OK ==
- GNUNET_SERVER_mst_receive (mst, NULL, buf, sb.st_size,
+ GNUNET_SERVER_mst_receive (mst, NULL, buf, fsize,
GNUNET_YES, GNUNET_NO));
GNUNET_SERVER_mst_destroy (mst);
GNUNET_free (buf);
GNUNET_free (fn);
}
+
/**
* Write persistent statistics to disk.
*/
/**
* Transmit the given stats value.
+ *
+ * @param client receiver of the value
+ * @param e value to transmit
*/
static void
transmit (struct GNUNET_SERVER_Client *client, const struct StatsEntry *e)
GNUNET_assert (size ==
GNUNET_STRINGS_buffer_fill ((char *) &m[1], size, 2,
e->service, e->name));
-#if DEBUG_STATISTICS
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Transmitting value for `%s:%s' (%d): %llu\n", e->service,
e->name, e->persistent, e->value);
-#endif
GNUNET_SERVER_notification_context_unicast (nc, client, &m->header,
GNUNET_NO);
GNUNET_free (m);
/**
* Does this entry match the request?
+ *
+ * @param e an entry
+ * @param service name of service to match
+ * @param name value to match
+ * @return 1 if they match, 0 if not
*/
static int
matches (const struct StatsEntry *e, const char *service, const char *name)
}
+/**
+ * Find a client entry for the given client handle, or create one.
+ *
+ * @param client handle to match
+ * @return corresponding client entry struct
+ */
static struct ClientEntry *
make_client_entry (struct GNUNET_SERVER_Client *client)
{
return ce;
ce = ce->next;
}
+ if (NULL == nc)
+ {
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return NULL;
+ }
ce = GNUNET_malloc (sizeof (struct ClientEntry));
ce->client = client;
GNUNET_SERVER_client_keep (client);
struct StatsEntry *pos;
size_t size;
- if (client != NULL)
- make_client_entry (client);
+ 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,
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
-#if DEBUG_STATISTICS
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received request for statistics on `%s:%s'\n",
strlen (service) ? service : "*", strlen (name) ? name : "*");
-#endif
- pos = start;
- while (pos != NULL)
- {
+ for (pos = start; NULL != pos; pos = pos->next)
if (matches (pos, service, name))
transmit (client, pos);
- pos = pos->next;
- }
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);
}
+/**
+ * Notify all clients listening about a change to a value.
+ *
+ * @param se value that changed
+ */
static void
notify_change (struct StatsEntry *se)
{
struct GNUNET_STATISTICS_WatchValueMessage wvm;
struct WatchEntry *pos;
- pos = se->we_head;
- while (pos != NULL)
+ for (pos = se->we_head; NULL != pos; pos = pos->next)
{
- if (pos->last_value != se->value)
+ if (GNUNET_YES == pos->last_value_set)
{
- 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);
- pos->last_value = se->value;
+ if (pos->last_value == se->value)
+ continue;
}
- pos = pos->next;
+ else
+ {
+ 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);
+ pos->last_value = se->value;
}
}
uint64_t value;
int64_t delta;
int changed;
+ int initial_set;
- if (client != NULL)
- make_client_entry (client);
+ if ( (NULL != client) &&
+ (NULL == make_client_entry (client)) )
+ return; /* new client during shutdown */
msize = ntohs (message->size);
if (msize < sizeof (struct GNUNET_STATISTICS_SetMessage))
{
}
flags = ntohl (msg->flags);
value = GNUNET_ntohll (msg->value);
-#if DEBUG_STATISTICS
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);
-#endif
pos = start;
prev = NULL;
while (pos != NULL)
{
if (matches (pos, service, name))
{
+ initial_set = 0;
if ((flags & GNUNET_STATISTICS_SETFLAG_RELATIVE) == 0)
{
changed = (pos->value != 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));
pos->next = start;
start = pos;
}
-#if DEBUG_STATISTICS
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Statistic `%s:%s' updated to value %llu.\n", service, name,
pos->value);
-#endif
- if (changed)
+ if ((changed) || (1 == initial_set))
notify_change (pos);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
pos->next = start;
if (((flags & GNUNET_STATISTICS_SETFLAG_RELATIVE) == 0) ||
(0 < (int64_t) GNUNET_ntohll (msg->value)))
+ {
pos->value = GNUNET_ntohll (msg->value);
+ pos->set = GNUNET_YES;
+ }
+ else
+ {
+ pos->set = GNUNET_NO;
+ }
pos->uid = uidgen++;
pos->persistent = (0 != (flags & GNUNET_STATISTICS_SETFLAG_PERSISTENT));
pos->msg = (void *) &pos[1];
pos->name = &pos->service[strlen (pos->service) + 1];
start = pos;
-#if DEBUG_STATISTICS
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"New statistic on `%s:%s' with value %llu created.\n", service,
name, pos->value);
-#endif
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
struct WatchEntry *we;
size_t slen;
+ if (NULL == nc)
+ {
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
+ GNUNET_SERVER_client_mark_monitor (client);
ce = make_client_entry (client);
msize = ntohs (message->size);
if (msize < sizeof (struct GNUNET_MessageHeader))
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
-#if DEBUG_STATISTICS
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received request to watch statistic on `%s:%s'\n", service,
name);
-#endif
pos = start;
while (pos != NULL)
{
sizeof (struct GNUNET_STATISTICS_SetMessage) + size);
pos->next = start;
pos->uid = uidgen++;
+ pos->set = GNUNET_NO;
pos->msg = (void *) &pos[1];
pos->msg->header.size =
htons (sizeof (struct GNUNET_STATISTICS_SetMessage) + size);
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);
}
we = GNUNET_malloc (sizeof (struct WatchEntry));
we->client = client;
+ we->last_value_set = GNUNET_NO;
GNUNET_SERVER_client_keep (client);
we->wid = ce->max_wid++;
GNUNET_CONTAINER_DLL_insert (pos->we_head, pos->we_tail, we);
/**
- * Task run during shutdown.
- *
- * @param cls unused
- * @param tc unused
+ * Actually perform the shutdown.
*/
-static void
-shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+static void
+do_shutdown ()
{
- struct ClientEntry *ce;
struct WatchEntry *we;
struct StatsEntry *se;
+ if (NULL == nc)
+ return;
save ();
GNUNET_SERVER_notification_context_destroy (nc);
- nc = NULL;
- while (NULL != (ce = client_head))
- {
- GNUNET_SERVER_client_drop (ce->client);
- GNUNET_CONTAINER_DLL_remove (client_head, client_tail, ce);
- GNUNET_free (ce);
- }
+ nc = NULL;
+ GNUNET_assert (NULL == client_head);
while (NULL != (se = start))
{
start = se->next;
}
+/**
+ * Task run during shutdown.
+ *
+ * @param cls unused
+ * @param tc unused
+ */
+static void
+shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ in_shutdown = GNUNET_YES;
+ if (NULL != client_head)
+ return;
+ do_shutdown ();
+}
+
+
/**
* A client disconnected. Remove all of its data structure entries.
*
}
se = se->next;
}
+ if ( (NULL == client_head) &&
+ (GNUNET_YES == in_shutdown) )
+ do_shutdown ();
}
{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);
{
return (GNUNET_OK ==
GNUNET_SERVICE_run (argc, argv, "statistics",
- GNUNET_SERVICE_OPTION_NONE, &run, NULL)) ? 0 : 1;
+ GNUNET_SERVICE_OPTION_SOFT_SHUTDOWN, &run, NULL)) ? 0 : 1;
}
/* end of gnunet-service-statistics.c */
projects / oweals / gnunet.git / blobdiff