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

[gnunet]

Author: grothoff
Date: 2011-05-25 12:23:29 +0200 (Wed, 25 May 2011)
New Revision: 15296

Modified:
   gnunet/src/fs/gnunet-service-fs.c
   gnunet/src/fs/gnunet-service-fs_lc.c
   gnunet/src/fs/gnunet-service-fs_pe.c
   gnunet/src/fs/gnunet-service-fs_pr.c
Log:
nicer debugs

Modified: gnunet/src/fs/gnunet-service-fs.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs.c   2011-05-25 10:22:34 UTC (rev 15295)
+++ gnunet/src/fs/gnunet-service-fs.c   2011-05-25 10:23:29 UTC (rev 15296)
@@ -330,7 +330,7 @@
   struct GSF_PendingRequestData *prd;
 
   prd = GSF_pending_request_get_data_ (pr);
-#if DEBUG_FS
+#if DEBUG_FS_CLIENT
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Finished database lookup for local request `%s' with result 
%d\n",
              GNUNET_h2s (&prd->query),

Modified: gnunet/src/fs/gnunet-service-fs_lc.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_lc.c        2011-05-25 10:22:34 UTC (rev 
15295)
+++ gnunet/src/fs/gnunet-service-fs_lc.c        2011-05-25 10:23:29 UTC (rev 
15296)
@@ -274,7 +274,7 @@
     memcpy (&pm[1], data, data_len);      
     GSF_local_client_transmit_ (lc, &pm->header);
   }
-#if DEBUG_FS
+#if DEBUG_FS_CLIENT
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Queued reply to query `%s' for local client\n",
              GNUNET_h2s (&prd->query),
@@ -324,7 +324,7 @@
   sc = (msize - sizeof (struct SearchMessage)) / sizeof (GNUNET_HashCode);
   sm = (const struct SearchMessage*) message;
   type = ntohl (sm->type);
-#if DEBUG_FS
+#if DEBUG_FS_CLIENT
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Received request for `%s' of type %u from local client\n",
              GNUNET_h2s (&sm->query),
@@ -354,7 +354,7 @@
        }
       if (cr != NULL)  
        { 
-#if DEBUG_FS
+#if DEBUG_FS_CLIENT
          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                      "Have existing request, merging content-seen lists.\n");
 #endif

Modified: gnunet/src/fs/gnunet-service-fs_pe.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_pe.c        2011-05-25 10:22:34 UTC (rev 
15295)
+++ gnunet/src/fs/gnunet-service-fs_pe.c        2011-05-25 10:23:29 UTC (rev 
15296)
@@ -281,7 +281,7 @@
     }
   /* process from priority heap */
   rp = GNUNET_CONTAINER_heap_peek (pp->priority_heap);
-#if DEBUG_FS
+#if DEBUG_FS > 1
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Executing query plan %p\n",
              rp);
@@ -314,6 +314,7 @@
   struct GSF_PendingRequestData *prd;
   struct GSF_RequestPlan *rp;
 
+  GNUNET_assert (NULL != cp);
   GSF_connected_peer_get_identity_ (cp, &id);
   pp = GNUNET_CONTAINER_multihashmap_get (plans,
                                          &id.hashPubKey);

Modified: gnunet/src/fs/gnunet-service-fs_pr.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_pr.c        2011-05-25 10:22:34 UTC (rev 
15295)
+++ gnunet/src/fs/gnunet-service-fs_pr.c        2011-05-25 10:23:29 UTC (rev 
15296)
@@ -280,7 +280,7 @@
   struct GSF_PendingRequest *pr;
   struct GSF_PendingRequest *dpr;
   
-#if DEBUG_FS
+#if DEBUG_FS > 1
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Creating request handle for `%s' of type %d\n",
              GNUNET_h2s (query),
@@ -1065,7 +1065,7 @@
     }
   if (NULL == key)
     {
-#if DEBUG_FS
+#if DEBUG_FS > 1
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                  "No further local responses available.\n");
 #endif
@@ -1087,7 +1087,7 @@
 #endif
   if (type == GNUNET_BLOCK_TYPE_FS_ONDEMAND)
     {
-#if DEBUG_FS
+#if DEBUG_FS > 1
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                  "Found ONDEMAND block, performing on-demand encoding\n");
 #endif