X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ffs%2Ftest_fs_download.c;h=d645444acdf2a86c8ffe5b2b0efc6939c2fc5fa7;hb=6da7b6a2dc5ec3645d5f8bdbd4ab77d6090b823f;hp=519923450321e0d944272c192d78c109690c9376;hpb=efe824206c806a535acb63d94acda5d406a3e359;p=oweals%2Fgnunet.git

diff --git a/src/fs/test_fs_download.c b/src/fs/test_fs_download.c
index 519923450..d645444ac 100644
--- a/src/fs/test_fs_download.c
+++ b/src/fs/test_fs_download.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2004, 2005, 2006, 2008, 2009, 2011, 2012 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2004, 2005, 2006, 2008, 2009, 2011, 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
@@ -57,7 +57,7 @@ static struct GNUNET_FS_DownloadContext *download;
 
 static struct GNUNET_FS_PublishContext *publish;
 
-static GNUNET_SCHEDULER_TaskIdentifier timeout_kill;
+static struct GNUNET_SCHEDULER_Task * timeout_kill;
 
 static char *fn;
 
@@ -80,7 +80,7 @@ timeout_kill_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     publish = NULL;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Timeout downloading file\n");
-  timeout_kill = GNUNET_SCHEDULER_NO_TASK;
+  timeout_kill = NULL;
   err = 1;
 }
 
@@ -120,7 +120,7 @@ abort_download_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   GNUNET_free (fn);
   fn = NULL;
   GNUNET_SCHEDULER_cancel (timeout_kill);
-  timeout_kill = GNUNET_SCHEDULER_NO_TASK;
+  timeout_kill = NULL;
 }
 
 
@@ -139,28 +139,30 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
 		(unsigned long long) event->value.publish.specifics.
 		progress.offset);
     break;
+  case GNUNET_FS_STATUS_PUBLISH_PROGRESS_DIRECTORY:
+    break;
   case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
     fprintf (stdout,
 	     "Publishing complete, %llu kb/s.\n",
-	     (unsigned long long) (FILESIZE * 1000LL /
+	     (unsigned long long) (FILESIZE * 1000000LL /
 				   (1 +
 				    GNUNET_TIME_absolute_get_duration
-				    (start).rel_value) / 1024LL));
-    GAUGER ("FS", 
-	    (GNUNET_YES == indexed) 
+				    (start).rel_value_us) / 1024LL));
+    GAUGER ("FS",
+	    (GNUNET_YES == indexed)
 	    ? "Publishing speed (indexing)"
 	     : "Publishing speed (insertion)",
-	    (unsigned long long) (FILESIZE * 1000LL /
+	    (unsigned long long) (FILESIZE * 1000000LL /
 				  (1 +
 				   GNUNET_TIME_absolute_get_duration
-				   (start).rel_value) / 1024LL), "kb/s");
+				   (start).rel_value_us) / 1024LL), "kb/s");
     fn = GNUNET_DISK_mktemp ("gnunet-download-test-dst");
     start = GNUNET_TIME_absolute_get ();
     download =
         GNUNET_FS_download_start (fs,
                                   event->value.publish.specifics.
                                   completed.chk_uri, NULL, fn, NULL, 0,
-                                  FILESIZE, anonymity_level, 
+                                  FILESIZE, anonymity_level,
 				  GNUNET_FS_DOWNLOAD_OPTION_NONE,
                                   "download", NULL);
     GNUNET_assert (download != NULL);
@@ -168,18 +170,18 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
   case GNUNET_FS_STATUS_DOWNLOAD_COMPLETED:
     fprintf (stdout,
 	     "Download complete,  %llu kb/s.\n",
-	     (unsigned long long) (FILESIZE * 1000LL /
+	     (unsigned long long) (FILESIZE * 1000000LL /
 				   (1 +
 				    GNUNET_TIME_absolute_get_duration
-				    (start).rel_value) / 1024LL));
+				    (start).rel_value_us) / 1024LL));
     GAUGER ("FS",
-	    (GNUNET_YES == indexed) 
-	    ? "Local download speed (indexed)"  
+	    (GNUNET_YES == indexed)
+	    ? "Local download speed (indexed)"
 	    : "Local download speed (inserted)",
-            (unsigned long long) (FILESIZE * 1000LL /
+            (unsigned long long) (FILESIZE * 1000000LL /
                                   (1 +
                                    GNUNET_TIME_absolute_get_duration
-                                   (start).rel_value) / 1024LL), "kb/s");
+                                   (start).rel_value_us) / 1024LL), "kb/s");
     GNUNET_SCHEDULER_add_now (&abort_download_task, NULL);
     break;
   case GNUNET_FS_STATUS_DOWNLOAD_PROGRESS:
@@ -198,11 +200,13 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
     GNUNET_break (0);
     GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL,
                                        GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+    GNUNET_SCHEDULER_shutdown ();
     break;
   case GNUNET_FS_STATUS_DOWNLOAD_ERROR:
     FPRINTF (stderr, "Error downloading file: %s\n",
              event->value.download.specifics.error.message);
     GNUNET_SCHEDULER_add_now (&abort_download_task, NULL);
+    GNUNET_SCHEDULER_shutdown ();
     break;
   case GNUNET_FS_STATUS_DOWNLOAD_ACTIVE:
   case GNUNET_FS_STATUS_DOWNLOAD_INACTIVE:
@@ -329,10 +333,10 @@ main (int argc, char *argv[])
     binary_name = "test-fs-download-indexed";
     config_name = "test_fs_download_indexed.conf";
   }
-  if (NULL != strstr (argv[0], "mesh"))
+  if (NULL != strstr (argv[0], "cadet"))
   {
-    binary_name = "test-fs-download-mesh";
-    config_name = "test_fs_download_mesh.conf";
+    binary_name = "test-fs-download-cadet";
+    config_name = "test_fs_download_cadet.conf";
   }
   if (0 != GNUNET_TESTING_peer_run (binary_name,
 				    config_name,