diff options
-rw-r--r-- | src/fs/test_fs_download.c | 20 | ||||
-rw-r--r-- | src/fs/test_fs_download_indexed.c | 16 | ||||
-rw-r--r-- | src/fs/test_fs_download_persistence.c | 16 | ||||
-rw-r--r-- | src/fs/test_fs_list_indexed.c | 8 | ||||
-rw-r--r-- | src/fs/test_fs_publish.c | 8 | ||||
-rw-r--r-- | src/fs/test_fs_publish_persistence.c | 8 | ||||
-rw-r--r-- | src/fs/test_fs_search.c | 8 | ||||
-rw-r--r-- | src/fs/test_fs_search_persistence.c | 8 | ||||
-rw-r--r-- | src/fs/test_fs_unindex.c | 16 | ||||
-rw-r--r-- | src/fs/test_fs_unindex_persistence.c | 16 |
10 files changed, 63 insertions, 61 deletions
diff --git a/src/fs/test_fs_download.c b/src/fs/test_fs_download.c index a06054f6d..0d13b3639 100644 --- a/src/fs/test_fs_download.c +++ b/src/fs/test_fs_download.c | |||
@@ -29,7 +29,7 @@ | |||
29 | #include "gnunet_arm_service.h" | 29 | #include "gnunet_arm_service.h" |
30 | #include "gnunet_fs_service.h" | 30 | #include "gnunet_fs_service.h" |
31 | 31 | ||
32 | #define VERBOSE GNUNET_NO | 32 | #define VERBOSE GNUNET_YES |
33 | 33 | ||
34 | #define START_ARM GNUNET_YES | 34 | #define START_ARM GNUNET_YES |
35 | 35 | ||
@@ -86,6 +86,8 @@ timeout_kill_task (void *cls, | |||
86 | GNUNET_FS_publish_stop (publish); | 86 | GNUNET_FS_publish_stop (publish); |
87 | publish = NULL; | 87 | publish = NULL; |
88 | } | 88 | } |
89 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
90 | "Timeout downloading file\n"); | ||
89 | timeout_kill = GNUNET_SCHEDULER_NO_TASK; | 91 | timeout_kill = GNUNET_SCHEDULER_NO_TASK; |
90 | err = 1; | 92 | err = 1; |
91 | } | 93 | } |
@@ -140,10 +142,10 @@ progress_cb (void *cls, | |||
140 | case GNUNET_FS_STATUS_PUBLISH_PROGRESS: | 142 | case GNUNET_FS_STATUS_PUBLISH_PROGRESS: |
141 | #if VERBOSE | 143 | #if VERBOSE |
142 | printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n", | 144 | printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n", |
143 | (unsigned long long) event->abs_value.publish.completed, | 145 | (unsigned long long) event->value.publish.completed, |
144 | (unsigned long long) event->abs_value.publish.size, | 146 | (unsigned long long) event->value.publish.size, |
145 | event->abs_value.publish.specifics.progress.depth, | 147 | event->value.publish.specifics.progress.depth, |
146 | (unsigned long long) event->abs_value.publish.specifics.progress.offset); | 148 | (unsigned long long) event->value.publish.specifics.progress.offset); |
147 | #endif | 149 | #endif |
148 | break; | 150 | break; |
149 | case GNUNET_FS_STATUS_PUBLISH_COMPLETED: | 151 | case GNUNET_FS_STATUS_PUBLISH_COMPLETED: |
@@ -173,10 +175,10 @@ progress_cb (void *cls, | |||
173 | GNUNET_assert (download == event->value.download.dc); | 175 | GNUNET_assert (download == event->value.download.dc); |
174 | #if VERBOSE | 176 | #if VERBOSE |
175 | printf ("Download is progressing (%llu/%llu at level %u off %llu)...\n", | 177 | printf ("Download is progressing (%llu/%llu at level %u off %llu)...\n", |
176 | (unsigned long long) event->abs_value.download.completed, | 178 | (unsigned long long) event->value.download.completed, |
177 | (unsigned long long) event->abs_value.download.size, | 179 | (unsigned long long) event->value.download.size, |
178 | event->abs_value.download.specifics.progress.depth, | 180 | event->value.download.specifics.progress.depth, |
179 | (unsigned long long) event->abs_value.download.specifics.progress.offset); | 181 | (unsigned long long) event->value.download.specifics.progress.offset); |
180 | #endif | 182 | #endif |
181 | break; | 183 | break; |
182 | case GNUNET_FS_STATUS_PUBLISH_ERROR: | 184 | case GNUNET_FS_STATUS_PUBLISH_ERROR: |
diff --git a/src/fs/test_fs_download_indexed.c b/src/fs/test_fs_download_indexed.c index 6d1465cd1..1a88ad80e 100644 --- a/src/fs/test_fs_download_indexed.c +++ b/src/fs/test_fs_download_indexed.c | |||
@@ -142,10 +142,10 @@ progress_cb (void *cls, | |||
142 | case GNUNET_FS_STATUS_PUBLISH_PROGRESS: | 142 | case GNUNET_FS_STATUS_PUBLISH_PROGRESS: |
143 | #if VERBOSE | 143 | #if VERBOSE |
144 | printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n", | 144 | printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n", |
145 | (unsigned long long) event->abs_value.publish.completed, | 145 | (unsigned long long) event->value.publish.completed, |
146 | (unsigned long long) event->abs_value.publish.size, | 146 | (unsigned long long) event->value.publish.size, |
147 | event->abs_value.publish.specifics.progress.depth, | 147 | event->value.publish.specifics.progress.depth, |
148 | (unsigned long long) event->abs_value.publish.specifics.progress.offset); | 148 | (unsigned long long) event->value.publish.specifics.progress.offset); |
149 | #endif | 149 | #endif |
150 | break; | 150 | break; |
151 | case GNUNET_FS_STATUS_PUBLISH_COMPLETED: | 151 | case GNUNET_FS_STATUS_PUBLISH_COMPLETED: |
@@ -175,10 +175,10 @@ progress_cb (void *cls, | |||
175 | GNUNET_assert (download == event->value.download.dc); | 175 | GNUNET_assert (download == event->value.download.dc); |
176 | #if VERBOSE | 176 | #if VERBOSE |
177 | printf ("Download is progressing (%llu/%llu at level %u off %llu)...\n", | 177 | printf ("Download is progressing (%llu/%llu at level %u off %llu)...\n", |
178 | (unsigned long long) event->abs_value.download.completed, | 178 | (unsigned long long) event->value.download.completed, |
179 | (unsigned long long) event->abs_value.download.size, | 179 | (unsigned long long) event->value.download.size, |
180 | event->abs_value.download.specifics.progress.depth, | 180 | event->value.download.specifics.progress.depth, |
181 | (unsigned long long) event->abs_value.download.specifics.progress.offset); | 181 | (unsigned long long) event->value.download.specifics.progress.offset); |
182 | #endif | 182 | #endif |
183 | break; | 183 | break; |
184 | case GNUNET_FS_STATUS_PUBLISH_ERROR: | 184 | case GNUNET_FS_STATUS_PUBLISH_ERROR: |
diff --git a/src/fs/test_fs_download_persistence.c b/src/fs/test_fs_download_persistence.c index 66d1199ca..e00d5255d 100644 --- a/src/fs/test_fs_download_persistence.c +++ b/src/fs/test_fs_download_persistence.c | |||
@@ -176,10 +176,10 @@ progress_cb (void *cls, | |||
176 | case GNUNET_FS_STATUS_PUBLISH_PROGRESS: | 176 | case GNUNET_FS_STATUS_PUBLISH_PROGRESS: |
177 | #if VERBOSE | 177 | #if VERBOSE |
178 | printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n", | 178 | printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n", |
179 | (unsigned long long) event->abs_value.publish.completed, | 179 | (unsigned long long) event->value.publish.completed, |
180 | (unsigned long long) event->abs_value.publish.size, | 180 | (unsigned long long) event->value.publish.size, |
181 | event->abs_value.publish.specifics.progress.depth, | 181 | event->value.publish.specifics.progress.depth, |
182 | (unsigned long long) event->abs_value.publish.specifics.progress.offset); | 182 | (unsigned long long) event->value.publish.specifics.progress.offset); |
183 | #endif | 183 | #endif |
184 | break; | 184 | break; |
185 | case GNUNET_FS_STATUS_PUBLISH_COMPLETED: | 185 | case GNUNET_FS_STATUS_PUBLISH_COMPLETED: |
@@ -211,10 +211,10 @@ progress_cb (void *cls, | |||
211 | GNUNET_assert (download == event->value.download.dc); | 211 | GNUNET_assert (download == event->value.download.dc); |
212 | #if VERBOSE | 212 | #if VERBOSE |
213 | printf ("Download is progressing (%llu/%llu at level %u off %llu)...\n", | 213 | printf ("Download is progressing (%llu/%llu at level %u off %llu)...\n", |
214 | (unsigned long long) event->abs_value.download.completed, | 214 | (unsigned long long) event->value.download.completed, |
215 | (unsigned long long) event->abs_value.download.size, | 215 | (unsigned long long) event->value.download.size, |
216 | event->abs_value.download.specifics.progress.depth, | 216 | event->value.download.specifics.progress.depth, |
217 | (unsigned long long) event->abs_value.download.specifics.progress.offset); | 217 | (unsigned long long) event->value.download.specifics.progress.offset); |
218 | #endif | 218 | #endif |
219 | break; | 219 | break; |
220 | case GNUNET_FS_STATUS_PUBLISH_ERROR: | 220 | case GNUNET_FS_STATUS_PUBLISH_ERROR: |
diff --git a/src/fs/test_fs_list_indexed.c b/src/fs/test_fs_list_indexed.c index 206e58baf..ec3d6fecd 100644 --- a/src/fs/test_fs_list_indexed.c +++ b/src/fs/test_fs_list_indexed.c | |||
@@ -125,10 +125,10 @@ progress_cb (void *cls, | |||
125 | GNUNET_assert (publish == event->value.publish.pc); | 125 | GNUNET_assert (publish == event->value.publish.pc); |
126 | #if VERBOSE | 126 | #if VERBOSE |
127 | printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n", | 127 | printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n", |
128 | (unsigned long long) event->abs_value.publish.completed, | 128 | (unsigned long long) event->value.publish.completed, |
129 | (unsigned long long) event->abs_value.publish.size, | 129 | (unsigned long long) event->value.publish.size, |
130 | event->abs_value.publish.specifics.progress.depth, | 130 | event->value.publish.specifics.progress.depth, |
131 | (unsigned long long) event->abs_value.publish.specifics.progress.offset); | 131 | (unsigned long long) event->value.publish.specifics.progress.offset); |
132 | #endif | 132 | #endif |
133 | break; | 133 | break; |
134 | case GNUNET_FS_STATUS_PUBLISH_ERROR: | 134 | case GNUNET_FS_STATUS_PUBLISH_ERROR: |
diff --git a/src/fs/test_fs_publish.c b/src/fs/test_fs_publish.c index 327fa5a69..99d4b6710 100644 --- a/src/fs/test_fs_publish.c +++ b/src/fs/test_fs_publish.c | |||
@@ -110,10 +110,10 @@ progress_cb (void *cls, | |||
110 | GNUNET_assert (publish == event->value.publish.pc); | 110 | GNUNET_assert (publish == event->value.publish.pc); |
111 | #if VERBOSE | 111 | #if VERBOSE |
112 | printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n", | 112 | printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n", |
113 | (unsigned long long) event->abs_value.publish.completed, | 113 | (unsigned long long) event->value.publish.completed, |
114 | (unsigned long long) event->abs_value.publish.size, | 114 | (unsigned long long) event->value.publish.size, |
115 | event->abs_value.publish.specifics.progress.depth, | 115 | event->value.publish.specifics.progress.depth, |
116 | (unsigned long long) event->abs_value.publish.specifics.progress.offset); | 116 | (unsigned long long) event->value.publish.specifics.progress.offset); |
117 | #endif | 117 | #endif |
118 | break; | 118 | break; |
119 | case GNUNET_FS_STATUS_PUBLISH_ERROR: | 119 | case GNUNET_FS_STATUS_PUBLISH_ERROR: |
diff --git a/src/fs/test_fs_publish_persistence.c b/src/fs/test_fs_publish_persistence.c index 52b2b270e..4a84bf9dc 100644 --- a/src/fs/test_fs_publish_persistence.c +++ b/src/fs/test_fs_publish_persistence.c | |||
@@ -157,10 +157,10 @@ progress_cb (void *cls, | |||
157 | GNUNET_assert (publish == event->value.publish.pc); | 157 | GNUNET_assert (publish == event->value.publish.pc); |
158 | #if VERBOSE | 158 | #if VERBOSE |
159 | printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n", | 159 | printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n", |
160 | (unsigned long long) event->abs_value.publish.completed, | 160 | (unsigned long long) event->value.publish.completed, |
161 | (unsigned long long) event->abs_value.publish.size, | 161 | (unsigned long long) event->value.publish.size, |
162 | event->abs_value.publish.specifics.progress.depth, | 162 | event->value.publish.specifics.progress.depth, |
163 | (unsigned long long) event->abs_value.publish.specifics.progress.offset); | 163 | (unsigned long long) event->value.publish.specifics.progress.offset); |
164 | #endif | 164 | #endif |
165 | break; | 165 | break; |
166 | case GNUNET_FS_STATUS_PUBLISH_SUSPEND: | 166 | case GNUNET_FS_STATUS_PUBLISH_SUSPEND: |
diff --git a/src/fs/test_fs_search.c b/src/fs/test_fs_search.c index b003b75e1..2544b8a6e 100644 --- a/src/fs/test_fs_search.c +++ b/src/fs/test_fs_search.c | |||
@@ -101,10 +101,10 @@ progress_cb (void *cls, | |||
101 | case GNUNET_FS_STATUS_PUBLISH_PROGRESS: | 101 | case GNUNET_FS_STATUS_PUBLISH_PROGRESS: |
102 | #if VERBOSE | 102 | #if VERBOSE |
103 | printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n", | 103 | printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n", |
104 | (unsigned long long) event->abs_value.publish.completed, | 104 | (unsigned long long) event->value.publish.completed, |
105 | (unsigned long long) event->abs_value.publish.size, | 105 | (unsigned long long) event->value.publish.size, |
106 | event->abs_value.publish.specifics.progress.depth, | 106 | event->value.publish.specifics.progress.depth, |
107 | (unsigned long long) event->abs_value.publish.specifics.progress.offset); | 107 | (unsigned long long) event->value.publish.specifics.progress.offset); |
108 | #endif | 108 | #endif |
109 | break; | 109 | break; |
110 | case GNUNET_FS_STATUS_PUBLISH_COMPLETED: | 110 | case GNUNET_FS_STATUS_PUBLISH_COMPLETED: |
diff --git a/src/fs/test_fs_search_persistence.c b/src/fs/test_fs_search_persistence.c index 4def3fe6a..e2a213cd8 100644 --- a/src/fs/test_fs_search_persistence.c +++ b/src/fs/test_fs_search_persistence.c | |||
@@ -146,10 +146,10 @@ progress_cb (void *cls, | |||
146 | case GNUNET_FS_STATUS_PUBLISH_PROGRESS: | 146 | case GNUNET_FS_STATUS_PUBLISH_PROGRESS: |
147 | #if VERBOSE | 147 | #if VERBOSE |
148 | printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n", | 148 | printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n", |
149 | (unsigned long long) event->abs_value.publish.completed, | 149 | (unsigned long long) event->value.publish.completed, |
150 | (unsigned long long) event->abs_value.publish.size, | 150 | (unsigned long long) event->value.publish.size, |
151 | event->abs_value.publish.specifics.progress.depth, | 151 | event->value.publish.specifics.progress.depth, |
152 | (unsigned long long) event->abs_value.publish.specifics.progress.offset); | 152 | (unsigned long long) event->value.publish.specifics.progress.offset); |
153 | #endif | 153 | #endif |
154 | break; | 154 | break; |
155 | case GNUNET_FS_STATUS_PUBLISH_COMPLETED: | 155 | case GNUNET_FS_STATUS_PUBLISH_COMPLETED: |
diff --git a/src/fs/test_fs_unindex.c b/src/fs/test_fs_unindex.c index e2c0e86ee..82d4cdcf7 100644 --- a/src/fs/test_fs_unindex.c +++ b/src/fs/test_fs_unindex.c | |||
@@ -100,10 +100,10 @@ progress_cb (void *cls, | |||
100 | case GNUNET_FS_STATUS_PUBLISH_PROGRESS: | 100 | case GNUNET_FS_STATUS_PUBLISH_PROGRESS: |
101 | #if VERBOSE | 101 | #if VERBOSE |
102 | printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n", | 102 | printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n", |
103 | (unsigned long long) event->abs_value.publish.completed, | 103 | (unsigned long long) event->value.publish.completed, |
104 | (unsigned long long) event->abs_value.publish.size, | 104 | (unsigned long long) event->value.publish.size, |
105 | event->abs_value.publish.specifics.progress.depth, | 105 | event->value.publish.specifics.progress.depth, |
106 | (unsigned long long) event->abs_value.publish.specifics.progress.offset); | 106 | (unsigned long long) event->value.publish.specifics.progress.offset); |
107 | #endif | 107 | #endif |
108 | break; | 108 | break; |
109 | case GNUNET_FS_STATUS_PUBLISH_COMPLETED: | 109 | case GNUNET_FS_STATUS_PUBLISH_COMPLETED: |
@@ -126,10 +126,10 @@ progress_cb (void *cls, | |||
126 | GNUNET_assert (unindex == event->value.unindex.uc); | 126 | GNUNET_assert (unindex == event->value.unindex.uc); |
127 | #if VERBOSE | 127 | #if VERBOSE |
128 | printf ("Unindex is progressing (%llu/%llu at level %u off %llu)...\n", | 128 | printf ("Unindex is progressing (%llu/%llu at level %u off %llu)...\n", |
129 | (unsigned long long) event->abs_value.unindex.completed, | 129 | (unsigned long long) event->value.unindex.completed, |
130 | (unsigned long long) event->abs_value.unindex.size, | 130 | (unsigned long long) event->value.unindex.size, |
131 | event->abs_value.unindex.specifics.progress.depth, | 131 | event->value.unindex.specifics.progress.depth, |
132 | (unsigned long long) event->abs_value.unindex.specifics.progress.offset); | 132 | (unsigned long long) event->value.unindex.specifics.progress.offset); |
133 | #endif | 133 | #endif |
134 | break; | 134 | break; |
135 | case GNUNET_FS_STATUS_PUBLISH_ERROR: | 135 | case GNUNET_FS_STATUS_PUBLISH_ERROR: |
diff --git a/src/fs/test_fs_unindex_persistence.c b/src/fs/test_fs_unindex_persistence.c index eec181544..162dd59af 100644 --- a/src/fs/test_fs_unindex_persistence.c +++ b/src/fs/test_fs_unindex_persistence.c | |||
@@ -147,10 +147,10 @@ progress_cb (void *cls, | |||
147 | case GNUNET_FS_STATUS_PUBLISH_PROGRESS: | 147 | case GNUNET_FS_STATUS_PUBLISH_PROGRESS: |
148 | #if VERBOSE | 148 | #if VERBOSE |
149 | printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n", | 149 | printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n", |
150 | (unsigned long long) event->abs_value.publish.completed, | 150 | (unsigned long long) event->value.publish.completed, |
151 | (unsigned long long) event->abs_value.publish.size, | 151 | (unsigned long long) event->value.publish.size, |
152 | event->abs_value.publish.specifics.progress.depth, | 152 | event->value.publish.specifics.progress.depth, |
153 | (unsigned long long) event->abs_value.publish.specifics.progress.offset); | 153 | (unsigned long long) event->value.publish.specifics.progress.offset); |
154 | #endif | 154 | #endif |
155 | break; | 155 | break; |
156 | case GNUNET_FS_STATUS_PUBLISH_COMPLETED: | 156 | case GNUNET_FS_STATUS_PUBLISH_COMPLETED: |
@@ -174,10 +174,10 @@ progress_cb (void *cls, | |||
174 | GNUNET_assert (unindex == event->value.unindex.uc); | 174 | GNUNET_assert (unindex == event->value.unindex.uc); |
175 | #if VERBOSE | 175 | #if VERBOSE |
176 | printf ("Unindex is progressing (%llu/%llu at level %u off %llu)...\n", | 176 | printf ("Unindex is progressing (%llu/%llu at level %u off %llu)...\n", |
177 | (unsigned long long) event->abs_value.unindex.completed, | 177 | (unsigned long long) event->value.unindex.completed, |
178 | (unsigned long long) event->abs_value.unindex.size, | 178 | (unsigned long long) event->value.unindex.size, |
179 | event->abs_value.unindex.specifics.progress.depth, | 179 | event->value.unindex.specifics.progress.depth, |
180 | (unsigned long long) event->abs_value.unindex.specifics.progress.offset); | 180 | (unsigned long long) event->value.unindex.specifics.progress.offset); |
181 | #endif | 181 | #endif |
182 | break; | 182 | break; |
183 | case GNUNET_FS_STATUS_PUBLISH_SUSPEND: | 183 | case GNUNET_FS_STATUS_PUBLISH_SUSPEND: |