3 files changed, 122 insertions, 7 deletions

diff --git a/src/util/client.c b/src/util/client.c
index 8012c1523..e5bf7e176 100644
--- a/src/util/client.c
+++ b/src/util/client.c
@@ -261,6 +261,12 @@ transmit_ready (void *cls)
   pos = (const char *) cstate->msg;
   len = ntohs (cstate->msg->size);
   GNUNET_assert (cstate->msg_off < len);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "client: message of type %u trying to send with socket %p (MQ: %p\n",
+              ntohs(cstate->msg->type),
+              cstate->sock,
+              cstate->mq);
+
  RETRY:
   ret = GNUNET_NETWORK_socket_send (cstate->sock,
                                     &pos[cstate->msg_off],
@@ -268,10 +274,12 @@ transmit_ready (void *cls)
   if (-1 == ret)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "client: error during sending message of type %u\n", ntohs(cstate->msg->type));
+                "client: error during sending message of type %u\n",
+                ntohs(cstate->msg->type));
     if (EINTR == errno){
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "client: retrying message of type %u\n", ntohs(cstate->msg->type));
+                  "client: retrying message of type %u\n",
+                  ntohs(cstate->msg->type));
       goto RETRY;
     }
     GNUNET_MQ_inject_error (cstate->mq,
@@ -283,7 +291,8 @@ transmit_ready (void *cls)
   if (cstate->msg_off < len)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "client: rescheduling message of type %u\n", ntohs(cstate->msg->type));
+                "client: rescheduling message of type %u\n",
+                ntohs(cstate->msg->type));
     cstate->send_task
       = GNUNET_SCHEDULER_add_write_net (GNUNET_TIME_UNIT_FOREVER_REL,
                                         cstate->sock,
@@ -294,7 +303,8 @@ transmit_ready (void *cls)
     return;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "client: sending message of type %u successful\n", ntohs(cstate->msg->type));
+              "client: sending message of type %u successful\n",
+              ntohs(cstate->msg->type));
   cstate->msg = NULL;
   GNUNET_MQ_impl_send_continue (cstate->mq);
 }
@@ -382,8 +392,12 @@ connection_client_destroy_impl (struct GNUNET_MQ_Handle *mq,
     GNUNET_SCHEDULER_cancel (cstate->recv_task);
   if (NULL != cstate->retry_task)
     GNUNET_SCHEDULER_cancel (cstate->retry_task);
-  if (NULL != cstate->sock)
+  if (NULL != cstate->sock){
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "client: destroying socket: %p\n",
+                cstate->sock);
     GNUNET_NETWORK_socket_close (cstate->sock);
+  }
   cancel_aps (cstate);
   GNUNET_free (cstate->service_name);
   GNUNET_free_non_null (cstate->hostname);
@@ -807,7 +821,8 @@ connection_client_send_impl (struct GNUNET_MQ_Handle *mq,
   cstate->msg_off = 0;
   if (NULL == cstate->sock){
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "client: waiting for socket\n");
+                "client: message of type %u waiting for socket\n",
+                ntohs(msg->type));
     return; /* still waiting for connection */
    }
   cstate->send_task
diff --git a/src/util/mq.c b/src/util/mq.c
index 57d2d05c5..3c1fba149 100644
--- a/src/util/mq.c
+++ b/src/util/mq.c
@@ -28,6 +28,30 @@
 
 #define LOG(kind,...) GNUNET_log_from (kind, "util-mq",__VA_ARGS__)
 
+//#if HAVE_EXECINFO_H
+//#include "execinfo.h"
+
+///**
+// * Use lsof to generate file descriptor reports on select error?
+// * (turn off for stable releases).
+// */
+//#define USE_LSOF GNUNET_NO
+
+///**
+// * Obtain trace information for all scheduler calls that schedule tasks.
+// */
+//#define EXECINFO GNUNET_NO
+
+///**
+// * Check each file descriptor before adding
+// */
+//#define DEBUG_FDS GNUNET_NO
+
+///**
+// * Depth of the traces collected via EXECINFO.
+// */
+//#define MAX_TRACE_DEPTH 50
+//#endif
 
 struct GNUNET_MQ_Envelope
 {
@@ -357,6 +381,12 @@ GNUNET_MQ_send (struct GNUNET_MQ_Handle *mq,
   }
   GNUNET_assert (NULL == mq->envelope_head);
   mq->current_envelope = ev;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "mq: sending message of type %u, queue empty (MQ: %p)\n",
+              ntohs(ev->mh->type),
+              mq);
+
   mq->send_impl (mq,
                  ev->mh,
                  mq->impl_state);
