fixing compilation problems

3 files changed, 19 insertions, 6 deletions

diff --git a/src/datastore/perf_datastore_api.c b/src/datastore/perf_datastore_api.c
index f10f6d0f5..5813634d9 100644
--- a/src/datastore/perf_datastore_api.c
+++ b/src/datastore/perf_datastore_api.c
@@ -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 @@ putValue (int i, int k)
                         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
diff --git a/src/datastore/perf_datastore_api_iterators.c b/src/datastore/perf_datastore_api_iterators.c
index 635fa1f28..f03b2ebf1 100644
--- a/src/datastore/perf_datastore_api_iterators.c
+++ b/src/datastore/perf_datastore_api_iterators.c
@@ -141,32 +141,33 @@ test (struct GNUNET_DATASTORE_PluginFunctions * api)
             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;
diff --git a/src/datastore/test_datastore_api.c b/src/datastore/test_datastore_api.c
index b4da05fda..28fc12ef6 100644
--- a/src/datastore/test_datastore_api.c
+++ b/src/datastore/test_datastore_api.c
@@ -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 @@ run_continuation (void *cls,
                             get_priority (crc->i),
                             get_anonymity (crc->i),
                             get_expiration (crc->i),
+                            TIMEOUT,
                             &check_success,
                             crc);
       crc->i++;