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

gnunet-svn
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r14212 - gnunet/src/fs

From:	gnunet
Subject:	[GNUnet-SVN] r14212 - gnunet/src/fs
Date:	Thu, 20 Jan 2011 12:45:01 +0100
Author: grothoff
Date: 2011-01-20 12:45:01 +0100 (Thu, 20 Jan 2011)
New Revision: 14212

Modified:
   gnunet/src/fs/test_fs_download.c
   gnunet/src/fs/test_fs_download_indexed.c
   gnunet/src/fs/test_fs_download_persistence.c
   gnunet/src/fs/test_fs_list_indexed.c
   gnunet/src/fs/test_fs_publish.c
   gnunet/src/fs/test_fs_publish_persistence.c
   gnunet/src/fs/test_fs_search.c
   gnunet/src/fs/test_fs_search_persistence.c
   gnunet/src/fs/test_fs_unindex.c
   gnunet/src/fs/test_fs_unindex_persistence.c
Log:
abs_value

Modified: gnunet/src/fs/test_fs_download.c
===================================================================
--- gnunet/src/fs/test_fs_download.c    2011-01-20 10:56:54 UTC (rev 14211)
+++ gnunet/src/fs/test_fs_download.c    2011-01-20 11:45:01 UTC (rev 14212)
@@ -29,7 +29,7 @@
 #include "gnunet_arm_service.h"
 #include "gnunet_fs_service.h"
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_YES
 
 #define START_ARM GNUNET_YES
 
@@ -86,6 +86,8 @@
       GNUNET_FS_publish_stop (publish);
       publish = NULL;
     }
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+             "Timeout downloading file\n");
   timeout_kill = GNUNET_SCHEDULER_NO_TASK;
   err = 1;
 }
@@ -140,10 +142,10 @@
     case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
 #if VERBOSE
       printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n",
-              (unsigned long long) event->abs_value.publish.completed,
-              (unsigned long long) event->abs_value.publish.size,
-             event->abs_value.publish.specifics.progress.depth,
-             (unsigned long long) 
event->abs_value.publish.specifics.progress.offset);
+              (unsigned long long) event->value.publish.completed,
+              (unsigned long long) event->value.publish.size,
+             event->value.publish.specifics.progress.depth,
+             (unsigned long long) 
event->value.publish.specifics.progress.offset);
 #endif      
       break;
     case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
@@ -173,10 +175,10 @@
       GNUNET_assert (download == event->value.download.dc);
 #if VERBOSE
       printf ("Download is progressing (%llu/%llu at level %u off %llu)...\n",
-              (unsigned long long) event->abs_value.download.completed,
-              (unsigned long long) event->abs_value.download.size,
-             event->abs_value.download.specifics.progress.depth,
-             (unsigned long long) 
event->abs_value.download.specifics.progress.offset);
+              (unsigned long long) event->value.download.completed,
+              (unsigned long long) event->value.download.size,
+             event->value.download.specifics.progress.depth,
+             (unsigned long long) 
event->value.download.specifics.progress.offset);
 #endif
       break;
     case GNUNET_FS_STATUS_PUBLISH_ERROR:

Modified: gnunet/src/fs/test_fs_download_indexed.c
===================================================================
--- gnunet/src/fs/test_fs_download_indexed.c    2011-01-20 10:56:54 UTC (rev 
14211)
+++ gnunet/src/fs/test_fs_download_indexed.c    2011-01-20 11:45:01 UTC (rev 
14212)
@@ -142,10 +142,10 @@
     case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
 #if VERBOSE
       printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n",
-              (unsigned long long) event->abs_value.publish.completed,
-              (unsigned long long) event->abs_value.publish.size,
-             event->abs_value.publish.specifics.progress.depth,
-             (unsigned long long) 
event->abs_value.publish.specifics.progress.offset);
+              (unsigned long long) event->value.publish.completed,
+              (unsigned long long) event->value.publish.size,
+             event->value.publish.specifics.progress.depth,
+             (unsigned long long) 
event->value.publish.specifics.progress.offset);
 #endif      
       break;
     case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
