fixing reconnect issues

[oweals/gnunet.git] / src / datastore / test_datastore_api.c

diff --git a/src/datastore/test_datastore_api.c b/src/datastore/test_datastore_api.c
index 605cb042d9f57b5f0d1d3ac7d03865e08536c9d9..ce3c18daa139a6ba0d27da9fef15fba285b6a377 100644 (file)
--- a/src/datastore/test_datastore_api.c
+++ b/src/datastore/test_datastore_api.c
@@ -109,7 +109,8 @@ enum RunPhase
     RP_GET_MULTIPLE_DONE,
     RP_UPDATE,
     RP_UPDATE_VALIDATE,
-    RP_UPDATE_DONE
+    RP_UPDATE_DONE,
+    RP_ERROR
   };
 
 
@@ -139,13 +140,16 @@ check_success (void *cls,
 {
   struct CpsRunContext *crc = cls;
   if (GNUNET_OK != success)
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-               "%s\n", msg);
-  GNUNET_assert (GNUNET_OK == success);
+    {
+      ok = 42;
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                 "%s\n", msg);
+      GNUNET_SCHEDULER_shutdown (crc->sched);
+      return;
+    }
   GNUNET_free_non_null (crc->data);
   crc->data = NULL;
   GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                    GNUNET_NO,
                                     &run_continuation,
                                     crc,
                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
