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

[gnunet]

Author: grothoff
Date: 2012-11-25 12:56:35 +0100 (Sun, 25 Nov 2012)
New Revision: 25128

Modified:
   gnunet/src/fs/gnunet-service-fs.c
   gnunet/src/fs/gnunet-service-fs_stream.c
Log:
-more logging

Modified: gnunet/src/fs/gnunet-service-fs.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs.c   2012-11-25 00:37:05 UTC (rev 25127)
+++ gnunet/src/fs/gnunet-service-fs.c   2012-11-25 11:56:35 UTC (rev 25128)
@@ -401,12 +401,16 @@
     case GNUNET_BLOCK_TYPE_FS_DBLOCK:
     case GNUNET_BLOCK_TYPE_FS_IBLOCK:
       /* the above block types MAY be available via 'stream' */
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                 "Considering stream-based download for block\n");
       GSF_stream_lookup_ (pr);
       break; 
     case GNUNET_BLOCK_TYPE_FS_KBLOCK:
     case GNUNET_BLOCK_TYPE_FS_SBLOCK:
     case GNUNET_BLOCK_TYPE_FS_NBLOCK:
       /* the above block types are in the DHT */
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                 "Considering DHT-based search for block\n");
       GSF_dht_lookup_ (pr);
       break;
     default:

Modified: gnunet/src/fs/gnunet-service-fs_stream.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_stream.c    2012-11-25 00:37:05 UTC (rev 
25127)
+++ gnunet/src/fs/gnunet-service-fs_stream.c    2012-11-25 11:56:35 UTC (rev 
25128)
@@ -365,7 +365,10 @@
 reset_stream (struct StreamHandle *sh)
 {
   struct GSF_StreamRequest *sr;
-  
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Resetting stream to %s\n",
+             GNUNET_i2s (&sh->target));
   if (NULL != sh->rh)
     GNUNET_STREAM_io_read_cancel (sh->rh);
   GNUNET_STREAM_close (sh->stream);
@@ -400,6 +403,9 @@
 {
   struct StreamHandle *sh = cls;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Timeout on stream to %s\n",
+             GNUNET_i2s (&sh->target));
   sh->timeout_task = GNUNET_SCHEDULER_NO_TASK;
   destroy_stream_handle (sh);
 }
@@ -456,6 +462,10 @@
   struct StreamHandle *sh = cls;
 
   sh->rh = NULL;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Received %u bytes from stream to %s\n",
+             (unsigned int) size,
+             GNUNET_i2s (&sh->target));
   if (GNUNET_SYSERR == 
       GNUNET_SERVER_mst_receive (sh->mst,
                                 NULL,
@@ -499,6 +509,10 @@
     reset_stream (sh);
     return;
   }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Successfully transmitted %u bytes via stream to %s\n",
+             (unsigned int) size,
+             GNUNET_i2s (&sh->target));
   if (NULL == sh->rh)
     sh->rh = GNUNET_STREAM_read (sh->stream,
                                 GNUNET_TIME_UNIT_FOREVER_REL,
@@ -530,6 +544,9 @@
   GNUNET_CONTAINER_DLL_insert_tail (sh->waiting_head,
                                    sh->waiting_tail,
                                    sr);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Sending query via stream to %s\n",
+             GNUNET_i2s (&sh->target));
   sr->was_transmitted = GNUNET_YES;
   sqm.header.size = htons (sizeof (sqm));
   sqm.header.type = htons (GNUNET_MESSAGE_TYPE_FS_STREAM_QUERY);
@@ -642,6 +659,9 @@
     }
     return sh;
   }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Creating stream to %s\n",
+             GNUNET_i2s (target));
   sh = GNUNET_malloc (sizeof (struct StreamHandle));
   sh->mst = GNUNET_SERVER_mst_create (&reply_cb,
                                      sh);
@@ -679,6 +699,10 @@
   struct StreamHandle *sh;
   struct GSF_StreamRequest *sr;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Preparing to send query for %s via stream to %s\n",
+             GNUNET_h2s (query),
+             GNUNET_i2s (target));
   sh = get_stream (target);
   sr = GNUNET_malloc (sizeof (struct GSF_StreamRequest));
   sr->sh = sh;
@@ -849,6 +873,9 @@
   int ret;
 
   sc->rh = NULL;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Received %u byte query via stream\n",
+             (unsigned int) size);
   switch (status)
   {
   case GNUNET_STREAM_OK:
@@ -897,13 +924,20 @@
   if ( (GNUNET_STREAM_OK == status) &&
        (size == sc->reply_size) )
   {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+               "Transmitted %u byte reply via stream\n",
+               (unsigned int) size);
     GNUNET_STATISTICS_update (GSF_stats,
                              gettext_noop ("# Blocks transferred via stream"), 
1,
                              GNUNET_NO);
     continue_reading (sc);
   }
   else
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+               "Transmission of reply failed, terminating stream\n");
     terminate_stream (sc);    
+  }
 }
 
 
@@ -957,6 +991,9 @@
     continue_reading (sc);
     return;
   }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Starting transmission of %u byte reply via stream\n",
+             (unsigned int) size);
   srm->header.size = htons ((uint16_t) msize);
   srm->header.type = htons (GNUNET_MESSAGE_TYPE_FS_STREAM_REPLY);
   srm->type = htonl (type);
@@ -1052,6 +1089,9 @@
 
   if (NULL == socket)
     return GNUNET_SYSERR;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Accepting inbound stream connection from `%s'\n",
+             GNUNET_i2s (initiator));
   GNUNET_STATISTICS_update (GSF_stats,
                            gettext_noop ("# stream connections active"), 1,
                            GNUNET_NO);