(no commit message)

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

diff --git a/src/fs/test_gnunet_service_fs_migration.c b/src/fs/test_gnunet_service_fs_migration.c
index 8b68da2fbaea010b3a637996bcdc6182abf8bddf..092cedfc226c5063fd306c3a572d134a4208dcd5 100644 (file)
--- a/src/fs/test_gnunet_service_fs_migration.c
+++ b/src/fs/test_gnunet_service_fs_migration.c
@@ -4,7 +4,7 @@
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -27,7 +27,7 @@
 #include "fs_test_lib.h"
 #include "gnunet_testing_lib.h"
 
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
 
 /**
  * File-size we use for testing.
@@ -37,19 +37,17 @@
 /**
  * How long until we give up on transmitting the message?
  */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 120)
 
 /**
  * How long do we give the peers for content migration?
  */
-#define MIGRATION_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
+#define MIGRATION_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15)
 
 #define SEED 42
 
 static struct GNUNET_FS_TestDaemon *daemons[2];
 
-static struct GNUNET_SCHEDULER_Handle *sched;
-
 static int ok;
 
 static struct GNUNET_TIME_Absolute start_time;
@@ -61,15 +59,14 @@ do_stop (void *cls,
   struct GNUNET_TIME_Relative del;
   char *fancy;
 
-  GNUNET_FS_TEST_daemons_stop (sched,
-                              2,
+  GNUNET_FS_TEST_daemons_stop (2,
                               daemons);
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE))
     {
       del = GNUNET_TIME_absolute_get_duration (start_time);
-      if (del.value == 0)
-       del.value = 1;
-      fancy = GNUNET_STRINGS_byte_size_fancy (((unsigned long long)FILESIZE) * 1000LL / del.value);
+      if (del.rel_value == 0)
+       del.rel_value = 1;
+      fancy = GNUNET_STRINGS_byte_size_fancy (((unsigned long long)FILESIZE) * 1000LL / del.rel_value);
       fprintf (stdout,
               "Download speed was %s/s\n",
               fancy);
@@ -95,12 +92,12 @@ do_download (void *cls,
 
   if (emsg != NULL)
     {
-      GNUNET_FS_TEST_daemons_stop (sched,
-                                  2,
+      GNUNET_FS_TEST_daemons_stop (2,
                                   daemons);
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                  "Failed to stop source daemon: %s\n",
                  emsg);
+      GNUNET_FS_uri_destroy (uri);
       ok = 1;
       return;
     }
@@ -108,12 +105,12 @@ do_download (void *cls,
              "Downloading %llu bytes\n",
              (unsigned long long) FILESIZE);
   start_time = GNUNET_TIME_absolute_get ();
-  GNUNET_FS_TEST_download (sched,
-                          daemons[0],
+  GNUNET_FS_TEST_download (daemons[0],
                           TIMEOUT,
                           1, SEED, uri, 
                           VERBOSE, 
                           &do_stop, NULL);
+  GNUNET_FS_uri_destroy (uri);
 }
 
 
@@ -141,8 +138,7 @@ do_wait (void *cls,
 
   if (NULL == uri)
     {
-      GNUNET_FS_TEST_daemons_stop (sched,
-                                  2,
+      GNUNET_FS_TEST_daemons_stop (2,
                                   daemons);
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                  "Timeout during upload attempt, shutting down with error\n");
@@ -152,10 +148,9 @@ do_wait (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Waiting to allow content to migrate\n"); 
   d = GNUNET_FS_uri_dup (uri);
-  GNUNET_SCHEDULER_add_delayed (sched,
-                               MIGRATION_DELAY,
-                               &stop_source_peer,
-                               d);
+  (void) GNUNET_SCHEDULER_add_delayed (MIGRATION_DELAY,
+                                      &stop_source_peer,
+                                      d);
 }
 
 
@@ -165,8 +160,7 @@ do_publish (void *cls,
 {
   if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE))
     {
-      GNUNET_FS_TEST_daemons_stop (sched,
-                                  2,
+      GNUNET_FS_TEST_daemons_stop (2,
                                   daemons);
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                  "Timeout during connect attempt, shutting down with error\n");
@@ -176,8 +170,7 @@ do_publish (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Publishing %llu bytes\n",
              (unsigned long long) FILESIZE);
-  GNUNET_FS_TEST_publish (sched,
-                         daemons[1],
+  GNUNET_FS_TEST_publish (daemons[1],
                          TIMEOUT,
                          1, GNUNET_NO, FILESIZE, SEED, 
                          VERBOSE, 
@@ -189,11 +182,17 @@ static void
 do_connect (void *cls,
            const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_assert (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE));
+  if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE))
+    {
+      fprintf (stderr,
+              "Daemons failed to start!\n");
+      GNUNET_break (0);
+      ok = 1;
+      return;
+    }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Daemons started, will now try to connect them\n");
-  GNUNET_FS_TEST_daemons_connect (sched,
-                                 daemons[0],
+  GNUNET_FS_TEST_daemons_connect (daemons[0],
                                  daemons[1],
                                  TIMEOUT,
                                  &do_publish,
@@ -203,14 +202,11 @@ do_connect (void *cls,
 
 static void
 run (void *cls,
-     struct GNUNET_SCHEDULER_Handle *s,
      char *const *args,
      const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
-  sched = s;
-  GNUNET_FS_TEST_daemons_start (sched,
-                               "test_gnunet_service_fs_migration_data.conf",
+  GNUNET_FS_TEST_daemons_start ("test_gnunet_service_fs_migration_data.conf",
                                TIMEOUT,
                                2,
                                daemons,
@@ -243,7 +239,6 @@ main (int argc, char *argv[])
                    "WARNING",
 #endif
                    NULL);
-  system ("netstat -ntpl");
   GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1,
                       argvx, "test-gnunet-service-fs-migration",
                      "nohelp", options, &run, NULL);