[GNUnet-SVN] r10550 - gnunet/src/fs

[gnunet]

Author: grothoff
Date: 2010-03-11 14:36:21 +0100 (Thu, 11 Mar 2010)
New Revision: 10550

Modified:
   gnunet/src/fs/fs_download.c
   gnunet/src/fs/gnunet-download.c
   gnunet/src/fs/gnunet-service-fs.c
   gnunet/src/fs/gnunet-service-fs_indexing.c
Log:
fix progress reporting

Modified: gnunet/src/fs/fs_download.c
===================================================================
--- gnunet/src/fs/fs_download.c 2010-03-11 13:33:48 UTC (rev 10549)
+++ gnunet/src/fs/fs_download.c 2010-03-11 13:36:21 UTC (rev 10550)
@@ -36,7 +36,7 @@
 #include "fs.h"
 #include "fs_tree.h"
 
-#define DEBUG_DOWNLOAD GNUNET_YES
+#define DEBUG_DOWNLOAD GNUNET_NO
 
 /**
  * We're storing the IBLOCKS after the
@@ -152,6 +152,10 @@
     = dc->completed;
   pi->value.download.anonymity
     = dc->anonymity;
+  pi->value.download.eta
+    = GNUNET_TIME_calculate_eta (dc->start_time,
+                                dc->completed,
+                                dc->length);
 }
 
 /**
@@ -851,6 +855,7 @@
   dc->uri = GNUNET_FS_uri_dup (uri);
   dc->meta = GNUNET_CONTAINER_meta_data_duplicate (meta);
   dc->client_info = cctx;
+  dc->start_time = GNUNET_TIME_absolute_get ();
   if (NULL != filename)
     {
       dc->filename = GNUNET_strdup (filename);

Modified: gnunet/src/fs/gnunet-download.c
===================================================================
--- gnunet/src/fs/gnunet-download.c     2010-03-11 13:33:48 UTC (rev 10549)
+++ gnunet/src/fs/gnunet-download.c     2010-03-11 13:36:21 UTC (rev 10550)
@@ -100,9 +100,9 @@
       break;
     case GNUNET_FS_STATUS_DOWNLOAD_PROGRESS:
       if (verbose)
-       {
+       {         
          s = GNUNET_STRINGS_relative_time_to_string(info->value.download.eta);
-         t = GNUNET_STRINGS_byte_size_fancy(info->value.download.completed * 
1000 / (info->value.download.duration.value + 1));
+         t = GNUNET_STRINGS_byte_size_fancy(info->value.download.completed * 
1000LL / (info->value.download.duration.value + 1));
          fprintf (stdout,
                   _("Downloading `%s' at %llu/%llu (%s remaining, %s/s)\n"),
                   info->value.download.filename,

Modified: gnunet/src/fs/gnunet-service-fs.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs.c   2010-03-11 13:33:48 UTC (rev 10549)
+++ gnunet/src/fs/gnunet-service-fs.c   2010-03-11 13:36:21 UTC (rev 10550)
@@ -44,7 +44,7 @@
 #include "gnunet-service-fs_indexing.h"
 #include "fs.h"
 
-#define DEBUG_FS GNUNET_YES
+#define DEBUG_FS GNUNET_NO
 
 /**
  * Maximum number of outgoing messages we queue per peer.

Modified: gnunet/src/fs/gnunet-service-fs_indexing.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_indexing.c  2010-03-11 13:33:48 UTC (rev 
10549)
+++ gnunet/src/fs/gnunet-service-fs_indexing.c  2010-03-11 13:36:21 UTC (rev 
10550)
@@ -248,7 +248,7 @@
                                         
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY))
     {
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                 _("Index request received for file `%s' is indexed as `%s'.  
Permitting anyway.\n"),
+                 _("Index request received for file `%s' is already indexed as 
`%s'.  Permitting anyway.\n"),
                  ii->filename,
                  (const char*) GNUNET_CONTAINER_multihashmap_get (ifm,
                                                                   
&ii->file_id));