[GNUnet-SVN] r29701 - gnunet/src/namestore

[gnunet]

Author: grothoff
Date: 2013-09-30 11:18:59 +0200 (Mon, 30 Sep 2013)
New Revision: 29701

Modified:
   gnunet/src/namestore/gnunet-service-namestore.c
   gnunet/src/namestore/plugin_namestore_sqlite.c
Log:
-more logging

Modified: gnunet/src/namestore/gnunet-service-namestore.c
===================================================================
--- gnunet/src/namestore/gnunet-service-namestore.c     2013-09-30 09:16:25 UTC 
(rev 29700)
+++ gnunet/src/namestore/gnunet-service-namestore.c     2013-09-30 09:18:59 UTC 
(rev 29701)
@@ -422,6 +422,9 @@
   if (0 == ret)
   {
     /* no records match at all, generate empty response */
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+               "Sending empty `%s' message\n", 
+               "NAMESTORE_LOOKUP_BLOCK_RESPONSE");
     memset (&zir_end, 0, sizeof (zir_end));
     zir_end.gns_header.header.type = htons 
(GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_BLOCK_RESPONSE);
     zir_end.gns_header.header.size = htons (sizeof (struct 
LookupBlockResponseMessage));
@@ -467,7 +470,6 @@
   }
   rp_msg = (const struct BlockCacheMessage *) message;
   esize = ntohs (rp_msg->gns_header.header.size) - sizeof (struct 
BlockCacheMessage);
-
   block = GNUNET_malloc (sizeof (struct GNUNET_NAMESTORE_Block) + esize);
   block->signature = rp_msg->signature;
   block->derived_key = rp_msg->derived_key;
@@ -537,8 +539,9 @@
   rd_ser = &name_tmp[name_len];
   GNUNET_NAMESTORE_records_serialize (rd_count, rd, rd_ser_len, rd_ser);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
-             "Sending `%s' message with size %u\n", 
+             "Sending `%s' message with %u records and size %u\n", 
              "RECORD_RESULT",
+             rd_count,
              msg_size);
   GNUNET_SERVER_notification_context_unicast (nc,
                                              client, 
@@ -651,7 +654,7 @@
       res = GSN_database->store_records (GSN_database->cls,
                                         &rp_msg->private_key,
                                         conv_name,                             
       
-                                        rd_count, rd);    
+                                        rd_count, rd);
       if (GNUNET_OK == res)
       {
        struct ZoneMonitor *zm;

Modified: gnunet/src/namestore/plugin_namestore_sqlite.c
===================================================================
--- gnunet/src/namestore/plugin_namestore_sqlite.c      2013-09-30 09:16:25 UTC 
(rev 29700)
+++ gnunet/src/namestore/plugin_namestore_sqlite.c      2013-09-30 09:18:59 UTC 
(rev 29701)
@@ -480,6 +480,9 @@
     return GNUNET_SYSERR;
     
   }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+             "Caching block under derived key `%s'\n", 
+             GNUNET_h2s (&query));
   n = sqlite3_step (plugin->cache_block);
   if (SQLITE_OK != sqlite3_reset (plugin->cache_block))
     LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
@@ -534,7 +537,6 @@
                  "sqlite3_reset");
     return GNUNET_SYSERR;
   }      
-
   ret = GNUNET_NO;
   if (SQLITE_ROW == (sret = sqlite3_step (plugin->lookup_block)))
   {     
@@ -550,6 +552,9 @@
     }
     else
     {
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+                 "Found block under derived key `%s'\n", 
+                 GNUNET_h2s (query));
       iter (iter_cls, block);    
       ret = GNUNET_YES;
     }
@@ -561,6 +566,12 @@
       LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR, "sqlite_step");    
       ret = GNUNET_SYSERR;
     }
+    else
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+                 "No block found under derived key `%s'\n", 
+                 GNUNET_h2s (query));
+    }
   }
   if (SQLITE_OK != sqlite3_reset (plugin->lookup_block))
     LOG_SQLITE (plugin,