-improve UDP logging

[oweals/gnunet.git] / src / testbed / testbed_logger_api.c

diff --git a/src/testbed/testbed_logger_api.c b/src/testbed/testbed_logger_api.c
index c520b106222a228f397538a226200d65e9e17ad5..f753b2e7ca348b8a9581aa9a4a6260d448d88d60 100644 (file)
--- a/src/testbed/testbed_logger_api.c
+++ b/src/testbed/testbed_logger_api.c
@@ -1,6 +1,6 @@
 /*
       This file is part of GNUnet
-      (C) 2008--2013 Christian Grothoff (and other contributing authors)
+      Copyright (C) 2008--2013 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
@@ -21,7 +21,7 @@
 /**
  * @file testbed/testbed_logger_api.c
  * @brief Client-side routines for communicating with the tesbted logger service
- * @author Sree Harsha Totakura <sreeharsha@totakura.in> 
+ * @author Sree Harsha Totakura <sreeharsha@totakura.in>
  */
 
 #include "platform.h"
@@ -49,6 +49,10 @@
  */
 #define GNUNET_TIME_STD_EXPONENTIAL_BACKOFF_THRESHOLD GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 3)
 
+/**
+ * The size of the buffer we fill before sending out the message
+ */
+#define BUFFER_SIZE GNUNET_SERVER_MAX_MESSAGE_SIZE
 
 /**
  * The message queue for sending messages to the controller service
@@ -140,12 +144,12 @@ struct GNUNET_TESTBED_LOGGER_Handle
   /**
    * Task to call the flush completion callback
    */
-  GNUNET_SCHEDULER_TaskIdentifier flush_completion_task;
+  struct GNUNET_SCHEDULER_Task * flush_completion_task;
 
   /**
    * Task to be executed when flushing takes too long
    */
-  GNUNET_SCHEDULER_TaskIdentifier timeout_flush_task;
+  struct GNUNET_SCHEDULER_Task * timeout_flush_task;
 };
 
 
@@ -158,7 +162,7 @@ static void
 cancel_timeout_flush (struct GNUNET_TESTBED_LOGGER_Handle *h)
 {
   GNUNET_SCHEDULER_cancel (h->timeout_flush_task);
-  h->timeout_flush_task = GNUNET_SCHEDULER_NO_TASK;  
+  h->timeout_flush_task = NULL;
 }
 
 
