changing time measurement from milliseconds to microseconds
[oweals/gnunet.git] / src / fs / test_gnunet_service_fs_p2p.c
index 715d5b44273b2cbbc2dfc61bedfe165e52ca1a0a..63f5627c2409f8f97fefbbf9783329da07bf2479 100644 (file)
@@ -1,10 +1,10 @@
 /*
      This file is part of GNUnet.
-     (C) 2010 Christian Grothoff (and other contributing authors)
+     (C) 2010, 2012 Christian Grothoff (and other contributing authors)
 
      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
 #include "platform.h"
 #include "fs_test_lib.h"
 
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
 
 /**
  * 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 SEED 42
 
-static struct GNUNET_FS_TestDaemon *daemons[NUM_DAEMONS];
+static const char *progname;
 
-static struct GNUNET_SCHEDULER_Handle *sched;
+static unsigned int anonymity_level;
 
+static struct GNUNET_TESTBED_Peer *daemons[NUM_DAEMONS];
 
-static void
-do_stop (void *cls,
-        const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  GNUNET_FS_TEST_daemons_stop (sched,
-                              NUM_DAEMONS,
-                              daemons);
-  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);
-}
+static int ok;
 
-
-static void
-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);
-}
+static struct GNUNET_TIME_Absolute start_time;
 
 
 static void
-do_publish (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,
-             "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);
+  char *fn = cls;
+  struct GNUNET_TIME_Relative del;
+  char *fancy;
+
+  GNUNET_SCHEDULER_shutdown ();
+  if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT))
+  {
+    del = GNUNET_TIME_absolute_get_duration (start_time);
+    if (del.rel_value_us == 0)
+      del.rel_value_us = 1;
+    fancy =
+      GNUNET_STRINGS_byte_size_fancy (((unsigned long long) FILESIZE) *
+                                     1000000LL / del.rel_value_us);
+    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;
+  }
+  if (NULL != fn)
+  {
+    GNUNET_DISK_directory_remove (fn);
+    GNUNET_free (fn);
+  }
 }
 
 
 static void
-do_connect (void *cls,
-           const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_download (void *cls, const struct GNUNET_FS_Uri *uri,
+            const char *fn)
 {
-  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);  
+  if (NULL == uri)
+  {
+    GNUNET_SCHEDULER_shutdown ();
+    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, 
+                          anonymity_level, SEED, uri, 
+                          VERBOSE, &do_stop,
+                           (NULL == fn) 
+                          ? NULL
+                          : GNUNET_strdup (fn));
 }
 
 
 static void
-run (void *cls,
-     struct GNUNET_SCHEDULER_Handle *s,
-     char *const *args,
-     const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
+do_publish (void *cls,
+           unsigned int num_peers,
+           struct GNUNET_TESTBED_Peer **peers,
+            unsigned int links_succeeded,
+            unsigned int links_failed)
 {
-  sched = s;
-  GNUNET_FS_TEST_daemons_start (sched,
-                               TIMEOUT,
-                               NUM_DAEMONS,
-                               daemons,
-                               &do_connect,
-                               NULL);
+  unsigned int i;
+  if (NULL != strstr (progname, "mesh"))
+    anonymity_level = 0;
+  else
+    anonymity_level = 1;
+  GNUNET_assert (NUM_DAEMONS == num_peers);
+  for (i=0;i<num_peers;i++)
+    daemons[i] = peers[i];
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Publishing %llu bytes\n",
+              (unsigned long long) FILESIZE);
+  GNUNET_FS_TEST_publish (daemons[1], TIMEOUT, 
+                         anonymity_level, GNUNET_NO, 
+                         FILESIZE, SEED,
+                          VERBOSE, &do_download, NULL);
 }
 
 
 int
 main (int argc, char *argv[])
 {
-  char *const argvx[] = { 
-    "test-gnunet-service-fs-p2p",
-    "-c",
-    "fs_test_lib_data.conf",
-#if VERBOSE
-    "-L", "DEBUG",
-#endif
-    NULL
-  };
-  struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_END
-  };
-
-  GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
-  GNUNET_log_setup ("test_gnunet_service_fs_p2p", 
-#if VERBOSE
-                   "DEBUG",
-#else
-                   "WARNING",
-#endif
-                   NULL);
-  GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1,
-                      argvx, "test-gnunet-service-fs-p2p",
-                     "nohelp", options, &run, NULL);
+  const char *config;
+
+  progname = argv[0];
+  if (NULL != strstr (progname, "mesh"))
+    config = "test_gnunet_service_fs_p2p_mesh.conf";
+  else
+    config = "fs_test_lib_data.conf";
+  (void) GNUNET_TESTBED_test_run ("test-gnunet-service-fs-p2p",
+                                  config,
+                                  NUM_DAEMONS,
+                                  0, NULL, NULL,
+                                  &do_publish, NULL);
   GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
-  return 0;
+  return ok;
 }
 
 /* end of test_gnunet_service_fs_p2p.c */