@@ -175,10 +175,10 @@
       GNUNET_assert (download == event->value.download.dc);
 #if VERBOSE
       printf ("Download is progressing (%llu/%llu at level %u off %llu)...\n",
-              (unsigned long long) event->abs_value.download.completed,
-              (unsigned long long) event->abs_value.download.size,
-             event->abs_value.download.specifics.progress.depth,
-             (unsigned long long) 
event->abs_value.download.specifics.progress.offset);
+              (unsigned long long) event->value.download.completed,
+              (unsigned long long) event->value.download.size,
+             event->value.download.specifics.progress.depth,
+             (unsigned long long) 
event->value.download.specifics.progress.offset);
 #endif
       break;
     case GNUNET_FS_STATUS_PUBLISH_ERROR:

Modified: gnunet/src/fs/test_fs_download_persistence.c
===================================================================
--- gnunet/src/fs/test_fs_download_persistence.c        2011-01-20 10:56:54 UTC 
(rev 14211)
+++ gnunet/src/fs/test_fs_download_persistence.c        2011-01-20 11:45:01 UTC 
(rev 14212)
@@ -176,10 +176,10 @@
     case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
 #if VERBOSE
       printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n",
-              (unsigned long long) event->abs_value.publish.completed,
-              (unsigned long long) event->abs_value.publish.size,
-             event->abs_value.publish.specifics.progress.depth,
-             (unsigned long long) 
event->abs_value.publish.specifics.progress.offset);
+              (unsigned long long) event->value.publish.completed,
+              (unsigned long long) event->value.publish.size,
+             event->value.publish.specifics.progress.depth,
+             (unsigned long long) 
event->value.publish.specifics.progress.offset);
 #endif      
       break;
     case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
@@ -211,10 +211,10 @@
       GNUNET_assert (download == event->value.download.dc);
 #if VERBOSE
       printf ("Download is progressing (%llu/%llu at level %u off %llu)...\n",
-              (unsigned long long) event->abs_value.download.completed,
-              (unsigned long long) event->abs_value.download.size,
-             event->abs_value.download.specifics.progress.depth,
-             (unsigned long long) 
event->abs_value.download.specifics.progress.offset);
+              (unsigned long long) event->value.download.completed,
+              (unsigned long long) event->value.download.size,
+             event->value.download.specifics.progress.depth,
+             (unsigned long long) 
event->value.download.specifics.progress.offset);
 #endif
       break;
     case GNUNET_FS_STATUS_PUBLISH_ERROR:

Modified: gnunet/src/fs/test_fs_list_indexed.c
===================================================================
--- gnunet/src/fs/test_fs_list_indexed.c        2011-01-20 10:56:54 UTC (rev 
14211)
+++ gnunet/src/fs/test_fs_list_indexed.c        2011-01-20 11:45:01 UTC (rev 
14212)
@@ -125,10 +125,10 @@
       GNUNET_assert (publish == event->value.publish.pc);
 #if VERBOSE
       printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n",
-              (unsigned long long) event->abs_value.publish.completed,
-              (unsigned long long) event->abs_value.publish.size,
-             event->abs_value.publish.specifics.progress.depth,
-             (unsigned long long) 
event->abs_value.publish.specifics.progress.offset);
+              (unsigned long long) event->value.publish.completed,
+              (unsigned long long) event->value.publish.size,
+             event->value.publish.specifics.progress.depth,
+             (unsigned long long) 
event->value.publish.specifics.progress.offset);
 #endif
       break;
     case GNUNET_FS_STATUS_PUBLISH_ERROR:

Modified: gnunet/src/fs/test_fs_publish.c
===================================================================
--- gnunet/src/fs/test_fs_publish.c     2011-01-20 10:56:54 UTC (rev 14211)
+++ gnunet/src/fs/test_fs_publish.c     2011-01-20 11:45:01 UTC (rev 14212)
@@ -110,10 +110,10 @@
       GNUNET_assert (publish == event->value.publish.pc);
 #if VERBOSE
       printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n",
