gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r28146 - gnunet/src/fs


From: gnunet
Subject: [GNUnet-SVN] r28146 - gnunet/src/fs
Date: Thu, 18 Jul 2013 13:37:37 +0200

Author: grothoff
Date: 2013-07-18 13:37:37 +0200 (Thu, 18 Jul 2013)
New Revision: 28146

Modified:
   gnunet/src/fs/gnunet-service-fs_mesh_client.c
   gnunet/src/fs/gnunet-service-fs_mesh_server.c
Log:
-nicer logging

Modified: gnunet/src/fs/gnunet-service-fs_mesh_client.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_mesh_client.c       2013-07-18 11:31:34 UTC 
(rev 28145)
+++ gnunet/src/fs/gnunet-service-fs_mesh_client.c       2013-07-18 11:37:37 UTC 
(rev 28146)
@@ -93,7 +93,7 @@
 
   /**
    * Did we transmit this request already? YES if we are
-   * in the 'waiting' DLL, NO if we are in the 'pending' DLL.
+   * in the 'waiting_map', NO if we are in the 'pending' DLL.
    */
   int was_transmitted;
 };
@@ -316,15 +316,16 @@
   GNUNET_CONTAINER_DLL_remove (mh->pending_head,
                               mh->pending_tail,
                               sr);
-  GNUNET_CONTAINER_multihashmap_put (mh->waiting_map,
-                                    &sr->query,
-                                    sr,
-                                    
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+  GNUNET_assert (GNUNET_OK ==
+                GNUNET_CONTAINER_multihashmap_put (mh->waiting_map,
+                                                   &sr->query,
+                                                   sr,
+                                                   
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
+  sr->was_transmitted = GNUNET_YES;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Sending query for %s via mesh to %s\n",
              GNUNET_h2s (&sr->query),
              GNUNET_i2s (&mh->target));
-  sr->was_transmitted = GNUNET_YES;
   sqm.header.size = htons (sizeof (sqm));
   sqm.header.type = htons (GNUNET_MESSAGE_TYPE_FS_MESH_QUERY);
   sqm.type = htonl (sr->type);

Modified: gnunet/src/fs/gnunet-service-fs_mesh_server.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_mesh_server.c       2013-07-18 11:31:34 UTC 
(rev 28145)
+++ gnunet/src/fs/gnunet-service-fs_mesh_server.c       2013-07-18 11:37:37 UTC 
(rev 28146)
@@ -166,6 +166,9 @@
   sc->timeout_task = GNUNET_SCHEDULER_NO_TASK;
   tun = sc->tunnel;
   sc->tunnel = NULL;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Timeout for inactive mesh client %p\n",
+             sc);
   GNUNET_MESH_tunnel_destroy (tun);
 }
 
@@ -195,6 +198,9 @@
 continue_reading (struct MeshClient *sc)
 {
   refresh_timeout_task (sc);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Finished processing mesh request from client %p, ready to 
receive the next one\n",
+             sc);
   GNUNET_MESH_receive_done (sc->tunnel);
 }
 
@@ -246,8 +252,9 @@
                               sc->wqi_tail,
                               wqi);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Transmitted %u byte reply via mesh\n",
-             (unsigned int) size);
+             "Transmitted %u byte reply via mesh to %p\n",
+             (unsigned int) size,
+             sc);
   GNUNET_STATISTICS_update (GSF_stats,
                            gettext_noop ("# Blocks transferred via mesh"), 1,
                            GNUNET_NO);
@@ -355,9 +362,10 @@
     return;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Starting transmission of %u byte reply for query `%s' via 
mesh\n",
+             "Starting transmission of %u byte reply for query `%s' via mesh 
to %p\n",
              (unsigned int) size,
-             GNUNET_h2s (key));
+             GNUNET_h2s (key),
+             sc);
   wqi = GNUNET_malloc (sizeof (struct WriteQueueItem) + msize);
   wqi->msize = msize;
   srm = (struct MeshReplyMessage *) &wqi[1];




reply via email to

[Prev in Thread] Current Thread [Next in Thread]