-use simpler, modern scheduler API

1 files changed, 19 insertions, 6 deletions

diff --git a/src/fs/test_fs_test_lib.c b/src/fs/test_fs_test_lib.c
index bc950ed75..3f802bfcf 100644
--- a/src/fs/test_fs_test_lib.c
+++ b/src/fs/test_fs_test_lib.c
@@ -44,22 +44,28 @@
 
 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)
 {
   char *fn = cls;
 
-  if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE))
+  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)
@@ -72,7 +78,8 @@ do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 
 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)
@@ -82,9 +89,15 @@ 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,
+  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));
 }