*/
struct GNUNET_SCHEDULER_Task *backoff_task;
+ /**
+ * Task for running #do_destroy().
+ */
+ struct GNUNET_SCHEDULER_Task *destroy_task;
+
/**
* Time for next connect retry.
*/
/**
* Schedule the next action to be performed.
*
- * @param h statistics handle to reconnect
+ * @param cls statistics handle to reconnect
*/
static void
-schedule_action (struct GNUNET_STATISTICS_Handle *h);
+schedule_action (void *cls);
/**
if (GNUNET_NO != h->do_destroy)
{
h->do_destroy = GNUNET_NO;
+ if (NULL != h->destroy_task)
+ {
+ GNUNET_SCHEDULER_cancel (h->destroy_task);
+ h->destroy_task = NULL;
+ }
GNUNET_STATISTICS_destroy (h,
GNUNET_NO);
return;
* @param cls the `struct GNUNET_STATISTICS_Handle`
*/
static void
-destroy_task (void *cls)
+do_destroy (void *cls)
{
struct GNUNET_STATISTICS_Handle *h = cls;
- GNUNET_STATISTICS_destroy (h, GNUNET_NO);
+ h->destroy_task = NULL;
+ h->do_destroy = GNUNET_NO;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Running final destruction\n");
+ GNUNET_STATISTICS_destroy (h,
+ GNUNET_NO);
}
reconnect_later (h);
return;
}
- h->do_destroy = GNUNET_NO;
- GNUNET_SCHEDULER_add_now (&destroy_task,
- h);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Received TEST message from statistics, can complete disconnect\n");
+ if (NULL != h->destroy_task)
+ GNUNET_SCHEDULER_cancel (h->destroy_task);
+ h->destroy_task = GNUNET_SCHEDULER_add_now (&do_destroy,
+ h);
}
}
-/**
- * Task used by #reconnect_later() to shutdown the handle
- *
- * @param cls the statistics handle
- */
-static void
-do_destroy (void *cls)
-{
- struct GNUNET_STATISTICS_Handle *h = cls;
-
- GNUNET_STATISTICS_destroy (h,
- GNUNET_NO);
-}
-
-
/**
* Reconnect at a later time, respecting back-off.
*
if (GNUNET_YES == loss)
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
_("Could not save some persistent statistics\n"));
- h->do_destroy = GNUNET_NO;
- GNUNET_SCHEDULER_add_now (&do_destroy,
- h);
+ if (NULL != h->destroy_task)
+ GNUNET_SCHEDULER_cancel (h->destroy_task);
+ h->destroy_task = GNUNET_SCHEDULER_add_now (&do_destroy,
+ h);
return;
}
h->backoff_task
GNUNET_assert (NULL == handle->current->cont);
free_action_item (handle->current);
handle->current = NULL;
+ schedule_action (handle);
}
free_action_item (handle->current);
handle->current = NULL;
update_memory_statistics (handle);
+ GNUNET_MQ_notify_sent (env,
+ &schedule_action,
+ handle);
GNUNET_MQ_send (handle->mq,
env);
}
GNUNET_STATISTICS_create (const char *subsystem,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
- struct GNUNET_STATISTICS_Handle *ret;
+ struct GNUNET_STATISTICS_Handle *h;
if (GNUNET_YES ==
GNUNET_CONFIGURATION_get_value_yesno (cfg,
"statistics",
"DISABLE"))
return NULL;
- ret = GNUNET_new (struct GNUNET_STATISTICS_Handle);
- ret->cfg = cfg;
- ret->subsystem = GNUNET_strdup (subsystem);
- ret->backoff = GNUNET_TIME_UNIT_MILLISECONDS;
- return ret;
+ h = GNUNET_new (struct GNUNET_STATISTICS_Handle);
+ h->cfg = cfg;
+ h->subsystem = GNUNET_strdup (subsystem);
+ h->backoff = GNUNET_TIME_UNIT_MILLISECONDS;
+ return h;
}
if (NULL == h)
return;
- GNUNET_assert (GNUNET_NO == h->do_destroy); // Don't call twice.
- if (NULL != h->backoff_task)
- {
- GNUNET_SCHEDULER_cancel (h->backoff_task);
- h->backoff_task = NULL;
- }
+ GNUNET_assert (GNUNET_NO == h->do_destroy); /* Don't call twice. */
if ( (sync_first) &&
(GNUNET_YES == try_connect (h)) )
{
}
h->do_destroy = GNUNET_YES;
schedule_action (h);
+ GNUNET_assert (NULL == h->destroy_task);
+ h->destroy_task
+ = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply (h->backoff,
+ 5),
+ &do_destroy,
+ h);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Deferring destruction\n");
return; /* do not finish destruction just yet */
}
/* do clean up all */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Cleaning all up\n");
while (NULL != (pos = h->action_head))
{
GNUNET_CONTAINER_DLL_remove (h->action_head,
free_action_item (pos);
}
do_disconnect (h);
+ if (NULL != h->backoff_task)
+ {
+ GNUNET_SCHEDULER_cancel (h->backoff_task);
+ h->backoff_task = NULL;
+ }
+ if (NULL != h->destroy_task)
+ {
+ GNUNET_break (0);
+ GNUNET_SCHEDULER_cancel (h->destroy_task);
+ h->destroy_task = NULL;
+ }
for (unsigned int i = 0; i < h->watches_size; i++)
{
if (NULL == h->watches[i])
/**
* Schedule the next action to be performed.
*
- * @param h statistics handle
+ * @param cls statistics handle
*/
static void
-schedule_action (struct GNUNET_STATISTICS_Handle *h)
+schedule_action (void *cls)
{
+ struct GNUNET_STATISTICS_Handle *h = cls;
+
if (NULL != h->backoff_task)
return; /* action already pending */
if (GNUNET_YES != try_connect (h))
if (GNUNET_YES != h->do_destroy)
return; /* nothing to do */
/* let service know that we're done */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Notifying service that we are done\n");
h->do_destroy = GNUNET_SYSERR; /* in 'TEST' mode */
env = GNUNET_MQ_msg (hdr,
GNUNET_MESSAGE_TYPE_TEST);