fix

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

diff --git a/src/fs/test_gnunet_service_fs_p2p.c b/src/fs/test_gnunet_service_fs_p2p.c
index d36088d2b6c83e439263dc26c06766d5f967ec50..80d1017f12ba334140a70d8602043051f7394f65 100644 (file)
--- a/src/fs/test_gnunet_service_fs_p2p.c
+++ b/src/fs/test_gnunet_service_fs_p2p.c
@@ -24,7 +24,7 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include "test_fs_lib.h"
+#include "fs_test_lib.h"
 
 #define VERBOSE GNUNET_NO
 
@@ -36,7 +36,7 @@
 /**
  * How long until we give up on transmitting the message?
  */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 600)
 
 #define NUM_DAEMONS 2
 
@@ -46,15 +46,40 @@ static struct GNUNET_FS_TestDaemon *daemons[NUM_DAEMONS];
 
 static struct GNUNET_SCHEDULER_Handle *sched;
 
+static int ok;
+
+static struct GNUNET_TIME_Absolute start_time;
 
 static void
 do_stop (void *cls,
         const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_assert (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE));
+  struct GNUNET_TIME_Relative del;
+  char *fancy;
+
   GNUNET_FS_TEST_daemons_stop (sched,
                               NUM_DAEMONS,
                               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);
+      fprintf (stdout,
+              "Download speed was %s/s\n",
+              fancy);
+      GNUNET_free (fancy);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                 "Finished download, shutting down\n",
+                 (unsigned long long) FILESIZE);
+    }
+  else
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                 "Timeout during download, shutting down with error\n");
+      ok = 1;
+    }
 }
 
 
@@ -62,9 +87,22 @@ static void
 do_download (void *cls,
             const struct GNUNET_FS_Uri *uri)
 {
-  GNUNET_assert (NULL != uri);
+  if (NULL == uri)
+    {
+      GNUNET_FS_TEST_daemons_stop (sched,
+                                  NUM_DAEMONS,
+                                  daemons);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                 "Timeout during upload attempt, shutting down with error\n");
+      ok = 1;
+      return;
+    }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Downloading %llu bytes\n",
+             (unsigned long long) FILESIZE);
+  start_time = GNUNET_TIME_absolute_get ();
   GNUNET_FS_TEST_download (sched,
-                          daemons[1],
+                          daemons[0],
                           TIMEOUT,
                           1, SEED, uri, 
                           VERBOSE, 
@@ -76,7 +114,19 @@ static void
 do_publish (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))
+    {
+      GNUNET_FS_TEST_daemons_stop (sched,
+                                  NUM_DAEMONS,
+                                  daemons);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                 "Timeout during connect attempt, shutting down with error\n");
+      ok = 1;
+      return;
+    }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Publishing %llu bytes\n",
+             (unsigned long long) FILESIZE);
   GNUNET_FS_TEST_publish (sched,
                          daemons[1],
                          TIMEOUT,
@@ -91,9 +141,11 @@ do_connect (void *cls,
            const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   GNUNET_assert (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE));
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Daemons started, will now try to connect them\n");
   GNUNET_FS_TEST_daemons_connect (sched,
+                                 daemons[0],
                                  daemons[1],
-                                 daemons[2],
                                  TIMEOUT,
                                  &do_publish,
                                  NULL);  
@@ -109,6 +161,7 @@ run (void *cls,
 {
   sched = s;
   GNUNET_FS_TEST_daemons_start (sched,
+                               "fs_test_lib_data.conf",
                                TIMEOUT,
                                NUM_DAEMONS,
                                daemons,
@@ -123,7 +176,7 @@ main (int argc, char *argv[])
   char *const argvx[] = { 
     "test-gnunet-service-fs-p2p",
     "-c",
-    "test_fs_lib_data.conf",
+    "fs_test_lib_data.conf",
 #if VERBOSE
     "-L", "DEBUG",
 #endif
@@ -133,6 +186,7 @@ main (int argc, char *argv[])
     GNUNET_GETOPT_OPTION_END
   };
 
+  GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
   GNUNET_log_setup ("test_gnunet_service_fs_p2p", 
 #if VERBOSE
                    "DEBUG",
@@ -143,7 +197,8 @@ main (int argc, char *argv[])
   GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1,
                       argvx, "test-gnunet-service-fs-p2p",
                      "nohelp", options, &run, NULL);
-  return 0;
+  GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
+  return ok;
 }
 
 /* end of test_gnunet_service_fs_p2p.c */