@@ -452,6 +482,11 @@ impl_send_continue (void *cls)
   GNUNET_CONTAINER_DLL_remove (mq->envelope_head,
                                mq->envelope_tail,
                                mq->current_envelope);
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "mq: sending message of type %u from queue\n",
+              ntohs(mq->current_envelope->mh->type));
+
   mq->send_impl (mq,
                  mq->current_envelope->mh,
                  mq->impl_state);
@@ -851,8 +886,20 @@ GNUNET_MQ_destroy (struct GNUNET_MQ_Handle *mq)
      * are not queued! */
     mq->current_envelope->parent_queue = NULL;
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "MQ destroy drops message of type %u\n",
+                "MQ destroy drops current message of type %u\n",
                 ntohs (mq->current_envelope->mh->type));
+//#if EXECINFO
+//  void *backtrace_array[MAX_TRACE_DEPTH];
+//  int num_backtrace_strings = backtrace (backtrace_array, MAX_TRACE_DEPTH);
+//    char **backtrace_strings =
+//        backtrace_symbols (backtrace_array,
+//         t->num_backtrace_strings);
+//    for (unsigned int i = 0; i < num_backtrace_strings; i++)
+//      LOG (GNUNET_ERROR_TYPE_DEBUG,
+//     "client drop trace %u: %s\n",
+//     i,
+//     backtrace_strings[i]);
+//#endif
     GNUNET_MQ_discard (mq->current_envelope);
     mq->current_envelope = NULL;
     GNUNET_assert (0 < mq->queue_length);
@@ -934,6 +981,11 @@ GNUNET_MQ_send_cancel (struct GNUNET_MQ_Envelope *ev)
       GNUNET_CONTAINER_DLL_remove (mq->envelope_head,
                                    mq->envelope_tail,
                                    mq->current_envelope);
+
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "mq: sending canceled message of type %u queue\n",
+                  ntohs(ev->mh->type));
+
       mq->send_impl (mq,
                      mq->current_envelope->mh,
                      mq->impl_state);
diff --git a/src/util/service.c b/src/util/service.c
index 782adf5c5..c204f1f87 100644
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -36,6 +36,30 @@
 #include "gauger.h"
 #endif
 
+//#if HAVE_EXECINFO_H
+//#include "execinfo.h"
+
+///**
+// * Use lsof to generate file descriptor reports on select error?
+// * (turn off for stable releases).
+// */
+//#define USE_LSOF GNUNET_NO
+
+///**
+// * Obtain trace information for all scheduler calls that schedule tasks.
+// */
+//#define EXECINFO GNUNET_NO
+
+///**
+// * Check each file descriptor before adding
+// */
+//#define DEBUG_FDS GNUNET_NO
+
+///**
+// * Depth of the traces collected via EXECINFO.
+// */
+//#define MAX_TRACE_DEPTH 50
+//#endif
 
 #define LOG(kind,...) GNUNET_log_from (kind, "util-service", __VA_ARGS__)
 
@@ -1932,6 +1956,11 @@ do_send (void *cls)
   size_t left;
   const char *buf;
 
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "service: sending message with type %u",
+       ntohs(client->msg->type));
+
+
   client->send_task = NULL;
   buf = (const char *) client->msg;
   left = ntohs (client->msg->size) - client->msg_pos;
@@ -1941,6 +1970,8 @@ do_send (void *cls)
   GNUNET_assert (ret <= (ssize_t) left);
   if (0 == ret)
   {
+    LOG (GNUNET_ERROR_TYPE_DEBUG,
+         "no data send");
     GNUNET_MQ_inject_error (client->mq,
                             GNUNET_MQ_ERROR_WRITE);
     return;
@@ -1958,6 +1989,9 @@ do_send (void *cls)
       if (EPIPE != errno)
         GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
                              "send");
+      LOG (GNUNET_ERROR_TYPE_DEBUG,
+           "socket send returned with error code %i",
+           errno);
       GNUNET_MQ_inject_error (client->mq,
                               GNUNET_MQ_ERROR_WRITE);
       return;
@@ -2518,6 +2552,20 @@ GNUNET_SERVICE_client_drop (struct GNUNET_SERVICE_Client *c)
               "Client dropped: %p (MQ: %p)\n",
               c,
               c->mq);
+
+//#if EXECINFO
+//  void *backtrace_array[MAX_TRACE_DEPTH];
+//  int num_backtrace_strings = backtrace (backtrace_array, MAX_TRACE_DEPTH);
+//    char **backtrace_strings =
+//        backtrace_symbols (backtrace_array,
+//         t->num_backtrace_strings);
+//    for (unsigned int i = 0; i < num_backtrace_strings; i++)
+//      LOG (GNUNET_ERROR_TYPE_DEBUG,
+//     "client drop trace %u: %s\n",
+//     i,
+//     backtrace_strings[i]);
+//#endif
+
   if (NULL != c->drop_task)
   {
     /* asked to drop twice! */