[GNUnet-SVN] r14903 - gnunet/src/datastore

[gnunet]

Author: grothoff
Date: 2011-04-06 16:05:45 +0200 (Wed, 06 Apr 2011)
New Revision: 14903

Modified:
   gnunet/src/datastore/datastore_api.c
   gnunet/src/datastore/gnunet-service-datastore.c
   gnunet/src/datastore/perf_datastore_api.c
   gnunet/src/datastore/plugin_datastore_sqlite.c
Log:
fixc

Modified: gnunet/src/datastore/datastore_api.c
===================================================================
--- gnunet/src/datastore/datastore_api.c        2011-04-06 13:51:34 UTC (rev 
14902)
+++ gnunet/src/datastore/datastore_api.c        2011-04-06 14:05:45 UTC (rev 
14903)
@@ -1272,6 +1272,8 @@
              ntohl(dm->size),
              GNUNET_h2s(&dm->key));
 #endif
+  if (GNUNET_YES == qe->one_shot)
+    free_queue_entry (qe);
   h->retry_time.rel_value = 0;
   rc.iter (rc.iter_cls,
           &dm->key,
@@ -1282,8 +1284,6 @@
           ntohl(dm->anonymity),
           GNUNET_TIME_absolute_ntoh(dm->expiration),   
           GNUNET_ntohll(dm->uid));
-  if (GNUNET_YES == qe->one_shot)
-    free_queue_entry (qe);
 }
 
 

Modified: gnunet/src/datastore/gnunet-service-datastore.c
===================================================================
--- gnunet/src/datastore/gnunet-service-datastore.c     2011-04-06 13:51:34 UTC 
(rev 14902)
+++ gnunet/src/datastore/gnunet-service-datastore.c     2011-04-06 14:05:45 UTC 
(rev 14903)
@@ -540,6 +540,10 @@
     tcc->tc (tcc->tc_cls, GNUNET_OK);
   if (GNUNET_YES == tcc->end)
     {
+#if DEBUG_DATASTORE
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                 "Done processing client request\n");
+#endif
       GNUNET_SERVER_receive_done (tcc->client, GNUNET_OK);
     }
   else
@@ -750,7 +754,8 @@
                            gettext_noop ("# results found"),
                            1,
                            GNUNET_NO);
-  transmit (client, &dm->header, &get_next, next_cls, GNUNET_NO);
+  transmit (client, &dm->header, &get_next, next_cls, 
+           (next_cls != NULL) ? GNUNET_NO : GNUNET_YES);
   return GNUNET_OK;
 }
 

Modified: gnunet/src/datastore/perf_datastore_api.c
===================================================================
--- gnunet/src/datastore/perf_datastore_api.c   2011-04-06 13:51:34 UTC (rev 
14902)
+++ gnunet/src/datastore/perf_datastore_api.c   2011-04-06 14:05:45 UTC (rev 
14903)
@@ -226,27 +226,29 @@
       if (i > 255)
        memset (data, i - 255, size / 2);
       data[0] = k;
-      GNUNET_DATASTORE_put (datastore,
-                           0,
-                           &key,
-                           size,
-                           data,
-                           i+1,
-                           GNUNET_CRYPTO_random_u32 
(GNUNET_CRYPTO_QUALITY_WEAK, 100),
-                           i, 0,
-                           GNUNET_TIME_relative_to_absolute 
-                           (GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS,
-                                                           
GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 1000))),
-                           1, 1, TIMEOUT,
-                           &check_success, 
-                           crc);
+      GNUNET_assert (NULL !=
+                    GNUNET_DATASTORE_put (datastore,
+                                          0,
+                                          &key,
+                                          size,
+                                          data,
+                                          i+1,
+                                          GNUNET_CRYPTO_random_u32 
(GNUNET_CRYPTO_QUALITY_WEAK, 100),
+                                          i, 0,
+                                          GNUNET_TIME_relative_to_absolute 
+                                          (GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS,
+                                                                          
GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 1000))),
+                                          1, 1, TIMEOUT,
+                                          &check_success, 
+                                          crc));
       break;
     case RP_CUT:
       /* trim down below MAX_SIZE again */
-      GNUNET_DATASTORE_get_for_replication (datastore, 
-                                           1, 1, TIMEOUT,
-                                           &delete_value,
-                                           crc);
+      GNUNET_assert (NULL !=
+                    GNUNET_DATASTORE_get_for_replication (datastore, 
+                                                          1, 1, TIMEOUT,
+                                                          &delete_value,
+                                                          crc));
       break;
     case RP_REPORT:
       printf (

Modified: gnunet/src/datastore/plugin_datastore_sqlite.c
===================================================================
--- gnunet/src/datastore/plugin_datastore_sqlite.c      2011-04-06 13:51:34 UTC 
(rev 14902)
+++ gnunet/src/datastore/plugin_datastore_sqlite.c      2011-04-06 14:05:45 UTC 
(rev 14903)
@@ -31,7 +31,7 @@
 /**
  * Enable or disable logging debug messages.
  */
-#define DEBUG_SQLITE GNUNET_YES
+#define DEBUG_SQLITE GNUNET_NO
 
 /**
  * We allocate items on the stack at times.  To prevent a stack