@@ -176,14 +180,14 @@ call_flush_completion (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   void *cb_cls;
   size_t bw;
 
-  h->flush_completion_task = GNUNET_SCHEDULER_NO_TASK;
+  h->flush_completion_task = NULL;
   bw = h->bwrote;
   h->bwrote = 0;
   cb = h->cb;
   h->cb = NULL;
   cb_cls = h->cb_cls;
   h->cb_cls = NULL;
-  if (GNUNET_SCHEDULER_NO_TASK != h->timeout_flush_task)
+  if (NULL != h->timeout_flush_task)
     cancel_timeout_flush (h);
   if (NULL != cb)
     cb (cb_cls, bw);
@@ -198,7 +202,7 @@ call_flush_completion (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 static void
 trigger_flush_notification (struct GNUNET_TESTBED_LOGGER_Handle *h)
 {
-  if (GNUNET_SCHEDULER_NO_TASK != h->flush_completion_task)
+  if (NULL != h->flush_completion_task)
     GNUNET_SCHEDULER_cancel (h->flush_completion_task);
   h->flush_completion_task = GNUNET_SCHEDULER_add_now (&call_flush_completion, h);
 }
@@ -277,7 +281,7 @@ queue_message (struct GNUNET_TESTBED_LOGGER_Handle *h,
 
   type = ntohs (msg->type);
   size = ntohs (msg->size);
-  mq = GNUNET_malloc (sizeof (struct MessageQueue));
+  mq = GNUNET_new (struct MessageQueue);
   mq->msg = msg;
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Queueing message of type %u, size %u for sending\n", type,
@@ -310,7 +314,7 @@ dispatch_buffer (struct GNUNET_TESTBED_LOGGER_Handle *h)
   msg = GNUNET_realloc (h->buf, msize);
   h->buf = NULL;
   memmove (&msg[1], msg, h->bs);
-  h->bs = 0;    
+  h->bs = 0;
   msg->type = htons (GNUNET_MESSAGE_TYPE_TESTBED_LOGGER_MSG);
   msg->size = htons (msize);
   queue_message (h, msg);
@@ -329,11 +333,11 @@ GNUNET_TESTBED_LOGGER_connect (const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   struct GNUNET_TESTBED_LOGGER_Handle *h;
   struct GNUNET_CLIENT_Connection *client;
-  
+
   client = GNUNET_CLIENT_connect ("testbed-logger", cfg);
   if (NULL == client)
     return NULL;
-  h = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_LOGGER_Handle));
+  h = GNUNET_new (struct GNUNET_TESTBED_LOGGER_Handle);
   h->client = client;
   return h;
 }
@@ -348,15 +352,21 @@ void
 GNUNET_TESTBED_LOGGER_disconnect (struct GNUNET_TESTBED_LOGGER_Handle *h)
 {
   struct MessageQueue *mq;
+  unsigned int lost;
 
-  if (GNUNET_SCHEDULER_NO_TASK != h->flush_completion_task)
+  if (NULL != h->flush_completion_task)
     GNUNET_SCHEDULER_cancel (h->flush_completion_task);
+  lost = 0;
   while (NULL != (mq = h->mq_head))
   {
     GNUNET_CONTAINER_DLL_remove (h->mq_head, h->mq_tail, mq);
     GNUNET_free (mq->msg);
     GNUNET_free (mq);
+    lost++;
   }
+  if (0 != lost)
+    LOG (GNUNET_ERROR_TYPE_WARNING, "Cleaning up %u unsent logger message[s]\n",
+         lost);
   GNUNET_CLIENT_disconnect (h->client);
   GNUNET_free (h);
 }
@@ -374,27 +384,29 @@ GNUNET_TESTBED_LOGGER_disconnect (struct GNUNET_TESTBED_LOGGER_Handle *h)
 void
 GNUNET_TESTBED_LOGGER_write (struct GNUNET_TESTBED_LOGGER_Handle *h,
                              const void *data, size_t size)
-{  
+{
   size_t fit_size;
 
   GNUNET_assert (0 != size);
   GNUNET_assert (NULL != data);
-  GNUNET_assert (size < (GNUNET_SERVER_MAX_MESSAGE_SIZE
-                         - sizeof (struct GNUNET_MessageHeader)));
+  GNUNET_assert (size <= (BUFFER_SIZE - sizeof (struct GNUNET_MessageHeader)));
   fit_size = sizeof (struct GNUNET_MessageHeader) + h->bs + size;
-  if ( GNUNET_SERVER_MAX_MESSAGE_SIZE < fit_size )
+  if ( BUFFER_SIZE < fit_size )
     dispatch_buffer (h);
   if (NULL == h->buf)
   {
     h->buf = GNUNET_malloc (size);
     h->bs = size;
     memcpy (h->buf, data, size);
-    return;
+    goto dispatch_ready;
   }
   h->buf = GNUNET_realloc (h->buf, h->bs + size);
   memcpy (h->buf + h->bs, data, size);
   h->bs += size;
-  return;
+
+ dispatch_ready:
+  if (BUFFER_SIZE == fit_size)
+    dispatch_buffer (h);
 }
 
 
@@ -413,15 +425,15 @@ timeout_flush (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   GNUNET_TESTBED_LOGGER_FlushCompletion cb;
   void *cb_cls;
 
-  h->timeout_flush_task = GNUNET_SCHEDULER_NO_TASK;
+  h->timeout_flush_task = NULL;
   cb = h->cb;
   h->cb = NULL;
   cb_cls = h->cb_cls;
   h->cb_cls = NULL;
-  if (GNUNET_SCHEDULER_NO_TASK != h->flush_completion_task)
+  if (NULL != h->flush_completion_task)
   {
     GNUNET_SCHEDULER_cancel (h->flush_completion_task);
-    h->flush_completion_task = GNUNET_SCHEDULER_NO_TASK;
+    h->flush_completion_task = NULL;
   }
   if (NULL != cb)
     cb (cb_cls, 0);
@@ -444,8 +456,8 @@ GNUNET_TESTBED_LOGGER_flush (struct GNUNET_TESTBED_LOGGER_Handle *h,
 {
   h->cb = cb;
   h->cb_cls = cb_cls;
-  GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == h->timeout_flush_task);
-  h->timeout_flush_task = 
+  GNUNET_assert (NULL == h->timeout_flush_task);
+  h->timeout_flush_task =
       GNUNET_SCHEDULER_add_delayed (timeout, &timeout_flush, h);
   if (NULL == h->buf)
   {
@@ -466,12 +478,12 @@ GNUNET_TESTBED_LOGGER_flush (struct GNUNET_TESTBED_LOGGER_Handle *h,
 void
 GNUNET_TESTBED_LOGGER_flush_cancel (struct GNUNET_TESTBED_LOGGER_Handle *h)
 {
-  if (GNUNET_SCHEDULER_NO_TASK != h->flush_completion_task)
+  if (NULL != h->flush_completion_task)
   {
     GNUNET_SCHEDULER_cancel (h->flush_completion_task);
-    h->flush_completion_task = GNUNET_SCHEDULER_NO_TASK;
+    h->flush_completion_task = NULL;
   }
-  if (GNUNET_SCHEDULER_NO_TASK != h->timeout_flush_task)
+  if (NULL != h->timeout_flush_task)
     cancel_timeout_flush (h);
   h->cb = NULL;
   h->cb_cls = NULL;