@@ -164,7 +168,6 @@ get_reserved (void *cls,
   GNUNET_assert (0 < success);
   crc->rid = success;
   GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                    GNUNET_NO,
                                     &run_continuation,
                                     crc,
                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
@@ -176,7 +179,7 @@ check_value (void *cls,
             const GNUNET_HashCode * key,
             uint32_t size,
             const void *data,
-            uint32_t type,
+            enum GNUNET_BLOCK_Type type,
             uint32_t priority,
             uint32_t anonymity,
             struct GNUNET_TIME_Absolute
@@ -193,7 +196,6 @@ check_value (void *cls,
          crc->i = ITERATIONS;
        }
       GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                        GNUNET_NO,
                                         &run_continuation,
                                         crc,
                                         GNUNET_SCHEDULER_REASON_PREREQ_DONE);
@@ -212,21 +214,30 @@ check_value (void *cls,
 
 static void 
 delete_value (void *cls,
-            const GNUNET_HashCode * key,
-            uint32_t size,
-            const void *data,
-            uint32_t type,
-            uint32_t priority,
-            uint32_t anonymity,
-            struct GNUNET_TIME_Absolute
-            expiration, uint64_t uid)
+             const GNUNET_HashCode * key,
+             uint32_t size,
+             const void *data,
+             enum GNUNET_BLOCK_Type type,
+             uint32_t priority,
+             uint32_t anonymity,
+             struct GNUNET_TIME_Absolute
+             expiration, uint64_t uid)
 {
   struct CpsRunContext *crc = cls;
   if (key == NULL)
     {
-      crc->phase = RP_DO_DEL;
+      if (crc->data == NULL)
+       {
+         GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                     "Content %u not found!\n",
+                     crc->i);
+         crc->phase = RP_ERROR;
+       }
+      else
+       {
+         crc->phase = RP_DO_DEL;
+       }
       GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                        GNUNET_NO,
                                         &run_continuation,
                                         crc,
                                         GNUNET_SCHEDULER_REASON_PREREQ_DONE);
@@ -243,14 +254,14 @@ delete_value (void *cls,
 
 static void 
 check_nothing (void *cls,
-            const GNUNET_HashCode * key,
-            uint32_t size,
-            const void *data,
-            uint32_t type,
-            uint32_t priority,
-            uint32_t anonymity,
-            struct GNUNET_TIME_Absolute
-            expiration, uint64_t uid)
+              const GNUNET_HashCode * key,
+              uint32_t size,
+              const void *data,
+              enum GNUNET_BLOCK_Type type,
+              uint32_t priority,
+              uint32_t anonymity,
+              struct GNUNET_TIME_Absolute
+              expiration, uint64_t uid)
 {
   struct CpsRunContext *crc = cls;
   GNUNET_assert (key == NULL);
@@ -259,7 +270,6 @@ check_nothing (void *cls,
       crc->phase = RP_RESERVE;   
     }
   GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                    GNUNET_NO,
                                     &run_continuation,
                                     crc,
                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
@@ -271,7 +281,7 @@ check_multiple (void *cls,
                const GNUNET_HashCode * key,
                uint32_t size,
                const void *data,
-               uint32_t type,
+               enum GNUNET_BLOCK_Type type,
                uint32_t priority,
                uint32_t anonymity,
                struct GNUNET_TIME_Absolute
@@ -284,7 +294,6 @@ check_multiple (void *cls,
       GNUNET_assert (crc->phase == RP_GET_MULTIPLE_DONE);
       crc->phase = RP_UPDATE;
       GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                        GNUNET_NO,
                                         &run_continuation,
                                         crc,
                                         GNUNET_SCHEDULER_REASON_PREREQ_DONE);
@@ -302,7 +311,7 @@ check_update (void *cls,
              const GNUNET_HashCode * key,
              uint32_t size,
              const void *data,
-             uint32_t type,
+             enum GNUNET_BLOCK_Type type,
              uint32_t priority,
              uint32_t anonymity,
              struct GNUNET_TIME_Absolute
@@ -315,7 +324,6 @@ check_update (void *cls,
       GNUNET_assert (crc->phase == RP_UPDATE_DONE);
       crc->phase = RP_DONE;
       GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                        GNUNET_NO,
                                         &run_continuation,
                                         crc,
                                         GNUNET_SCHEDULER_REASON_PREREQ_DONE);
@@ -362,7 +370,7 @@ run_continuation (void *cls,
                            get_priority (crc->i),
                            get_anonymity (crc->i),
                            get_expiration (crc->i),
-                           TIMEOUT,
+                           1, 1, TIMEOUT,
                            &check_success,
                            crc);
       crc->i++;
@@ -381,9 +389,9 @@ run_continuation (void *cls,
       GNUNET_DATASTORE_get (datastore, 
                            &crc->key,
                            get_type (crc->i),
+                           1, 1, TIMEOUT,
                            &check_value,
-                           crc,
-                           TIMEOUT);
+                           crc);
       break;
     case RP_DEL:
       crc->i--;
@@ -393,13 +401,14 @@ run_continuation (void *cls,
                  "DEL",
                  crc->i);
 #endif
+      crc->data = NULL;
       GNUNET_CRYPTO_hash (&crc->i, sizeof (int), &crc->key);
       GNUNET_DATASTORE_get (datastore, 
                            &crc->key,
                            get_type (crc->i),
+                           1, 1, TIMEOUT,
                            &delete_value,
-                           crc,
-                           TIMEOUT);
+                           crc);
       break;
     case RP_DO_DEL:
 #if VERBOSE
@@ -421,9 +430,9 @@ run_continuation (void *cls,
                               &crc->key,
                               crc->size,
                               crc->data,
+                              1, 1, TIMEOUT,
                               &check_success,
-                              crc,
-                              TIMEOUT);
+                              crc);
       break;   
     case RP_DELVALIDATE:
       crc->i--;
@@ -437,18 +446,18 @@ run_continuation (void *cls,
       GNUNET_DATASTORE_get (datastore, 
                            &crc->key,
                            get_type (crc->i),
+                           1, 1, TIMEOUT,
                            &check_nothing,
-                           crc,
-                           TIMEOUT);
+                           crc);
       break;
     case RP_RESERVE:
       crc->phase = RP_PUT_MULTIPLE;
       GNUNET_DATASTORE_reserve (datastore,
                                128*1024,
                                2,
+                               1, 1, TIMEOUT,
                                &get_reserved,
-                               crc,
-                               TIMEOUT);
+                               crc);
       break;
     case RP_PUT_MULTIPLE:
       crc->phase = RP_PUT_MULTIPLE_NEXT;
@@ -461,7 +470,7 @@ run_continuation (void *cls,
                            get_priority (42),
                            get_anonymity (42),
                            get_expiration (42),
-                           TIMEOUT,
+                           1, 1, TIMEOUT,
                            &check_success,
                            crc);
       break;
@@ -476,7 +485,7 @@ run_continuation (void *cls,
                            get_priority (43),
                            get_anonymity (43),
                            get_expiration (43),
-                           TIMEOUT,
+                           1, 1, TIMEOUT,
                            &check_success,
                            crc);
       break;
@@ -484,9 +493,9 @@ run_continuation (void *cls,
       GNUNET_DATASTORE_get (datastore,
                            &crc->key, 
                            get_type (42),
+                           1, 1, TIMEOUT,
                            &check_multiple,
-                           crc,
-                           TIMEOUT);
+                           crc);
       break;
     case RP_GET_MULTIPLE_NEXT:
     case RP_GET_MULTIPLE_DONE:
@@ -499,17 +508,17 @@ run_continuation (void *cls,
                               crc->uid,
                               100,
                               get_expiration (42),
+                              1, 1, TIMEOUT,
                               &check_success,
-                              crc,
-                              TIMEOUT);
+                              crc);
       break;
     case RP_UPDATE_VALIDATE:
       GNUNET_DATASTORE_get (datastore,
                            &crc->key, 
                            get_type (42),
+                           1, 1, TIMEOUT,
                            &check_update,
-                           crc,
-                           TIMEOUT);   
+                           crc);   
       break;
     case RP_UPDATE_DONE:
       GNUNET_assert (0);
@@ -522,6 +531,12 @@ run_continuation (void *cls,
       GNUNET_DATASTORE_disconnect (datastore, GNUNET_YES);
       GNUNET_free (crc);
       ok = 0;
+      break;
+    case RP_ERROR:
+      GNUNET_DATASTORE_disconnect (datastore, GNUNET_YES);
+      GNUNET_free (crc);
+      ok = 43;
+      break;
     }
 }
 
@@ -542,7 +557,6 @@ run (void *cls,
   now = GNUNET_TIME_absolute_get ();
   datastore = GNUNET_DATASTORE_connect (cfg, sched);
   GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                    GNUNET_NO,
                                     &run_continuation,
                                     crc,
                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
@@ -566,13 +580,12 @@ check ()
   struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
-  pid = GNUNET_OS_start_process ("gnunet-service-arm",
+  pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
                                  "gnunet-service-arm",
 #if VERBOSE
                                  "-L", "DEBUG",
 #endif
                                  "-c", "test_datastore_api_data.conf", NULL);
-  sleep (1);
   GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
                       argv, "test-datastore-api", "nohelp",
                       options, &run, NULL);