-trying to fix crash from #1972 report

[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 aff5d7b9a76864099b74cafd983f56fb5a2db00b..fb07d34b5bf8326104d549781a00c7aefa8ea829 100644 (file)
--- a/src/fs/test_gnunet_service_fs_p2p.c
+++ b/src/fs/test_gnunet_service_fs_p2p.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
 
      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
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but


@@ -24,19 +24,19 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
  * @author Christian Grothoff
  */
 #include "platform.h"

-#include "test_fs_lib.h"
+#include "fs_test_lib.h"

 
 

-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_EXTRA_LOGGING

 
 /**
  * File-size we use for testing.
  */
 
 /**
  * File-size we use for testing.
  */

-#define FILESIZE (1024 * 1024 * 2)
+#define FILESIZE (1024 * 1024 * 1)

 
 /**
 
 /**

- * How long until we give up on transmitting the message?
+ * How long until we give up on the download?

  */
  */

-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300)

 
 #define NUM_DAEMONS 2
 
 
 #define NUM_DAEMONS 2
 


@@ -44,97 +44,111 @@
 
 static struct GNUNET_FS_TestDaemon *daemons[NUM_DAEMONS];
 
 
 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 struct GNUNET_FS_TEST_ConnectContext *cc;

 
 static void
 
 static void

-do_stop (void *cls,
-        const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)

 {
 {

-  GNUNET_assert (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE));
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Finished download, shutting down\n",
-             (unsigned long long) FILESIZE);
-  GNUNET_FS_TEST_daemons_stop (sched,
-                              NUM_DAEMONS,
-                              daemons);
+  struct GNUNET_TIME_Relative del;
+  char *fancy;
+
+  if (NULL != cc)
+  {
+    GNUNET_FS_TEST_daemons_connect_cancel (cc);
+    cc = NULL;
+  }
+  GNUNET_FS_TEST_daemons_stop (NUM_DAEMONS, daemons);
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE))
+  {
+    del = GNUNET_TIME_absolute_get_duration (start_time);
+    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);
+    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;
+  }

 }
 
 
 static void
 }
 
 
 static void

-do_download (void *cls,
-            const struct GNUNET_FS_Uri *uri)
+do_download (void *cls, const struct GNUNET_FS_Uri *uri)

 {
 {

-  GNUNET_assert (NULL != uri);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Downloading %llu bytes\n",
-             (unsigned long long) FILESIZE);
-  GNUNET_FS_TEST_download (sched,
-                          daemons[0],
-                          TIMEOUT,
-                          1, SEED, uri, 
-                          VERBOSE, 
-                          &do_stop, NULL);
+  if (NULL == uri)
+  {
+    GNUNET_FS_TEST_daemons_stop (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 (daemons[0], TIMEOUT, 1, SEED, uri, VERBOSE, &do_stop,
+                           NULL);

 }
 
 
 static void
 }
 
 
 static void

-do_publish (void *cls,
-           const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_publish (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)

 {
 {

-  GNUNET_assert (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE));
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Publishing %llu bytes\n",
-             (unsigned long long) FILESIZE);
-  GNUNET_FS_TEST_publish (sched,
-                         daemons[1],
-                         TIMEOUT,
-                         1, GNUNET_NO, FILESIZE, SEED, 
-                         VERBOSE, 
-                         &do_download, NULL);
+  cc = NULL;
+  if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE))
+  {
+    GNUNET_FS_TEST_daemons_stop (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 (daemons[1], TIMEOUT, 1, GNUNET_NO, FILESIZE, SEED,
+                          VERBOSE, &do_download, NULL);

 }
 
 
 static void
 }
 
 
 static void

-do_connect (void *cls,
-           const struct GNUNET_SCHEDULER_TaskContext *tc)
+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,
 {
   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],
-                                 TIMEOUT,
-                                 &do_publish,
-                                 NULL);  
+              "Daemons started, will now try to connect them\n");
+  cc = GNUNET_FS_TEST_daemons_connect (daemons[0], daemons[1], TIMEOUT,
+                                       &do_publish, NULL);

 }
 
 
 static void
 }
 
 
 static void

-run (void *cls,
-     struct GNUNET_SCHEDULER_Handle *s,
-     char *const *args,
-     const char *cfgfile,
+run (void *cls, char *const *args, const char *cfgfile,

      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {

-  sched = s;
-  GNUNET_FS_TEST_daemons_start (sched,
-                               TIMEOUT,
-                               NUM_DAEMONS,
-                               daemons,
-                               &do_connect,
-                               NULL);
+  GNUNET_FS_TEST_daemons_start ("fs_test_lib_data.conf", TIMEOUT, NUM_DAEMONS,
+                                daemons, &do_connect, NULL);

 }
 
 
 int
 main (int argc, char *argv[])
 {
 }
 
 
 int
 main (int argc, char *argv[])
 {

-  char *const argvx[] = { 
+  char *const argvx[] = {

     "test-gnunet-service-fs-p2p",
     "-c",
     "test-gnunet-service-fs-p2p",
     "-c",

-    "test_fs_lib_data.conf",
+    "fs_test_lib_data.conf",

 #if VERBOSE
     "-L", "DEBUG",
 #endif
 #if VERBOSE
     "-L", "DEBUG",
 #endif


@@ -145,18 +159,18 @@ main (int argc, char *argv[])
   };
 
   GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
   };
 
   GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");

-  GNUNET_log_setup ("test_gnunet_service_fs_p2p", 
+  GNUNET_log_setup ("test_gnunet_service_fs_p2p",

 #if VERBOSE
 #if VERBOSE

-                   "DEBUG",
+                    "DEBUG",

 #else
 #else

-                   "WARNING",
+                    "WARNING",

 #endif
 #endif

-                   NULL);
-  GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1,
-                      argvx, "test-gnunet-service-fs-p2p",
-                     "nohelp", options, &run, NULL);
+                    NULL);
+  GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1, argvx,
+                      "test-gnunet-service-fs-p2p", "nohelp", options, &run,
+                      NULL);

   GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
   GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");

-  return 0;
+  return ok;

 }
 
 /* end of test_gnunet_service_fs_p2p.c */
 }
 
 /* end of test_gnunet_service_fs_p2p.c */