shutdown callback

[oweals/gnunet.git] / src / fs / test_fs_list_indexed.c

diff --git a/src/fs/test_fs_list_indexed.c b/src/fs/test_fs_list_indexed.c
index 6044e69552df673ed69c3e5b12dcdc323910e435..6a9c1a7017b6e430d49bb1955c0f49dd6dfe7858 100644 (file)
--- a/src/fs/test_fs_list_indexed.c
+++ b/src/fs/test_fs_list_indexed.c
@@ -45,7 +45,7 @@
 /**
  * How long until we give up on transmitting the message?
  */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
 
 /**
  * How long should our test-content live?
@@ -55,7 +55,6 @@
 struct PeerContext
 {
   struct GNUNET_CONFIGURATION_Handle *cfg;
-  struct GNUNET_PeerIdentity id;   
 #if START_ARM
   pid_t arm_pid;
 #endif
@@ -98,7 +97,6 @@ list_indexed_task (void *cls,
 {
 
   GNUNET_SCHEDULER_add_continuation (sched,
-                                    GNUNET_NO,
                                     &abort_publish_task,
                                     NULL,
                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
@@ -121,7 +119,6 @@ progress_cb (void *cls,
       if (0 == strcmp ("list_indexed-context-dir", 
                       event->value.publish.cctx))      
        GNUNET_SCHEDULER_add_continuation (sched,
-                                          GNUNET_NO,
                                           &list_indexed_task,
                                           NULL,
                                           GNUNET_SCHEDULER_REASON_PREREQ_DONE);
@@ -129,7 +126,7 @@ progress_cb (void *cls,
       break;
     case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
       ret = event->value.publish.cctx;
-      GNUNET_assert (publish == event->value.publish.sc);
+      GNUNET_assert (publish == event->value.publish.pc);
 #if VERBOSE
       printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n",
               (unsigned long long) event->value.publish.completed,
@@ -147,7 +144,6 @@ progress_cb (void *cls,
       if (0 == strcmp ("list_indexed-context-dir", 
                       event->value.publish.cctx))              
        GNUNET_SCHEDULER_add_continuation (sched,
-                                          GNUNET_NO,
                                           &abort_publish_task,
                                           NULL,
                                           GNUNET_SCHEDULER_REASON_PREREQ_DONE);
@@ -185,7 +181,7 @@ progress_cb (void *cls,
       if (0 == strcmp ("list_indexed-context-dir", 
                       event->value.publish.cctx))      
        {
-         GNUNET_assert (publish == event->value.publish.sc);
+         GNUNET_assert (publish == event->value.publish.pc);
          publish = NULL;
        }
       break;
@@ -203,16 +199,14 @@ setup_peer (struct PeerContext *p, const char *cfgname)
 {
   p->cfg = GNUNET_CONFIGURATION_create ();
 #if START_ARM
-  p->arm_pid = GNUNET_OS_start_process ("gnunet-service-arm",
+  p->arm_pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
                                         "gnunet-service-arm",
 #if VERBOSE
                                         "-L", "DEBUG",
 #endif
                                         "-c", cfgname, NULL);
-  sleep (1);                    /* allow ARM to start */
 #endif
   GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
-  GNUNET_ARM_start_services (p->cfg, sched, "core", NULL);
 }
 
 
@@ -284,7 +278,8 @@ run (void *cls,
 
   meta = GNUNET_CONTAINER_meta_data_create ();
   kuri = GNUNET_FS_uri_ksk_create_from_args (2, keywords);
-  fi1 = GNUNET_FS_file_information_create_from_file ("list_indexed-context1",
+  fi1 = GNUNET_FS_file_information_create_from_file (fs,
+                                                    "list_indexed-context1",
                                                     fn1,
                                                     kuri,
                                                     meta,
@@ -292,7 +287,8 @@ run (void *cls,
                                                     1,
                                                     42,
                                                     GNUNET_TIME_relative_to_absolute (LIFETIME)); 
-  fi2 = GNUNET_FS_file_information_create_from_file ("list_indexed-context2",
+  fi2 = GNUNET_FS_file_information_create_from_file (fs,
+                                                    "list_indexed-context2",
                                                     fn2,
                                                     kuri,
                                                     meta,
@@ -300,7 +296,8 @@ run (void *cls,
                                                     2,
                                                     42,
                                                     GNUNET_TIME_relative_to_absolute (LIFETIME)); 
-  fidir = GNUNET_FS_file_information_create_empty_directory ("list_indexed-context-dir",
+  fidir = GNUNET_FS_file_information_create_empty_directory (fs,
+                                                            "list_indexed-context-dir",
                                                             kuri,
                                                             meta,
                                                             3,
@@ -347,11 +344,17 @@ main (int argc, char *argv[])
                       argvx, "test-fs-list_indexed",
                      "nohelp", options, &run, NULL);
   stop_arm (&p1);
-  GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-list_indexed/");
-  GNUNET_DISK_directory_remove (fn1);
-  GNUNET_free_non_null (fn1);
-  GNUNET_DISK_directory_remove (fn2);
-  GNUNET_free_non_null (fn2);
+  GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-list-indexed/");
+  if (fn1 != NULL)
+    {
+      GNUNET_DISK_directory_remove (fn1);
+      GNUNET_free (fn1);
+    }
+  if (fn2 != NULL)
+    {
+      GNUNET_DISK_directory_remove (fn2);
+      GNUNET_free (fn2);
+    }
   return err;
 }