diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-10-11 14:50:07 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-10-11 14:50:07 +0000 |
commit | cd67a970afe36e8a2aa99e48cbe103cc4cc26424 (patch) | |
tree | 67e5023676f2278485e35a2b71ce246b9933f406 /src/fs/fs_api.c | |
parent | 3dd666cbad61490c0de1cb891fd1b36c8536c348 (diff) | |
download | gnunet-cd67a970afe36e8a2aa99e48cbe103cc4cc26424.tar.gz gnunet-cd67a970afe36e8a2aa99e48cbe103cc4cc26424.zip |
generate progress events when publishing directories (towards fixing #2230)
Diffstat (limited to 'src/fs/fs_api.c')
-rw-r--r-- | src/fs/fs_api.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/fs/fs_api.c b/src/fs/fs_api.c index 688bdf282..f076b0991 100644 --- a/src/fs/fs_api.c +++ b/src/fs/fs_api.c | |||
@@ -284,7 +284,7 @@ process_job_queue (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
284 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 284 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
285 | "AD: %u, MP: %u; %d probes and %d downloads to start, will run again in %s\n", | 285 | "AD: %u, MP: %u; %d probes and %d downloads to start, will run again in %s\n", |
286 | h->active_downloads, | 286 | h->active_downloads, |
287 | h->max_parallel_requests, | 287 | h->max_parallel_requests, |
288 | num_probes_change, | 288 | num_probes_change, |
289 | num_downloads_change, | 289 | num_downloads_change, |
290 | GNUNET_STRINGS_relative_time_to_string (restart_at, GNUNET_YES)); | 290 | GNUNET_STRINGS_relative_time_to_string (restart_at, GNUNET_YES)); |
@@ -982,6 +982,8 @@ deserialize_fi_node (struct GNUNET_FS_Handle *h, const char *fn, | |||
982 | case 4: /* directory */ | 982 | case 4: /* directory */ |
983 | ret->is_directory = GNUNET_YES; | 983 | ret->is_directory = GNUNET_YES; |
984 | if ((GNUNET_OK != GNUNET_BIO_read_int32 (rh, &dsize)) || | 984 | if ((GNUNET_OK != GNUNET_BIO_read_int32 (rh, &dsize)) || |
985 | (GNUNET_OK != GNUNET_BIO_read_int64 (rh, &ret->data.dir.contents_completed)) || | ||
986 | (GNUNET_OK != GNUNET_BIO_read_int64 (rh, &ret->data.dir.contents_size)) || | ||
985 | (NULL == (ret->data.dir.dir_data = GNUNET_malloc_large (dsize))) || | 987 | (NULL == (ret->data.dir.dir_data = GNUNET_malloc_large (dsize))) || |
986 | (GNUNET_OK != | 988 | (GNUNET_OK != |
987 | GNUNET_BIO_read (rh, "dir-data", ret->data.dir.dir_data, dsize)) || | 989 | GNUNET_BIO_read (rh, "dir-data", ret->data.dir.dir_data, dsize)) || |
@@ -1335,6 +1337,8 @@ GNUNET_FS_file_information_sync_ (struct GNUNET_FS_FileInformation *fi) | |||
1335 | (NULL == fi->data.dir.entries->serialization) ) | 1337 | (NULL == fi->data.dir.entries->serialization) ) |
1336 | GNUNET_FS_file_information_sync_ (fi->data.dir.entries); | 1338 | GNUNET_FS_file_information_sync_ (fi->data.dir.entries); |
1337 | if ((GNUNET_OK != GNUNET_BIO_write_int32 (wh, fi->data.dir.dir_size)) || | 1339 | if ((GNUNET_OK != GNUNET_BIO_write_int32 (wh, fi->data.dir.dir_size)) || |
1340 | (GNUNET_OK != GNUNET_BIO_write_int64 (wh, fi->data.dir.contents_completed)) || | ||
1341 | (GNUNET_OK != GNUNET_BIO_write_int64 (wh, fi->data.dir.contents_size)) || | ||
1338 | (GNUNET_OK != | 1342 | (GNUNET_OK != |
1339 | GNUNET_BIO_write (wh, fi->data.dir.dir_data, | 1343 | GNUNET_BIO_write (wh, fi->data.dir.dir_data, |
1340 | (uint32_t) fi->data.dir.dir_size)) || | 1344 | (uint32_t) fi->data.dir.dir_size)) || |