-              (unsigned long long) event->abs_value.publish.completed,
-              (unsigned long long) event->abs_value.publish.size,
-             event->abs_value.publish.specifics.progress.depth,
-             (unsigned long long) 
event->abs_value.publish.specifics.progress.offset);
+              (unsigned long long) event->value.publish.completed,
+              (unsigned long long) event->value.publish.size,
+             event->value.publish.specifics.progress.depth,
+             (unsigned long long) 
event->value.publish.specifics.progress.offset);
 #endif
       break;
     case GNUNET_FS_STATUS_PUBLISH_ERROR:

Modified: gnunet/src/fs/test_fs_publish_persistence.c
===================================================================
--- gnunet/src/fs/test_fs_publish_persistence.c 2011-01-20 10:56:54 UTC (rev 
14211)
+++ gnunet/src/fs/test_fs_publish_persistence.c 2011-01-20 11:45:01 UTC (rev 
14212)
@@ -157,10 +157,10 @@
       GNUNET_assert (publish == event->value.publish.pc);
 #if VERBOSE
       printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n",
-              (unsigned long long) event->abs_value.publish.completed,
-              (unsigned long long) event->abs_value.publish.size,
-             event->abs_value.publish.specifics.progress.depth,
-             (unsigned long long) 
event->abs_value.publish.specifics.progress.offset);
+              (unsigned long long) event->value.publish.completed,
+              (unsigned long long) event->value.publish.size,
+             event->value.publish.specifics.progress.depth,
+             (unsigned long long) 
event->value.publish.specifics.progress.offset);
 #endif
       break;
     case GNUNET_FS_STATUS_PUBLISH_SUSPEND:

Modified: gnunet/src/fs/test_fs_search.c
===================================================================
--- gnunet/src/fs/test_fs_search.c      2011-01-20 10:56:54 UTC (rev 14211)
+++ gnunet/src/fs/test_fs_search.c      2011-01-20 11:45:01 UTC (rev 14212)
@@ -101,10 +101,10 @@
     case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
 #if VERBOSE
       printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n",
-              (unsigned long long) event->abs_value.publish.completed,
-              (unsigned long long) event->abs_value.publish.size,
-             event->abs_value.publish.specifics.progress.depth,
-             (unsigned long long) 
event->abs_value.publish.specifics.progress.offset);
+              (unsigned long long) event->value.publish.completed,
+              (unsigned long long) event->value.publish.size,
+             event->value.publish.specifics.progress.depth,
+             (unsigned long long) 
event->value.publish.specifics.progress.offset);
 #endif      
       break;
     case GNUNET_FS_STATUS_PUBLISH_COMPLETED:

Modified: gnunet/src/fs/test_fs_search_persistence.c
===================================================================
--- gnunet/src/fs/test_fs_search_persistence.c  2011-01-20 10:56:54 UTC (rev 
14211)
+++ gnunet/src/fs/test_fs_search_persistence.c  2011-01-20 11:45:01 UTC (rev 
14212)
@@ -146,10 +146,10 @@
     case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
 #if VERBOSE
       printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n",
-              (unsigned long long) event->abs_value.publish.completed,
-              (unsigned long long) event->abs_value.publish.size,
-             event->abs_value.publish.specifics.progress.depth,
-             (unsigned long long) 
event->abs_value.publish.specifics.progress.offset);
+              (unsigned long long) event->value.publish.completed,
+              (unsigned long long) event->value.publish.size,
+             event->value.publish.specifics.progress.depth,
+             (unsigned long long) 
event->value.publish.specifics.progress.offset);
 #endif      
       break;
     case GNUNET_FS_STATUS_PUBLISH_COMPLETED:

