/*
This file is part of GNUnet.
- (C) 2009, 2010 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
*/
enum ActionType
{
+ /**
+ * Get a value.
+ */
ACTION_GET,
+
+ /**
+ * Set a value.
+ */
ACTION_SET,
+
+ /**
+ * Update a value.
+ */
ACTION_UPDATE,
+
+ /**
+ * Watch a value.
+ */
ACTION_WATCH
};
};
-
/**
* Schedule the next action to be performed.
+ *
+ * @param h statistics handle to reconnect
*/
static void
schedule_action (struct GNUNET_STATISTICS_Handle *h);
+
/**
- * Try to (re)connect to the statistics service.
+ * Transmit request to service that we want to watch
+ * the development of a particular value.
*
- * @return GNUNET_YES on success, GNUNET_NO on failure.
+ * @param h statistics handle
+ * @param watch watch entry of the value to watch
*/
-static int
-try_connect (struct GNUNET_STATISTICS_Handle *ret);
-
-
-static void
-insert_ai (struct GNUNET_STATISTICS_Handle *h,
- struct GNUNET_STATISTICS_GetHandle *ai)
-{
- GNUNET_CONTAINER_DLL_insert_after (h->action_head, h->action_tail,
- h->action_tail, ai);
- if (h->action_head == ai)
- schedule_action (h);
-}
-
-
static void
schedule_watch_request (struct GNUNET_STATISTICS_Handle *h,
struct GNUNET_STATISTICS_WatchEntry *watch)
size_t nsize;
GNUNET_assert (h != NULL);
- if (GNUNET_YES != try_connect (h))
- {
- schedule_action (h);
- return;
- }
slen = strlen (watch->subsystem) + 1;
nlen = strlen (watch->name) + 1;
nsize = sizeof (struct GNUNET_MessageHeader) + slen + nlen;
ai->type = ACTION_WATCH;
ai->proc = watch->proc;
ai->cls = watch->proc_cls;
- insert_ai (h, ai);
+ GNUNET_CONTAINER_DLL_insert_tail (h->action_head, h->action_tail,
+ ai);
+ schedule_action (h);
+}
+
+
+/**
+ * Free memory associated with the given action item.
+ *
+ * @param gh action item to free
+ */
+static void
+free_action_item (struct GNUNET_STATISTICS_GetHandle *gh)
+{
+ GNUNET_free_non_null (gh->subsystem);
+ GNUNET_free_non_null (gh->name);
+ GNUNET_free (gh);
+}
+
+
+/**
+ * Disconnect from the statistics service.
+ *
+ * @param h statistics handle to disconnect from
+ */
+static void
+do_disconnect (struct GNUNET_STATISTICS_Handle *h)
+{
+ struct GNUNET_STATISTICS_GetHandle *c;
+
+ if (NULL != h->th)
+ {
+ GNUNET_CLIENT_notify_transmit_ready_cancel (h->th);
+ h->th = NULL;
+ }
+ if (NULL != h->client)
+ {
+ GNUNET_CLIENT_disconnect (h->client, GNUNET_NO);
+ h->client = NULL;
+ }
+ h->receiving = GNUNET_NO;
+ if (NULL != (c = h->current))
+ {
+ h->current = NULL;
+ if (c->cont != NULL)
+ c->cont (c->cls, GNUNET_SYSERR);
+ free_action_item (c);
+ }
}
/**
* Try to (re)connect to the statistics service.
*
+ * @param h statistics handle to reconnect
* @return GNUNET_YES on success, GNUNET_NO on failure.
*/
static int
-try_connect (struct GNUNET_STATISTICS_Handle *ret)
+try_connect (struct GNUNET_STATISTICS_Handle *h)
{
+ struct GNUNET_STATISTICS_GetHandle *gh;
+ struct GNUNET_STATISTICS_GetHandle *gn;
unsigned int i;
- if (ret->client != NULL)
+ if (h->backoff_task != GNUNET_SCHEDULER_NO_TASK)
+ return GNUNET_NO;
+ if (h->client != NULL)
return GNUNET_YES;
- ret->client = GNUNET_CLIENT_connect ("statistics", ret->cfg);
- if (ret->client != NULL)
+ h->client = GNUNET_CLIENT_connect ("statistics", h->cfg);
+ if (h->client != NULL)
{
- for (i = 0; i < ret->watches_size; i++)
- schedule_watch_request (ret, ret->watches[i]);
+ gn = h->action_head;
+ while (NULL != (gh = gn))
+ {
+ gn = gh->next;
+ if (gh->type == ACTION_WATCH)
+ {
+ GNUNET_CONTAINER_DLL_remove (h->action_head,
+ h->action_tail,
+ gh);
+ free_action_item (gh);
+ }
+ }
+ for (i = 0; i < h->watches_size; i++)
+ schedule_watch_request (h, h->watches[i]);
return GNUNET_YES;
}
-#if DEBUG_STATISTICS
LOG (GNUNET_ERROR_TYPE_DEBUG,
- _("Failed to connect to statistics service!\n"));
-#endif
+ "Failed to connect to statistics service!\n");
return GNUNET_NO;
}
/**
- * Free memory associated with the given action item.
+ * We've waited long enough, reconnect now.
+ *
+ * @param cls the 'struct GNUNET_STATISTICS_Handle' to reconnect
+ * @param tc scheduler context (unused)
*/
static void
-free_action_item (struct GNUNET_STATISTICS_GetHandle *ai)
+reconnect_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- GNUNET_free_non_null (ai->subsystem);
- GNUNET_free_non_null (ai->name);
- GNUNET_free (ai);
+ struct GNUNET_STATISTICS_Handle *h = cls;
+
+ h->backoff_task = GNUNET_SCHEDULER_NO_TASK;
+ schedule_action (h);
}
/**
- * GET processing is complete, tell client about it.
+ * Reconnect at a later time, respecting back-off.
+ *
+ * @param h statistics handle
*/
static void
-finish (struct GNUNET_STATISTICS_Handle *h, int code)
+reconnect_later (struct GNUNET_STATISTICS_Handle *h)
{
- struct GNUNET_STATISTICS_GetHandle *pos = h->current;
-
- h->current = NULL;
- schedule_action (h);
- if (pos != NULL)
+ GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == h->backoff_task);
+ if (h->do_destroy)
{
- if (pos->cont != NULL)
- pos->cont (pos->cls, code);
- free_action_item (pos);
+ /* So we are shutting down and the service is not reachable.
+ * Chances are that it's down for good and we are not going to connect to
+ * it anymore.
+ * Give up and don't sync the rest of the data.
+ */
+ GNUNET_break (0);
+ h->do_destroy = GNUNET_NO;
+ GNUNET_STATISTICS_destroy (h, GNUNET_NO);
+ return;
}
+ h->backoff_task =
+ GNUNET_SCHEDULER_add_delayed (h->backoff, &reconnect_task, h);
+ h->backoff = GNUNET_TIME_relative_multiply (h->backoff, 2);
+ h->backoff =
+ GNUNET_TIME_relative_min (h->backoff, GNUNET_CONSTANTS_SERVICE_TIMEOUT);
}
/**
- * Process the message.
+ * Process a 'GNUNET_MESSAGE_TYPE_STATISTICS_VALUE' message.
*
+ * @param h statistics handle
+ * @param msg message received from the service, never NULL
* @return GNUNET_OK if the message was well-formed
*/
static int
-process_message (struct GNUNET_STATISTICS_Handle *h,
- const struct GNUNET_MessageHeader *msg)
+process_statistics_value_message (struct GNUNET_STATISTICS_Handle *h,
+ const struct GNUNET_MessageHeader *msg)
{
char *service;
char *name;
if (h->current->aborted)
{
-#if DEBUG_STATISTICS
LOG (GNUNET_ERROR_TYPE_DEBUG, "Iteration was aborted, ignoring VALUE\n");
-#endif
return GNUNET_OK; /* don't bother */
}
size = ntohs (msg->size);
GNUNET_break (0);
return GNUNET_SYSERR;
}
-#if DEBUG_STATISTICS
LOG (GNUNET_ERROR_TYPE_DEBUG, "Received valid statistic on `%s:%s': %llu\n",
service, name, GNUNET_ntohll (smsg->value));
-#endif
if (GNUNET_OK !=
h->current->proc (h->current->cls, service, name,
GNUNET_ntohll (smsg->value),
0 !=
(ntohl (smsg->uid) & GNUNET_STATISTICS_PERSIST_BIT)))
{
-#if DEBUG_STATISTICS
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Processing of remaining statistics aborted by client.\n");
-#endif
h->current->aborted = GNUNET_YES;
}
-#if DEBUG_STATISTICS
LOG (GNUNET_ERROR_TYPE_DEBUG, "VALUE processed successfully\n");
-#endif
return GNUNET_OK;
}
+/**
+ * We have received a watch value from the service. Process it.
+ *
+ * @param h statistics handle
+ * @param msg the watch value message
+ * @return GNUNET_OK if the message was well-formed, GNUNET_SYSERR if not,
+ * GNUNET_NO if this watch has been cancelled
+ */
static int
process_watch_value (struct GNUNET_STATISTICS_Handle *h,
const struct GNUNET_MessageHeader *msg)
return GNUNET_SYSERR;
}
w = h->watches[wid];
+ if (NULL == w)
+ return GNUNET_NO;
(void) w->proc (w->proc_cls, w->subsystem, w->name,
GNUNET_ntohll (wvm->value),
0 != (ntohl (wvm->flags) & GNUNET_STATISTICS_PERSIST_BIT));
receive_stats (void *cls, const struct GNUNET_MessageHeader *msg)
{
struct GNUNET_STATISTICS_Handle *h = cls;
+ struct GNUNET_STATISTICS_GetHandle *c;
+ int ret;
if (msg == NULL)
{
- if (NULL != h->client)
- {
- GNUNET_CLIENT_disconnect (h->client, GNUNET_NO);
- h->client = NULL;
- }
-#if DEBUG_STATISTICS
LOG (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK,
"Error receiving statistics from service, is the service running?\n");
-#endif
- finish (h, GNUNET_SYSERR);
+ do_disconnect (h);
+ reconnect_later (h);
return;
}
switch (ntohs (msg->type))
{
case GNUNET_MESSAGE_TYPE_STATISTICS_END:
-#if DEBUG_STATISTICS
LOG (GNUNET_ERROR_TYPE_DEBUG, "Received end of statistics marker\n");
-#endif
+ if (NULL == (c = h->current))
+ {
+ GNUNET_break (0);
+ do_disconnect (h);
+ reconnect_later (h);
+ return;
+ }
h->backoff = GNUNET_TIME_UNIT_MILLISECONDS;
if (h->watches_size > 0)
{
else
{
h->receiving = GNUNET_NO;
- }
- finish (h, GNUNET_OK);
+ }
+ h->current = NULL;
+ schedule_action (h);
+ if (c->cont != NULL)
+ c->cont (c->cls, GNUNET_OK);
+ free_action_item (c);
return;
case GNUNET_MESSAGE_TYPE_STATISTICS_VALUE:
- if (GNUNET_OK == process_message (h, msg))
+ if (GNUNET_OK != process_statistics_value_message (h, msg))
{
- /* finally, look for more! */
-#if DEBUG_STATISTICS
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Processing VALUE done, now reading more\n");
-#endif
- GNUNET_CLIENT_receive (h->client, &receive_stats, h,
- GNUNET_TIME_absolute_get_remaining (h->
- current->timeout));
- h->backoff = GNUNET_TIME_UNIT_MILLISECONDS;
- return;
+ do_disconnect (h);
+ reconnect_later (h);
+ return;
}
- GNUNET_break (0);
- break;
+ /* finally, look for more! */
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Processing VALUE done, now reading more\n");
+ GNUNET_CLIENT_receive (h->client, &receive_stats, h,
+ GNUNET_TIME_absolute_get_remaining (h->
+ current->timeout));
+ h->backoff = GNUNET_TIME_UNIT_MILLISECONDS;
+ return;
case GNUNET_MESSAGE_TYPE_STATISTICS_WATCH_VALUE:
- if (GNUNET_OK == process_watch_value (h, msg))
+ if (GNUNET_OK !=
+ (ret = process_watch_value (h, msg)))
{
- h->backoff = GNUNET_TIME_UNIT_MILLISECONDS;
- GNUNET_assert (h->watches_size > 0);
- GNUNET_CLIENT_receive (h->client, &receive_stats, h,
- GNUNET_TIME_UNIT_FOREVER_REL);
+ do_disconnect (h);
+ if (GNUNET_NO == ret)
+ h->backoff = GNUNET_TIME_UNIT_MILLISECONDS;
+ reconnect_later (h);
return;
}
- GNUNET_break (0);
- break;
+ h->backoff = GNUNET_TIME_UNIT_MILLISECONDS;
+ GNUNET_assert (h->watches_size > 0);
+ GNUNET_CLIENT_receive (h->client, &receive_stats, h,
+ GNUNET_TIME_UNIT_FOREVER_REL);
+ return;
default:
GNUNET_break (0);
- break;
- }
- if (NULL != h->client)
- {
- GNUNET_CLIENT_disconnect (h->client, GNUNET_NO);
- h->client = NULL;
+ do_disconnect (h);
+ reconnect_later (h);
+ return;
}
- finish (h, GNUNET_SYSERR);
}
/**
* Transmit a GET request (and if successful, start to receive
* the response).
+ *
+ * @param handle statistics handle
+ * @param size how many bytes can we write to buf
+ * @param buf where to write requests to the service
+ * @return number of bytes written to buf
*/
static size_t
transmit_get (struct GNUNET_STATISTICS_Handle *handle, size_t size, void *buf)
{
+ struct GNUNET_STATISTICS_GetHandle *c;
struct GNUNET_MessageHeader *hdr;
size_t slen1;
size_t slen2;
uint16_t msize;
+ GNUNET_assert (NULL != (c = handle->current));
if (buf == NULL)
{
/* timeout / error */
-#if DEBUG_STATISTICS
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Transmission of request for statistics failed!\n");
-#endif
- finish (handle, GNUNET_SYSERR);
+ do_disconnect (handle);
+ reconnect_later (handle);
return 0;
}
- slen1 = strlen (handle->current->subsystem) + 1;
- slen2 = strlen (handle->current->name) + 1;
+ slen1 = strlen (c->subsystem) + 1;
+ slen2 = strlen (c->name) + 1;
msize = slen1 + slen2 + sizeof (struct GNUNET_MessageHeader);
GNUNET_assert (msize <= size);
hdr = (struct GNUNET_MessageHeader *) buf;
hdr->type = htons (GNUNET_MESSAGE_TYPE_STATISTICS_GET);
GNUNET_assert (slen1 + slen2 ==
GNUNET_STRINGS_buffer_fill ((char *) &hdr[1], slen1 + slen2, 2,
- handle->current->subsystem,
- handle->current->name));
- if (!handle->receiving)
+ c->subsystem,
+ c->name));
+ if (GNUNET_YES != handle->receiving)
{
-#if DEBUG_STATISTICS
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Transmission of GET done, now reading response\n");
-#endif
handle->receiving = GNUNET_YES;
GNUNET_CLIENT_receive (handle->client, &receive_stats, handle,
- GNUNET_TIME_absolute_get_remaining (handle->
- current->timeout));
+ GNUNET_TIME_absolute_get_remaining (c->timeout));
}
return msize;
}
/**
* Transmit a WATCH request (and if successful, start to receive
* the response).
+ *
+ * @param handle statistics handle
+ * @param size how many bytes can we write to buf
+ * @param buf where to write requests to the service
+ * @return number of bytes written to buf
*/
static size_t
transmit_watch (struct GNUNET_STATISTICS_Handle *handle, size_t size, void *buf)
if (buf == NULL)
{
/* timeout / error */
-#if DEBUG_STATISTICS
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Transmission of request for statistics failed!\n");
-#endif
- finish (handle, GNUNET_SYSERR);
+ do_disconnect (handle);
+ reconnect_later (handle);
return 0;
}
-#if DEBUG_STATISTICS
LOG (GNUNET_ERROR_TYPE_DEBUG, "Transmitting watch request for `%s'\n",
handle->current->name);
-#endif
slen1 = strlen (handle->current->subsystem) + 1;
slen2 = strlen (handle->current->name) + 1;
msize = slen1 + slen2 + sizeof (struct GNUNET_MessageHeader);
GNUNET_CLIENT_receive (handle->client, &receive_stats, handle,
GNUNET_TIME_UNIT_FOREVER_REL);
}
- finish (handle, GNUNET_OK);
+ GNUNET_assert (NULL == handle->current->cont);
+ free_action_item (handle->current);
+ handle->current = NULL;
return msize;
}
/**
* Transmit a SET/UPDATE request.
+ *
+ * @param handle statistics handle
+ * @param size how many bytes can we write to buf
+ * @param buf where to write requests to the service
+ * @return number of bytes written to buf
*/
static size_t
transmit_set (struct GNUNET_STATISTICS_Handle *handle, size_t size, void *buf)
if (NULL == buf)
{
- finish (handle, GNUNET_SYSERR);
+ do_disconnect (handle);
+ reconnect_later (handle);
return 0;
}
-
slen = strlen (handle->current->subsystem) + 1;
nlen = strlen (handle->current->name) + 1;
nsize = sizeof (struct GNUNET_STATISTICS_SetMessage) + slen + nlen;
if (size < nsize)
{
GNUNET_break (0);
- finish (handle, GNUNET_SYSERR);
+ do_disconnect (handle);
+ reconnect_later (handle);
return 0;
}
r = buf;
GNUNET_STRINGS_buffer_fill ((char *) &r[1], slen + nlen, 2,
handle->current->subsystem,
handle->current->name));
- finish (handle, GNUNET_OK);
+ GNUNET_assert (NULL == handle->current->cont);
+ free_action_item (handle->current);
+ handle->current = NULL;
return nsize;
}
+/**
+ * Function called when we are ready to transmit a request to the service.
+ *
+ * @param cls the 'struct GNUNET_STATISTICS_Handle'
+ * @param size how many bytes can we write to buf
+ * @param buf where to write requests to the service
+ * @return number of bytes written to buf
+ */
static size_t
transmit_action (void *cls, size_t size, void *buf)
{
- struct GNUNET_STATISTICS_Handle *handle = cls;
+ struct GNUNET_STATISTICS_Handle *h = cls;
size_t ret;
- handle->th = NULL;
- if (NULL == handle->current)
- return 0;
- switch (handle->current->type)
- {
- case ACTION_GET:
- ret = transmit_get (handle, size, buf);
- break;
- case ACTION_SET:
- case ACTION_UPDATE:
- ret = transmit_set (handle, size, buf);
- break;
- case ACTION_WATCH:
- ret = transmit_watch (handle, size, buf);
- break;
- default:
- ret = 0;
- GNUNET_break (0);
- break;
- }
+ h->th = NULL;
+ ret = 0;
+ if (NULL != h->current)
+ switch (h->current->type)
+ {
+ case ACTION_GET:
+ ret = transmit_get (h, size, buf);
+ break;
+ case ACTION_SET:
+ case ACTION_UPDATE:
+ ret = transmit_set (h, size, buf);
+ break;
+ case ACTION_WATCH:
+ ret = transmit_watch (h, size, buf);
+ break;
+ default:
+ GNUNET_assert (0);
+ break;
+ }
+ schedule_action (h);
return ret;
}
ret->cfg = cfg;
ret->subsystem = GNUNET_strdup (subsystem);
ret->backoff = GNUNET_TIME_UNIT_MILLISECONDS;
- if (GNUNET_YES != try_connect (ret))
- {
- GNUNET_free (ret->subsystem);
- GNUNET_free (ret);
- return NULL;
- }
return ret;
}
{
struct GNUNET_STATISTICS_GetHandle *pos;
struct GNUNET_STATISTICS_GetHandle *next;
- struct GNUNET_STATISTICS_GetHandle *prev;
struct GNUNET_TIME_Relative timeout;
int i;
if (h == NULL)
return;
+ GNUNET_assert (GNUNET_NO == h->do_destroy); // Don't call twice.
if (GNUNET_SCHEDULER_NO_TASK != h->backoff_task)
+ {
GNUNET_SCHEDULER_cancel (h->backoff_task);
+ h->backoff_task = GNUNET_SCHEDULER_NO_TASK;
+ }
if (sync_first)
{
if (h->current != NULL)
h->current = NULL;
}
}
- pos = h->action_head;
- prev = NULL;
- while (pos != NULL)
+ next = h->action_head;
+ while (NULL != (pos = next))
{
next = pos->next;
if (pos->type == ACTION_GET)
{
- if (prev == NULL)
- h->action_head = next;
- else
- prev->next = next;
+ GNUNET_CONTAINER_DLL_remove (h->action_head,
+ h->action_tail,
+ pos);
free_action_item (pos);
}
- else
- {
- prev = pos;
- }
- pos = next;
- }
- h->action_tail = prev;
- if (h->current == NULL)
- {
- h->current = h->action_head;
- if (h->action_head != NULL)
- {
- h->action_head = h->action_head->next;
- if (h->action_head == NULL)
- h->action_tail = NULL;
- }
}
+ if ( (NULL == h->current) &&
+ (NULL != (h->current = h->action_head)) )
+ GNUNET_CONTAINER_DLL_remove (h->action_head,
+ h->action_tail,
+ h->current);
h->do_destroy = GNUNET_YES;
if ((h->current != NULL) && (h->th == NULL))
{
- timeout = GNUNET_TIME_absolute_get_remaining (h->current->timeout);
- h->th =
+ if (NULL == h->client)
+ {
+ /* instant-connect (regardless of back-off) to submit final value */
+ h->client = GNUNET_CLIENT_connect ("statistics", h->cfg);
+ }
+ if (NULL != h->client)
+ {
+ timeout = GNUNET_TIME_absolute_get_remaining (h->current->timeout);
+ h->th =
GNUNET_CLIENT_notify_transmit_ready (h->client, h->current->msize,
timeout, GNUNET_YES,
&transmit_action, h);
- GNUNET_assert (NULL != h->th);
+ GNUNET_assert (NULL != h->th);
+ }
}
if (h->th != NULL)
- return;
+ return; /* do not finish destruction just yet */
}
- if (NULL != h->th)
- {
- GNUNET_CLIENT_notify_transmit_ready_cancel (h->th);
- h->th = NULL;
- }
- if (h->current != NULL)
- free_action_item (h->current);
while (NULL != (pos = h->action_head))
{
- h->action_head = pos->next;
+ GNUNET_CONTAINER_DLL_remove (h->action_head,
+ h->action_tail,
+ pos);
free_action_item (pos);
}
- if (h->client != NULL)
- {
- GNUNET_CLIENT_disconnect (h->client, GNUNET_YES);
- h->client = NULL;
- }
+ do_disconnect (h);
for (i = 0; i < h->watches_size; i++)
{
+ if (NULL == h->watches[i])
+ continue;
GNUNET_free (h->watches[i]->subsystem);
GNUNET_free (h->watches[i]->name);
GNUNET_free (h->watches[i]);
}
-static void
-finish_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct GNUNET_STATISTICS_Handle *h = cls;
-
- h->backoff_task = GNUNET_SCHEDULER_NO_TASK;
- finish (h, GNUNET_SYSERR);
-}
-
-
/**
* Schedule the next action to be performed.
+ *
+ * @param h statistics handle
*/
static void
schedule_action (struct GNUNET_STATISTICS_Handle *h)
{
struct GNUNET_TIME_Relative timeout;
- if (h->current != NULL)
+ if ( (h->th != NULL) ||
+ (h->backoff_task != GNUNET_SCHEDULER_NO_TASK) )
return; /* action already pending */
if (GNUNET_YES != try_connect (h))
{
- h->backoff_task =
- GNUNET_SCHEDULER_add_delayed (h->backoff, &finish_task, h);
- h->backoff = GNUNET_TIME_relative_multiply (h->backoff, 2);
- h->backoff =
- GNUNET_TIME_relative_min (h->backoff, GNUNET_CONSTANTS_SERVICE_TIMEOUT);
+ reconnect_later (h);
return;
}
-
+ if (NULL != h->current)
+ return; /* action already pending */
/* schedule next action */
h->current = h->action_head;
if (NULL == h->current)
}
GNUNET_CONTAINER_DLL_remove (h->action_head, h->action_tail, h->current);
timeout = GNUNET_TIME_absolute_get_remaining (h->current->timeout);
- GNUNET_assert (NULL == h->th);
if (NULL ==
(h->th =
GNUNET_CLIENT_notify_transmit_ready (h->client, h->current->msize,
timeout, GNUNET_YES,
&transmit_action, h)))
{
-#if DEBUG_STATISTICS
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Failed to transmit request to statistics service.\n");
-#endif
- finish (h, GNUNET_SYSERR);
+ do_disconnect (h);
+ reconnect_later (h);
}
}
size_t slen2;
struct GNUNET_STATISTICS_GetHandle *ai;
- GNUNET_assert (handle != NULL);
+ if (NULL == handle)
+ return NULL;
GNUNET_assert (proc != NULL);
GNUNET_assert (GNUNET_NO == handle->do_destroy);
- if (GNUNET_YES != try_connect (handle))
- {
-#if DEBUG_STATISTICS
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Failed to connect to statistics service, can not get value `%s:%s'.\n",
- strlen (subsystem) ? subsystem : "*", strlen (name) ? name : "*");
-#endif
- return NULL;
- }
if (subsystem == NULL)
subsystem = "";
if (name == NULL)
ai->timeout = GNUNET_TIME_relative_to_absolute (timeout);
ai->type = ACTION_GET;
ai->msize = slen1 + slen2 + sizeof (struct GNUNET_MessageHeader);
- insert_ai (handle, ai);
+ GNUNET_CONTAINER_DLL_insert_tail (handle->action_head, handle->action_tail,
+ ai);
+ schedule_action (handle);
return ai;
}
void
GNUNET_STATISTICS_get_cancel (struct GNUNET_STATISTICS_GetHandle *gh)
{
+ if (NULL == gh)
+ return;
if (gh->sh->current == gh)
{
gh->aborted = GNUNET_YES;
/**
* Watch statistics from the peer (be notified whenever they change).
- * Note that the only way to cancel a "watch" request is to destroy
- * the statistics handle given as the first argument to this call.
*
* @param handle identification of the statistics service
* @param subsystem limit to the specified subsystem, never NULL
}
+/**
+ * Stop watching statistics from the peer.
+ *
+ * @param handle identification of the statistics service
+ * @param subsystem limit to the specified subsystem, never NULL
+ * @param name name of the statistic value, never NULL
+ * @param proc function to call on each value
+ * @param proc_cls closure for proc
+ * @return GNUNET_OK on success, GNUNET_SYSERR on error (no such watch)
+ */
+int
+GNUNET_STATISTICS_watch_cancel (struct GNUNET_STATISTICS_Handle *handle,
+ const char *subsystem, const char *name,
+ GNUNET_STATISTICS_Iterator proc, void *proc_cls)
+{
+ struct GNUNET_STATISTICS_WatchEntry *w;
+ unsigned int i;
+
+ if (handle == NULL)
+ return GNUNET_SYSERR;
+ for (i=0;i<handle->watches_size;i++)
+ {
+ w = handle->watches[i];
+ if ( (w->proc == proc) &&
+ (w->proc_cls == proc_cls) &&
+ (0 == strcmp (w->name, name)) &&
+ (0 == strcmp (w->subsystem, subsystem)) )
+ {
+ GNUNET_free (w->name);
+ GNUNET_free (w->subsystem);
+ GNUNET_free (w);
+ handle->watches[i] = NULL;
+ return GNUNET_OK;
+ }
+ }
+ return GNUNET_SYSERR;
+}
+
+
+
+/**
+ * Queue a request to change a statistic.
+ *
+ * @param h statistics handle
+ * @param name name of the value
+ * @param make_persistent should the value be kept across restarts?
+ * @param value new value or change
+ * @param type type of the action (ACTION_SET or ACTION_UPDATE)
+ */
static void
add_setter_action (struct GNUNET_STATISTICS_Handle *h, const char *name,
int make_persistent, uint64_t value, enum ActionType type)
GNUNET_assert (h != NULL);
GNUNET_assert (name != NULL);
- if (GNUNET_YES != try_connect (h))
- return;
slen = strlen (h->subsystem) + 1;
nlen = strlen (name) + 1;
nsize = sizeof (struct GNUNET_STATISTICS_SetMessage) + slen + nlen;
GNUNET_break (0);
return;
}
- ai = h->action_head;
- while (ai != NULL)
+ for (ai = h->action_head; ai != NULL; ai = ai->next)
{
- if ((0 == strcmp (ai->subsystem, h->subsystem)) &&
- (0 == strcmp (ai->name, name)) && ((ai->type == ACTION_UPDATE) ||
- (ai->type == ACTION_SET)))
+ if (! ( (0 == strcmp (ai->subsystem, h->subsystem)) &&
+ (0 == strcmp (ai->name, name)) &&
+ ( (ai->type == ACTION_UPDATE) ||
+ (ai->type == ACTION_SET) ) ) )
+ continue;
+ if (ai->type == ACTION_SET)
{
- if (ai->type == ACTION_SET)
+ if (type == ACTION_UPDATE)
{
- if (type == ACTION_UPDATE)
+ delta = (int64_t) value;
+ if (delta > 0)
{
- delta = (int64_t) value;
- if (delta > 0)
- {
- ai->value += delta;
- }
- else
- {
- if (ai->value < -delta)
- ai->value = 0;
- else
- ai->value += delta;
- }
- }
- else
+ /* update old set by new delta */
+ ai->value += delta;
+ }
+ else
{
- ai->value = value;
- }
+ /* update old set by new delta, but never go negative */
+ if (ai->value < -delta)
+ ai->value = 0;
+ else
+ ai->value += delta;
+ }
}
else
{
- if (type == ACTION_UPDATE)
- {
- delta = (int64_t) value;
- ai->value += delta;
- }
- else
- {
- ai->value = value;
- ai->type = type;
- }
+ /* new set overrides old set */
+ ai->value = value;
+ }
+ }
+ else
+ {
+ if (type == ACTION_UPDATE)
+ {
+ /* make delta cummulative */
+ delta = (int64_t) value;
+ ai->value += delta;
+ }
+ else
+ {
+ /* drop old 'update', use new 'set' instead */
+ ai->value = value;
+ ai->type = type;
}
- ai->timeout = GNUNET_TIME_relative_to_absolute (SET_TRANSMIT_TIMEOUT);
- ai->make_persistent = make_persistent;
- return;
}
- ai = ai->next;
+ ai->timeout = GNUNET_TIME_relative_to_absolute (SET_TRANSMIT_TIMEOUT);
+ ai->make_persistent = make_persistent;
+ return;
}
+ /* no existing entry matches, create a fresh one */
ai = GNUNET_malloc (sizeof (struct GNUNET_STATISTICS_GetHandle));
ai->sh = h;
ai->subsystem = GNUNET_strdup (h->subsystem);
ai->msize = nsize;
ai->value = value;
ai->type = type;
- insert_ai (h, ai);
+ GNUNET_CONTAINER_DLL_insert_tail (h->action_head, h->action_tail,
+ ai);
+ schedule_action (h);
}
projects / oweals / gnunet.git / blobdiff