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

[gnunet]

Author: grothoff
Date: 2009-07-16 16:30:44 -0600 (Thu, 16 Jul 2009)
New Revision: 8719

Modified:
   gnunet/src/datastore/perf_datastore_api.c
   gnunet/src/datastore/perf_datastore_api_iterators.c
   gnunet/src/datastore/test_datastore_api.c
Log:
fixing compilation problems

Modified: gnunet/src/datastore/perf_datastore_api.c
===================================================================
--- gnunet/src/datastore/perf_datastore_api.c   2009-07-16 22:27:01 UTC (rev 
8718)
+++ gnunet/src/datastore/perf_datastore_api.c   2009-07-16 22:30:44 UTC (rev 
8719)
@@ -41,6 +41,11 @@
 static struct GNUNET_DATASTORE_Handle *datastore;
 
 /**
+ * How long until we give up on transmitting the message?
+ */
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15)
+
+/**
  * Target datastore size (in bytes).
  * <p>
  * Example impact of total size on the reported number
@@ -137,6 +142,7 @@
                        GNUNET_TIME_relative_to_absolute 
                        (GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS,
                                                        
GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 1000))),
+                       TIMEOUT,
                        NULL, NULL);
   ic++;
 #if REPORT_ID

Modified: gnunet/src/datastore/perf_datastore_api_iterators.c
===================================================================
--- gnunet/src/datastore/perf_datastore_api_iterators.c 2009-07-16 22:27:01 UTC 
(rev 8718)
+++ gnunet/src/datastore/perf_datastore_api_iterators.c 2009-07-16 22:30:44 UTC 
(rev 8719)
@@ -141,32 +141,33 @@
             break;
         }
       end = GNUNET_TIME_absolute_get ();
-      printf ("%3u insertion              took %20llums\n", i, end.value - 
start.value);
+      printf ("%3u insertion              took %20llums\n", i,
+             (unsigned long long) (end.value - start.value));
       start = end;
       api->iter_low_priority (api->cls, 0, &iterateDummy, api);
       end = GNUNET_TIME_absolute_get ();
       printf ("%3u low priority iteration took %20llums\n", i,
-              end.value - start.value);
+              (unsigned long long) (end.value - start.value));
       start = end;
       api->iter_ascending_expiration (api->cls, 0, &iterateDummy, api);
       end = GNUNET_TIME_absolute_get ();
       printf ("%3u expiration t iteration took %20llums\n", i,
-              end.value - start.value);
+              (unsigned long long) (end.value - start.value));
       start = end;
       api->iter_zero_anonymity (api->cls, 0, &iterateDummy, api);
       end = GNUNET_TIME_absolute_get ();
       printf ("%3u non anonymou iteration took %20llums\n", i,
-              end.value - start.value);
+              (unsigned long long) (end.value - start.value));
       start = end;
       api->iter_migration_order (api->cls, 0, &iterateDummy, api);
       end = GNUNET_TIME_absolute_get ();
       printf ("%3u migration or iteration took %20llums\n", i,
-              end.value - start.value);
+              (unsigned long long) (end.value - start.value));
       start = end;
       api->iter_all_now (api->cls, 0, &iterateDummy, api);
       end = GNUNET_TIME_absolute_get ();
       printf ("%3u all now      iteration took %20llums\n", i,
-              end.value - start.value);
+              (unsigned long long) (end.value - start.value));
     }
   api->drop (api->cls);
   return GNUNET_OK;

Modified: gnunet/src/datastore/test_datastore_api.c
===================================================================
--- gnunet/src/datastore/test_datastore_api.c   2009-07-16 22:27:01 UTC (rev 
8718)
+++ gnunet/src/datastore/test_datastore_api.c   2009-07-16 22:30:44 UTC (rev 
8719)
@@ -33,6 +33,11 @@
 #include "gnunet_protocols.h"
 #include "gnunet_datastore_service.h"
 
+/**
+ * How long until we give up on transmitting the message?
+ */
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15)
+
 static struct GNUNET_DATASTORE_Handle *datastore;
 
 static struct GNUNET_TIME_Absolute now;
@@ -253,6 +258,7 @@
                            get_priority (crc->i),
                            get_anonymity (crc->i),
                            get_expiration (crc->i),
+                           TIMEOUT,
                            &check_success,
                            crc);
       crc->i++;