Modified: gnunet/src/fs/test_fs_unindex.c
===================================================================
--- gnunet/src/fs/test_fs_unindex.c     2011-01-20 10:56:54 UTC (rev 14211)
+++ gnunet/src/fs/test_fs_unindex.c     2011-01-20 11:45:01 UTC (rev 14212)
@@ -100,10 +100,10 @@
     case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
 #if VERBOSE
       printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n",
-              (unsigned long long) event->abs_value.publish.completed,
-              (unsigned long long) event->abs_value.publish.size,
-             event->abs_value.publish.specifics.progress.depth,
-             (unsigned long long) 
event->abs_value.publish.specifics.progress.offset);
+              (unsigned long long) event->value.publish.completed,
+              (unsigned long long) event->value.publish.size,
+             event->value.publish.specifics.progress.depth,
+             (unsigned long long) 
event->value.publish.specifics.progress.offset);
 #endif      
       break;
     case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
@@ -126,10 +126,10 @@
       GNUNET_assert (unindex == event->value.unindex.uc);
 #if VERBOSE
       printf ("Unindex is progressing (%llu/%llu at level %u off %llu)...\n",
-              (unsigned long long) event->abs_value.unindex.completed,
-              (unsigned long long) event->abs_value.unindex.size,
-             event->abs_value.unindex.specifics.progress.depth,
-             (unsigned long long) 
event->abs_value.unindex.specifics.progress.offset);
+              (unsigned long long) event->value.unindex.completed,
+              (unsigned long long) event->value.unindex.size,
+             event->value.unindex.specifics.progress.depth,
+             (unsigned long long) 
event->value.unindex.specifics.progress.offset);
 #endif
       break;
     case GNUNET_FS_STATUS_PUBLISH_ERROR:

Modified: gnunet/src/fs/test_fs_unindex_persistence.c
===================================================================
--- gnunet/src/fs/test_fs_unindex_persistence.c 2011-01-20 10:56:54 UTC (rev 
14211)
+++ gnunet/src/fs/test_fs_unindex_persistence.c 2011-01-20 11:45:01 UTC (rev 
14212)
@@ -147,10 +147,10 @@
     case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
 #if VERBOSE
       printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n",
-              (unsigned long long) event->abs_value.publish.completed,
-              (unsigned long long) event->abs_value.publish.size,
-             event->abs_value.publish.specifics.progress.depth,
-             (unsigned long long) 
event->abs_value.publish.specifics.progress.offset);
+              (unsigned long long) event->value.publish.completed,
+              (unsigned long long) event->value.publish.size,
+             event->value.publish.specifics.progress.depth,
+             (unsigned long long) 
event->value.publish.specifics.progress.offset);
 #endif      
       break;
     case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
@@ -174,10 +174,10 @@
       GNUNET_assert (unindex == event->value.unindex.uc);
 #if VERBOSE
       printf ("Unindex is progressing (%llu/%llu at level %u off %llu)...\n",
-              (unsigned long long) event->abs_value.unindex.completed,
-              (unsigned long long) event->abs_value.unindex.size,
-             event->abs_value.unindex.specifics.progress.depth,
-             (unsigned long long) 
event->abs_value.unindex.specifics.progress.offset);
+              (unsigned long long) event->value.unindex.completed,
+              (unsigned long long) event->value.unindex.size,
+             event->value.unindex.specifics.progress.depth,
+             (unsigned long long) 
event->value.unindex.specifics.progress.offset);
 #endif
       break;
     case GNUNET_FS_STATUS_PUBLISH_SUSPEND:
[Prev in Thread]
Current Thread
[Next in Thread]
[GNUnet-SVN] r14212 - gnunet/src/fs, gnunet <=
Prev by Date: [GNUnet-SVN] r14211 - libmicrohttpd/src/daemon
Next by Date: [GNUnet-SVN] r14213 - gnunet/src/fs
Previous by thread: [GNUnet-SVN] r14211 - libmicrohttpd/src/daemon
Next by thread: [GNUnet-SVN] r14213 - gnunet/src/fs
Index(es):
- Date
- Thread