X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffs%2Ftest_fs_test_lib.c;h=3f802bfcf051e57f2fe864e3c0a25008395107a5;hb=9b6eafa38e02ace11cc6217efee78e95b82eb19e;hp=70e5977a64220c4014f0049fbcebc48ea6d24942;hpb=0a67f09f0ecd7d01c304bf22e56a63d479ba4e42;p=oweals%2Fgnunet.git

diff --git a/src/fs/test_fs_test_lib.c b/src/fs/test_fs_test_lib.c
index 70e5977a6..3f802bfcf 100644
--- a/src/fs/test_fs_test_lib.c
+++ b/src/fs/test_fs_test_lib.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2010, 2012 Christian Grothoff (and other contributing authors)
+     Copyright (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
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 
 /**
@@ -44,28 +44,43 @@
 
 static struct GNUNET_TESTBED_Peer *the_peers[NUM_DAEMONS];
 
+static struct GNUNET_TIME_Absolute start_time;
+
 static int ret;
 
 
 static void
-do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_stop (void *cls,
+         const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE))
+  char *fn = cls;
+
+  if (0 ==
+      GNUNET_TIME_absolute_get_remaining (GNUNET_TIME_absolute_add (start_time,
+                                                                    TIMEOUT)).rel_value_us)
   {
     GNUNET_break (0);
     ret = 1;
   }
   else
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Finished download, shutting down\n",
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Finished download, shutting down\n",
                 (unsigned long long) FILESIZE);
   }
+  if (NULL != fn)
+  {
+    GNUNET_DISK_directory_remove (fn);
+    GNUNET_free (fn);
+  }
   GNUNET_SCHEDULER_shutdown ();
 }
 
 
 static void
-do_download (void *cls, const struct GNUNET_FS_Uri *uri)
+do_download (void *cls,
+             const struct GNUNET_FS_Uri *uri,
+	     const char *fn)
 {
   if (NULL == uri)
   {
@@ -74,15 +89,21 @@ do_download (void *cls, const struct GNUNET_FS_Uri *uri)
     ret = 1;
     return;
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Downloading %llu bytes\n",
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Downloading %llu bytes\n",
               (unsigned long long) FILESIZE);
-  GNUNET_FS_TEST_download (the_peers[0], TIMEOUT, 1, SEED, uri, VERBOSE, &do_stop,
-                           NULL);
+  start_time = GNUNET_TIME_absolute_get ();
+  GNUNET_FS_TEST_download (the_peers[0],
+                           TIMEOUT, 1, SEED,
+                           uri,
+                           VERBOSE,
+                           &do_stop,
+                           (NULL == fn) ? NULL : GNUNET_strdup (fn));
 }
 
 
 static void
-do_publish (void *cls, 
+do_publish (void *cls,
 	    struct GNUNET_TESTBED_Operation *op,
 	    const char *emsg)
 {
@@ -105,18 +126,26 @@ do_publish (void *cls,
 
 /**
  * Actual main function for the test.
- * 
+ *
  * @param cls closure
+ * @param h the run handle
  * @param num_peers number of peers in 'peers'
  * @param peers handle to peers run in the testbed
+ * @param links_succeeded the number of overlay link connection attempts that
+ *          succeeded
+ * @param links_failed the number of overlay link connection attempts that
+ *          failed
  */
 static void
-run (void *cls, 
+run (void *cls,
+     struct GNUNET_TESTBED_RunHandle *h,
      unsigned int num_peers,
-     struct GNUNET_TESTBED_Peer **peers)
+     struct GNUNET_TESTBED_Peer **peers,
+     unsigned int links_succeeded,
+     unsigned int links_failed)
 {
   unsigned int i;
- 
+
   GNUNET_assert (NUM_DAEMONS == num_peers);
   for (i=0;i<num_peers;i++)
     the_peers[i] = peers[i];
@@ -131,7 +160,7 @@ run (void *cls,
 /**
  * Main function that initializes the testbed.
  *
- * @param argc ignored 
+ * @param argc ignored
  * @param argv ignored
  * @return 0 on success
  */
@@ -141,7 +170,7 @@ main (int argc, char *argv[])
   GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
   (void) GNUNET_TESTBED_test_run ("test_fs_test_lib",
                                   "fs_test_lib_data.conf",
-                                  NUM_DAEMONS, 
+                                  NUM_DAEMONS,
                                   0, NULL, NULL,
                                   &run, NULL);
   GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");