stuff

[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 410666deabb5c91029354991d19db93ab0596025..7e3e02c7626a9b1c4a020a6f41f7e98c5787e8bc 100644 (file)
--- a/src/fs/test_gnunet_service_fs_p2p.c
+++ b/src/fs/test_gnunet_service_fs_p2p.c
@@ -26,7 +26,7 @@
 #include "platform.h"
 #include "fs_test_lib.h"
 
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
 
 /**
  * File-size we use for testing.
@@ -48,16 +48,28 @@ 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)
 {
+  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);
@@ -75,10 +87,20 @@ 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[0],
                           TIMEOUT,
@@ -92,7 +114,16 @@ 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);