X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ffs%2Ffs_api.c;h=f539c7910f1f5f7c220ef82fd0e223c766b132bc;hb=ed51bc86aad5044b88ce4fc3641cc920c8186863;hp=5b4bfa0207e1429b6f96940f8e484f4c2e3df62e;hpb=4e7a535cc04df4eef21dc1db39d782a3365e9df1;p=oweals%2Fgnunet.git diff --git a/src/fs/fs_api.c b/src/fs/fs_api.c index 5b4bfa020..f539c7910 100644 --- a/src/fs/fs_api.c +++ b/src/fs/fs_api.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - (C) 2001--2012 Christian Grothoff (and other contributing authors) + Copyright (C) 2001--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 @@ -61,9 +61,17 @@ start_job (struct GNUNET_FS_QueueEntry *qe) qe->h->active_blocks += qe->blocks; qe->h->active_downloads++; qe->start_time = GNUNET_TIME_absolute_get (); - GNUNET_CONTAINER_DLL_remove (qe->h->pending_head, qe->h->pending_tail, qe); - GNUNET_CONTAINER_DLL_insert_after (qe->h->running_head, qe->h->running_tail, - qe->h->running_tail, qe); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Starting job %p (%u active)\n", + qe, + qe->h->active_downloads); + GNUNET_CONTAINER_DLL_remove (qe->h->pending_head, + qe->h->pending_tail, + qe); + GNUNET_CONTAINER_DLL_insert_after (qe->h->running_head, + qe->h->running_tail, + qe->h->running_tail, + qe); } @@ -85,6 +93,10 @@ stop_job (struct GNUNET_FS_QueueEntry *qe) GNUNET_TIME_relative_add (qe->run_time, GNUNET_TIME_absolute_get_duration (qe->start_time)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Stopping job %p (%u active)\n", + qe, + qe->h->active_downloads); GNUNET_CONTAINER_DLL_remove (qe->h->running_head, qe->h->running_tail, qe); GNUNET_CONTAINER_DLL_insert_after (qe->h->pending_head, qe->h->pending_tail, qe->h->pending_tail, qe); @@ -95,11 +107,12 @@ stop_job (struct GNUNET_FS_QueueEntry *qe) * Process the jobs in the job queue, possibly starting some * and stopping others. * - * @param cls the 'struct GNUNET_FS_Handle' + * @param cls the `struct GNUNET_FS_Handle *` * @param tc scheduler context */ static void -process_job_queue (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +process_job_queue (void *cls, + const struct GNUNET_SCHEDULER_TaskContext *tc) { struct GNUNET_FS_Handle *h = cls; struct GNUNET_FS_QueueEntry *qe; @@ -118,7 +131,7 @@ process_job_queue (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) int num_downloads_change; int block_limit_hit; - h->queue_job = GNUNET_SCHEDULER_NO_TASK; + h->queue_job = NULL; /* restart_at will be set to the time when it makes sense to re-evaluate the job queue (unless, of course, jobs complete or are added, then we'll be triggered immediately */ @@ -146,41 +159,51 @@ process_job_queue (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) num_probes_expired = 0; num_downloads_active = 0; num_downloads_expired = 0; - for (qe = h->running_head; NULL != qe; qe = qe->next) + next = h->running_head; + while (NULL != (qe = next)) { - run_time = - GNUNET_TIME_relative_multiply (h->avg_block_latency, - qe->blocks * qe->start_times); + next = qe->next; switch (qe->priority) { case GNUNET_FS_QUEUE_PRIORITY_PROBE: - num_probes_active++; - /* run probes for at most 1s * number-of-restarts; note that - as the total runtime of a probe is limited to 2m, we don't - need to additionally limit the total time of a probe to - strictly limit its lifetime. */ - run_time = GNUNET_TIME_relative_min (run_time, - GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, - 1 + qe->start_times)); + run_time = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 2); end_time = GNUNET_TIME_absolute_add (qe->start_time, run_time); rst = GNUNET_TIME_absolute_get_remaining (end_time); - restart_at = GNUNET_TIME_relative_min (rst, restart_at); - if (0 == rst.rel_value) + if (0 == rst.rel_value_us) + { num_probes_expired++; + stop_job (qe); + } + else + { + num_probes_active++; + restart_at = GNUNET_TIME_relative_min (rst, restart_at); + } break; case GNUNET_FS_QUEUE_PRIORITY_NORMAL: - num_downloads_active++; + run_time = + GNUNET_TIME_relative_multiply (h->avg_block_latency, + qe->blocks * qe->start_times); end_time = GNUNET_TIME_absolute_add (qe->start_time, run_time); rst = GNUNET_TIME_absolute_get_remaining (end_time); - restart_at = GNUNET_TIME_relative_min (rst, restart_at); - if (0 == rst.rel_value) + if (0 == rst.rel_value_us) + { num_downloads_expired++; + stop_job (qe); + } + else + { + num_downloads_active++; + restart_at = GNUNET_TIME_relative_min (rst, restart_at); + } break; default: GNUNET_break (0); break; } } + GNUNET_break (h->active_downloads == + num_downloads_active + num_probes_active); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "PA: %u, PE: %u, PW: %u; DA: %u, DE: %u, DW: %u\n", num_probes_active, @@ -189,104 +212,59 @@ process_job_queue (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) num_downloads_active, num_downloads_expired, num_downloads_waiting); - - /* calculate stop decisions */ - num_probes_change = 0; - num_downloads_change = 0; - if (h->active_downloads + num_downloads_waiting > h->max_parallel_requests) - { - if (num_probes_active > 0) - num_probes_change = - GNUNET_MIN (num_probes_active, - h->max_parallel_requests - (h->active_downloads + num_downloads_waiting)); - else if (h->active_downloads + num_downloads_waiting > h->max_parallel_requests) - num_downloads_change = - GNUNET_MIN (num_downloads_expired, - h->max_parallel_requests - (h->active_downloads + num_downloads_waiting)); + GNUNET_break (h->active_downloads + num_probes_active <= + h->max_parallel_downloads); + /* calculate start/stop decisions */ + if (h->active_downloads + num_downloads_waiting > h->max_parallel_downloads) + { + /* stop as many probes as there are downloads and probes */ + num_probes_change = - GNUNET_MIN (num_probes_active, + num_downloads_waiting); + /* start as many downloads as there are free slots, including those + we just opened up */ + num_downloads_change = h->max_parallel_downloads - h->active_downloads - num_probes_change; } - + else + { + /* start all downloads (we can) */ + num_downloads_change = num_downloads_waiting; + /* also start probes if there is room, but use a lower cap of (mpd/4) + 1 */ + if (1 + h->max_parallel_downloads / 4 >= (h->active_downloads + num_downloads_change)) + num_probes_change = GNUNET_MIN (num_probes_waiting, + (1 + h->max_parallel_downloads / 4) - (h->active_downloads + num_downloads_change)); + else + num_probes_change = 0; + } + GNUNET_break (num_downloads_change <= num_downloads_waiting); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Stopping %d probes and %d downloads\n", + "Changing %d probes and %d/%u/%u downloads\n", num_probes_change, - num_downloads_change); - /* then, check if we should stop some jobs */ + num_downloads_change, + (unsigned int) h->active_downloads, + (unsigned int) h->max_parallel_downloads); + /* actually stop probes */ next = h->running_head; while (NULL != (qe = next)) { next = qe->next; - run_time = - GNUNET_TIME_relative_multiply (h->avg_block_latency, - qe->blocks * qe->start_times); - switch (qe->priority) + if (GNUNET_FS_QUEUE_PRIORITY_PROBE != qe->priority) + continue; + if (num_probes_change < 0) { - case GNUNET_FS_QUEUE_PRIORITY_PROBE: - /* run probes for at most 1s * number-of-restarts; note that - as the total runtime of a probe is limited to 2m, we don't - need to additionally limit the total time of a probe to - strictly limit its lifetime. */ - run_time = GNUNET_TIME_relative_min (run_time, - GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, - 1 + qe->start_times)); - end_time = GNUNET_TIME_absolute_add (qe->start_time, run_time); - rst = GNUNET_TIME_absolute_get_remaining (end_time); - restart_at = GNUNET_TIME_relative_min (rst, restart_at); - if ( (num_probes_change < 0) && - ( (num_probes_expired < - num_probes_change) || - (0 == rst.rel_value) ) ) - { - stop_job (qe); - num_probes_change++; - if (0 == rst.rel_value) - num_probes_expired--; - } - break; - case GNUNET_FS_QUEUE_PRIORITY_NORMAL: - end_time = GNUNET_TIME_absolute_add (qe->start_time, run_time); - rst = GNUNET_TIME_absolute_get_remaining (end_time); - restart_at = GNUNET_TIME_relative_min (rst, restart_at); - if ( (num_downloads_change < 0) && - ( (num_downloads_expired < - num_downloads_change) || - (0 == rst.rel_value) ) ) - { - stop_job (qe); - num_downloads_change++; - if (0 == rst.rel_value) - num_downloads_expired--; - } - break; - default: - GNUNET_break (0); - break; + stop_job (qe); + num_probes_change++; + if (0 == num_probes_change) + break; } } - GNUNET_break (0 == num_downloads_change); - GNUNET_break (0 == num_probes_change); - - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "AD: %u, MP: %u\n", - h->active_downloads, - h->max_parallel_requests); - - /* calculate start decisions */ - if (h->active_downloads + num_downloads_waiting < h->max_parallel_requests) - { - /* can start all downloads, fill rest with probes */ - num_downloads_change = num_downloads_waiting; - num_probes_change = GNUNET_MIN (num_probes_waiting, - h->max_parallel_requests - (h->active_downloads + num_downloads_waiting)); - } - else - { - num_downloads_change = h->max_parallel_requests - h->active_downloads; - num_probes_change = 0; - } - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Starting %d probes and %d downloads\n", - num_probes_change, - num_downloads_change); + GNUNET_break (0 <= num_probes_change); - /* finally, start some more tasks if we now have empty slots */ + /* start some more tasks if we now have empty slots */ block_limit_hit = GNUNET_NO; next = h->pending_head; - while (NULL != (qe = next)) + while ( (NULL != (qe = next)) && + ( (num_probes_change > 0) || + (num_downloads_change > 0) ) ) { next = qe->next; switch (qe->priority) @@ -296,6 +274,8 @@ process_job_queue (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { start_job (qe); num_probes_change--; + run_time = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 2); + restart_at = GNUNET_TIME_relative_min (run_time, restart_at); } break; case GNUNET_FS_QUEUE_PRIORITY_NORMAL: @@ -303,7 +283,7 @@ process_job_queue (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) ( (qe->blocks + h->active_blocks <= h->max_parallel_requests) || ( (qe->blocks > h->max_parallel_requests) && (0 == h->active_downloads) ) ) ) - { + { start_job (qe); num_downloads_change--; } @@ -315,12 +295,17 @@ process_job_queue (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) break; } } - GNUNET_break ( (0 == num_downloads_change) || (GNUNET_YES == block_limit_hit) ); + GNUNET_break ( (0 == num_downloads_change) || + (GNUNET_YES == block_limit_hit) ); GNUNET_break (0 == num_probes_change); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Left with %d probes and %d downloads to start\n", + "AD: %u, MP: %u; %d probes and %d downloads to start, will run again in %s\n", + h->active_downloads, + h->max_parallel_requests, num_probes_change, - num_downloads_change); + num_downloads_change, + GNUNET_STRINGS_relative_time_to_string (restart_at, GNUNET_YES)); /* make sure we run again */ h->queue_job = @@ -340,13 +325,15 @@ process_job_queue (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) * @return queue handle */ struct GNUNET_FS_QueueEntry * -GNUNET_FS_queue_ (struct GNUNET_FS_Handle *h, GNUNET_FS_QueueStart start, - GNUNET_FS_QueueStop stop, void *cls, unsigned int blocks, +GNUNET_FS_queue_ (struct GNUNET_FS_Handle *h, + GNUNET_FS_QueueStart start, + GNUNET_FS_QueueStop stop, void *cls, + unsigned int blocks, enum GNUNET_FS_QueuePriority priority) { struct GNUNET_FS_QueueEntry *qe; - qe = GNUNET_malloc (sizeof (struct GNUNET_FS_QueueEntry)); + qe = GNUNET_new (struct GNUNET_FS_QueueEntry); qe->h = h; qe->start = start; qe->stop = stop; @@ -356,28 +343,35 @@ GNUNET_FS_queue_ (struct GNUNET_FS_Handle *h, GNUNET_FS_QueueStart start, qe->priority = priority; GNUNET_CONTAINER_DLL_insert_after (h->pending_head, h->pending_tail, h->pending_tail, qe); - if (h->queue_job != GNUNET_SCHEDULER_NO_TASK) + if (h->queue_job != NULL) GNUNET_SCHEDULER_cancel (h->queue_job); h->queue_job = GNUNET_SCHEDULER_add_now (&process_job_queue, h); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Queueing job %p\n", + qe); return qe; } /** * Dequeue a job from the queue. - * @param qh handle for the job + * + * @param qe handle for the job */ void -GNUNET_FS_dequeue_ (struct GNUNET_FS_QueueEntry *qh) +GNUNET_FS_dequeue_ (struct GNUNET_FS_QueueEntry *qe) { struct GNUNET_FS_Handle *h; - h = qh->h; - if (NULL != qh->client) - stop_job (qh); - GNUNET_CONTAINER_DLL_remove (h->pending_head, h->pending_tail, qh); - GNUNET_free (qh); - if (h->queue_job != GNUNET_SCHEDULER_NO_TASK) + h = qe->h; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Dequeueing job %p\n", + qe); + if (NULL != qe->client) + stop_job (qe); + GNUNET_CONTAINER_DLL_remove (h->pending_head, h->pending_tail, qe); + GNUNET_free (qe); + if (h->queue_job != NULL) GNUNET_SCHEDULER_cancel (h->queue_job); h->queue_job = GNUNET_SCHEDULER_add_now (&process_job_queue, h); } @@ -388,16 +382,17 @@ GNUNET_FS_dequeue_ (struct GNUNET_FS_QueueEntry *qh) * * @param h global fs handle * @param ssf suspend signal function to use - * @param ssf_cls closure for ssf + * @param ssf_cls closure for @a ssf * @return fresh top-level activity handle */ struct TopLevelActivity * -GNUNET_FS_make_top (struct GNUNET_FS_Handle *h, SuspendSignalFunction ssf, +GNUNET_FS_make_top (struct GNUNET_FS_Handle *h, + SuspendSignalFunction ssf, void *ssf_cls) { struct TopLevelActivity *ret; - ret = GNUNET_malloc (sizeof (struct TopLevelActivity)); + ret = GNUNET_new (struct TopLevelActivity); ret->ssf = ssf; ret->ssf_cls = ssf_cls; GNUNET_CONTAINER_DLL_insert (h->top_head, h->top_tail, ret); @@ -412,16 +407,16 @@ GNUNET_FS_make_top (struct GNUNET_FS_Handle *h, SuspendSignalFunction ssf, * @param top top level activity entry */ void -GNUNET_FS_end_top (struct GNUNET_FS_Handle *h, struct TopLevelActivity *top) +GNUNET_FS_end_top (struct GNUNET_FS_Handle *h, + struct TopLevelActivity *top) { GNUNET_CONTAINER_DLL_remove (h->top_head, h->top_tail, top); GNUNET_free (top); } - /** - * Closure for "data_reader_file". + * Closure for #GNUNET_FS_data_reader_file_(). */ struct FileInfo { @@ -440,25 +435,28 @@ struct FileInfo /** * Function that provides data by reading from a file. * - * @param cls closure (points to the file information) + * @param cls closure with the `struct FileInfo *` * @param offset offset to read from; it is possible * that the caller might need to go backwards - * a bit at times; set to UINT64_MAX to tell + * a bit at times; set to `UINT64_MAX` to tell * the reader that we won't be reading for a while * (used to close the file descriptor but NOT fully * clean up the reader's state); in this case, - * a value of '0' for max should be ignored + * a value of '0' for @a max should be ignored * @param max maximum number of bytes that should be - * copied to buf; readers are not allowed + * copied to @a buf; readers are not allowed * to provide less data unless there is an error; * a value of "0" will be used at the end to allow * the reader to clean up its internal state * @param buf where the reader should write the data * @param emsg location for the reader to store an error message - * @return number of bytes written, usually "max", 0 on error + * @return number of bytes written, usually @a max, 0 on error */ size_t -GNUNET_FS_data_reader_file_ (void *cls, uint64_t offset, size_t max, void *buf, +GNUNET_FS_data_reader_file_ (void *cls, + uint64_t offset, + size_t max, + void *buf, char **emsg) { struct FileInfo *fi = cls; @@ -484,26 +482,32 @@ GNUNET_FS_data_reader_file_ (void *cls, uint64_t offset, size_t max, void *buf, if (NULL == fi->fd) { fi->fd = - GNUNET_DISK_file_open (fi->filename, GNUNET_DISK_OPEN_READ, + GNUNET_DISK_file_open (fi->filename, + GNUNET_DISK_OPEN_READ, GNUNET_DISK_PERM_NONE); if (NULL == fi->fd) { - GNUNET_asprintf (emsg, _("Could not open file `%s': %s"), fi->filename, + GNUNET_asprintf (emsg, + _("Could not open file `%s': %s"), + fi->filename, STRERROR (errno)); return 0; } } - GNUNET_DISK_file_seek (fi->fd, offset, GNUNET_DISK_SEEK_SET); - ret = GNUNET_DISK_file_read (fi->fd, buf, max); - if (-1 == ret) + if ( (GNUNET_SYSERR == + GNUNET_DISK_file_seek (fi->fd, offset, GNUNET_DISK_SEEK_SET)) || + (-1 == (ret = GNUNET_DISK_file_read (fi->fd, buf, max))) ) { - GNUNET_asprintf (emsg, _("Could not read file `%s': %s"), fi->filename, + GNUNET_asprintf (emsg, + _("Could not read file `%s': %s"), + fi->filename, STRERROR (errno)); return 0; } if (ret != max) { - GNUNET_asprintf (emsg, _("Short read reading from file `%s'!"), + GNUNET_asprintf (emsg, + _("Short read reading from file `%s'!"), fi->filename); return 0; } @@ -512,7 +516,7 @@ GNUNET_FS_data_reader_file_ (void *cls, uint64_t offset, size_t max, void *buf, /** - * Create the closure for the 'GNUNET_FS_data_reader_file_' callback. + * Create the closure for the #GNUNET_FS_data_reader_file_() callback. * * @param filename file to read * @return closure to use, NULL on error @@ -522,7 +526,7 @@ GNUNET_FS_make_file_reader_context_ (const char *filename) { struct FileInfo *fi; - fi = GNUNET_malloc (sizeof (struct FileInfo)); + fi = GNUNET_new (struct FileInfo); fi->filename = GNUNET_STRINGS_filename_expand (filename); if (NULL == fi->filename) { @@ -539,22 +543,25 @@ GNUNET_FS_make_file_reader_context_ (const char *filename) * @param cls closure (points to the buffer) * @param offset offset to read from; it is possible * that the caller might need to go backwards - * a bit at times; set to UINT64_MAX to tell + * a bit at times; set to `UINT64_MAX` to tell * the reader that we won't be reading for a while * (used to close the file descriptor but NOT fully * clean up the reader's state); in this case, - * a value of '0' for max should be ignored + * a value of '0' for @a max should be ignored * @param max maximum number of bytes that should be - * copied to buf; readers are not allowed + * copied to @a buf; readers are not allowed * to provide less data unless there is an error; * a value of "0" will be used at the end to allow * the reader to clean up its internal state * @param buf where the reader should write the data * @param emsg location for the reader to store an error message - * @return number of bytes written, usually "max", 0 on error + * @return number of bytes written, usually @a max, 0 on error */ size_t -GNUNET_FS_data_reader_copy_ (void *cls, uint64_t offset, size_t max, void *buf, +GNUNET_FS_data_reader_copy_ (void *cls, + uint64_t offset, + size_t max, + void *buf, char **emsg) { char *data = cls; @@ -581,7 +588,8 @@ GNUNET_FS_data_reader_copy_ (void *cls, uint64_t offset, size_t max, void *buf, * @return NULL on error */ static char * -get_serialization_file_name (struct GNUNET_FS_Handle *h, const char *ext, +get_serialization_file_name (struct GNUNET_FS_Handle *h, + const char *ext, const char *ent) { char *basename; @@ -613,8 +621,10 @@ get_serialization_file_name (struct GNUNET_FS_Handle *h, const char *ext, * @return NULL on error */ static char * -get_serialization_file_name_in_dir (struct GNUNET_FS_Handle *h, const char *ext, - const char *uni, const char *ent) +get_serialization_file_name_in_dir (struct GNUNET_FS_Handle *h, + const char *ext, + const char *uni, + const char *ent) { char *basename; char *ret; @@ -642,7 +652,9 @@ get_serialization_file_name_in_dir (struct GNUNET_FS_Handle *h, const char *ext, * @return NULL on error */ static struct GNUNET_BIO_ReadHandle * -get_read_handle (struct GNUNET_FS_Handle *h, const char *ext, const char *ent) +get_read_handle (struct GNUNET_FS_Handle *h, + const char *ext, + const char *ent) { char *fn; struct GNUNET_BIO_ReadHandle *ret; @@ -665,7 +677,9 @@ get_read_handle (struct GNUNET_FS_Handle *h, const char *ext, const char *ent) * @return NULL on error */ static struct GNUNET_BIO_WriteHandle * -get_write_handle (struct GNUNET_FS_Handle *h, const char *ext, const char *ent) +get_write_handle (struct GNUNET_FS_Handle *h, + const char *ext, + const char *ent) { char *fn; struct GNUNET_BIO_WriteHandle *ret; @@ -713,7 +727,8 @@ get_write_handle_in_dir (struct GNUNET_FS_Handle *h, const char *ext, * @param ent entity identifier */ void -GNUNET_FS_remove_sync_file_ (struct GNUNET_FS_Handle *h, const char *ext, +GNUNET_FS_remove_sync_file_ (struct GNUNET_FS_Handle *h, + const char *ext, const char *ent) { char *filename; @@ -726,7 +741,8 @@ GNUNET_FS_remove_sync_file_ (struct GNUNET_FS_Handle *h, const char *ext, filename = get_serialization_file_name (h, ext, ent); if (NULL != filename) { - if (0 != UNLINK (filename)) + if ( (0 != UNLINK (filename)) && + (ENOENT != errno) ) GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink", filename); GNUNET_free (filename); } @@ -742,7 +758,8 @@ GNUNET_FS_remove_sync_file_ (struct GNUNET_FS_Handle *h, const char *ext, * @param ent entity identifier */ static void -remove_sync_file_in_dir (struct GNUNET_FS_Handle *h, const char *ext, +remove_sync_file_in_dir (struct GNUNET_FS_Handle *h, + const char *ext, const char *uni, const char *ent) { char *filename; @@ -769,7 +786,8 @@ remove_sync_file_in_dir (struct GNUNET_FS_Handle *h, const char *ext, * @param uni unique name of parent */ void -GNUNET_FS_remove_sync_dir_ (struct GNUNET_FS_Handle *h, const char *ext, +GNUNET_FS_remove_sync_dir_ (struct GNUNET_FS_Handle *h, + const char *ext, const char *uni) { char *dn; @@ -779,7 +797,7 @@ GNUNET_FS_remove_sync_dir_ (struct GNUNET_FS_Handle *h, const char *ext, dn = get_serialization_file_name_in_dir (h, ext, uni, ""); if (NULL == dn) return; - if ((GNUNET_OK == GNUNET_DISK_directory_test (dn)) && + if ((GNUNET_YES == GNUNET_DISK_directory_test (dn, GNUNET_YES)) && (GNUNET_OK != GNUNET_DISK_directory_remove (dn))) GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "rmdir", dn); GNUNET_free (dn); @@ -787,7 +805,7 @@ GNUNET_FS_remove_sync_dir_ (struct GNUNET_FS_Handle *h, const char *ext, /** - * Serialize a 'start_time'. Since we use start-times to + * Serialize a start-time. Since we use start-times to * calculate the duration of some operation, we actually * do not serialize the absolute time but the (relative) * duration since the start time. When we then @@ -798,7 +816,7 @@ GNUNET_FS_remove_sync_dir_ (struct GNUNET_FS_Handle *h, const char *ext, * * @param wh handle for writing * @param timestamp time to serialize - * @return GNUNET_OK on success + * @return #GNUNET_OK on success */ static int write_start_time (struct GNUNET_BIO_WriteHandle *wh, @@ -807,15 +825,15 @@ write_start_time (struct GNUNET_BIO_WriteHandle *wh, struct GNUNET_TIME_Relative dur; dur = GNUNET_TIME_absolute_get_duration (timestamp); - return GNUNET_BIO_write_int64 (wh, dur.rel_value); + return GNUNET_BIO_write_int64 (wh, dur.rel_value_us); } /** - * Serialize a 'start_time'. Since we use start-times to + * Deserialize a start-time. Since we use start-times to * calculate the duration of some operation, we actually * do not serialize the absolute time but the (relative) - * duration since the start time. When we then + * duration since the start time. Thus, when we then * deserialize the start time, we take the current time and * subtract that duration so that we get again an absolute * time stamp that will result in correct performance @@ -823,7 +841,7 @@ write_start_time (struct GNUNET_BIO_WriteHandle *wh, * * @param rh handle for reading * @param timestamp where to write the deserialized timestamp - * @return GNUNET_OK on success + * @return #GNUNET_OK on success */ static int read_start_time (struct GNUNET_BIO_ReadHandle *rh, @@ -831,7 +849,7 @@ read_start_time (struct GNUNET_BIO_ReadHandle *rh, { struct GNUNET_TIME_Relative dur; - if (GNUNET_OK != GNUNET_BIO_read_int64 (rh, &dur.rel_value)) + if (GNUNET_OK != GNUNET_BIO_read_int64 (rh, &dur.rel_value_us)) return GNUNET_SYSERR; *timestamp = GNUNET_TIME_absolute_subtract (GNUNET_TIME_absolute_get (), dur); return GNUNET_OK; @@ -848,7 +866,8 @@ read_start_time (struct GNUNET_BIO_ReadHandle *rh, * @return NULL on error */ static struct GNUNET_FS_FileInformation * -deserialize_file_information (struct GNUNET_FS_Handle *h, const char *filename); +deserialize_file_information (struct GNUNET_FS_Handle *h, + const char *filename); /** @@ -862,7 +881,8 @@ deserialize_file_information (struct GNUNET_FS_Handle *h, const char *filename); * @return NULL on error */ static struct GNUNET_FS_FileInformation * -deserialize_fi_node (struct GNUNET_FS_Handle *h, const char *fn, +deserialize_fi_node (struct GNUNET_FS_Handle *h, + const char *fn, struct GNUNET_BIO_ReadHandle *rh) { struct GNUNET_FS_FileInformation *ret; @@ -870,6 +890,7 @@ deserialize_fi_node (struct GNUNET_FS_Handle *h, const char *fn, char b; char *ksks; char *chks; + char *skss; char *filename; uint32_t dsize; @@ -878,10 +899,11 @@ deserialize_fi_node (struct GNUNET_FS_Handle *h, const char *fn, GNUNET_break (0); return NULL; } - ret = GNUNET_malloc (sizeof (struct GNUNET_FS_FileInformation)); + ret = GNUNET_new (struct GNUNET_FS_FileInformation); ret->h = h; ksks = NULL; chks = NULL; + skss = NULL; filename = NULL; if ((GNUNET_OK != GNUNET_BIO_read_meta_data (rh, "metadata", &ret->meta)) || (GNUNET_OK != GNUNET_BIO_read_string (rh, "ksk-uri", &ksks, 32 * 1024)) || @@ -892,12 +914,16 @@ deserialize_fi_node (struct GNUNET_FS_Handle *h, const char *fn, ( (NULL != chks) && ( (NULL == (ret->chk_uri = GNUNET_FS_uri_parse (chks, NULL))) || (GNUNET_YES != GNUNET_FS_uri_test_chk (ret->chk_uri))) ) || + (GNUNET_OK != GNUNET_BIO_read_string (rh, "sks-uri", &skss, 1024)) || + ( (NULL != skss) && + ( (NULL == (ret->sks_uri = GNUNET_FS_uri_parse (skss, NULL))) || + (GNUNET_YES != GNUNET_FS_uri_test_sks (ret->sks_uri))) ) || (GNUNET_OK != read_start_time (rh, &ret->start_time)) || (GNUNET_OK != GNUNET_BIO_read_string (rh, "emsg", &ret->emsg, 16 * 1024)) || (GNUNET_OK != GNUNET_BIO_read_string (rh, "fn", &ret->filename, 16 * 1024)) || (GNUNET_OK != - GNUNET_BIO_read_int64 (rh, &ret->bo.expiration_time.abs_value)) || + GNUNET_BIO_read_int64 (rh, &ret->bo.expiration_time.abs_value_us)) || (GNUNET_OK != GNUNET_BIO_read_int32 (rh, &ret->bo.anonymity_level)) || (GNUNET_OK != GNUNET_BIO_read_int32 (rh, &ret->bo.content_priority)) || (GNUNET_OK != GNUNET_BIO_read_int32 (rh, &ret->bo.replication_level))) @@ -1008,6 +1034,8 @@ deserialize_fi_node (struct GNUNET_FS_Handle *h, const char *fn, case 4: /* directory */ ret->is_directory = GNUNET_YES; if ((GNUNET_OK != GNUNET_BIO_read_int32 (rh, &dsize)) || + (GNUNET_OK != GNUNET_BIO_read_int64 (rh, &ret->data.dir.contents_completed)) || + (GNUNET_OK != GNUNET_BIO_read_int64 (rh, &ret->data.dir.contents_size)) || (NULL == (ret->data.dir.dir_data = GNUNET_malloc_large (dsize))) || (GNUNET_OK != GNUNET_BIO_read (rh, "dir-data", ret->data.dir.dir_data, dsize)) || @@ -1049,11 +1077,13 @@ deserialize_fi_node (struct GNUNET_FS_Handle *h, const char *fn, filename = NULL; } GNUNET_free_non_null (ksks); + GNUNET_free_non_null (skss); GNUNET_free_non_null (chks); return ret; cleanup: GNUNET_free_non_null (ksks); GNUNET_free_non_null (chks); + GNUNET_free_non_null (skss); GNUNET_free_non_null (filename); GNUNET_FS_file_information_destroy (ret, NULL, NULL); return NULL; @@ -1070,7 +1100,8 @@ cleanup: * @return NULL on error */ static struct GNUNET_FS_FileInformation * -deserialize_file_information (struct GNUNET_FS_Handle *h, const char *filename) +deserialize_file_information (struct GNUNET_FS_Handle *h, + const char *filename) { struct GNUNET_FS_FileInformation *ret; struct GNUNET_BIO_ReadHandle *rh; @@ -1145,7 +1176,8 @@ get_serialization_short_name (const char *fullname) * @return NULL on errror */ static char * -make_serialization_file_name (struct GNUNET_FS_Handle *h, const char *ext) +make_serialization_file_name (struct GNUNET_FS_Handle *h, + const char *ext) { char *fn; char *dn; @@ -1182,7 +1214,8 @@ make_serialization_file_name (struct GNUNET_FS_Handle *h, const char *ext) */ static char * make_serialization_file_name_in_dir (struct GNUNET_FS_Handle *h, - const char *ext, const char *uni) + const char *ext, + const char *uni) { char *fn; char *dn; @@ -1213,7 +1246,7 @@ make_serialization_file_name_in_dir (struct GNUNET_FS_Handle *h, * * @param wh write handle * @param fi file with reader - * @return GNUNET_OK on success + * @return #GNUNET_OK on success */ static int copy_from_reader (struct GNUNET_BIO_WriteHandle *wh, @@ -1247,7 +1280,7 @@ copy_from_reader (struct GNUNET_BIO_WriteHandle *wh, /** * Create a temporary file on disk to store the current - * state of "fi" in. + * state of @a fi in. * * @param fi file information to sync with disk */ @@ -1259,6 +1292,7 @@ GNUNET_FS_file_information_sync_ (struct GNUNET_FS_FileInformation *fi) char b; char *ksks; char *chks; + char *skss; if (NULL == fi->serialization) fi->serialization = @@ -1291,15 +1325,20 @@ GNUNET_FS_file_information_sync_ (struct GNUNET_FS_FileInformation *fi) chks = GNUNET_FS_uri_to_string (fi->chk_uri); else chks = NULL; + if (NULL != fi->sks_uri) + skss = GNUNET_FS_uri_to_string (fi->sks_uri); + else + skss = NULL; if ((GNUNET_OK != GNUNET_BIO_write (wh, &b, sizeof (b))) || (GNUNET_OK != GNUNET_BIO_write_meta_data (wh, fi->meta)) || (GNUNET_OK != GNUNET_BIO_write_string (wh, ksks)) || (GNUNET_OK != GNUNET_BIO_write_string (wh, chks)) || + (GNUNET_OK != GNUNET_BIO_write_string (wh, skss)) || (GNUNET_OK != write_start_time (wh, fi->start_time)) || (GNUNET_OK != GNUNET_BIO_write_string (wh, fi->emsg)) || (GNUNET_OK != GNUNET_BIO_write_string (wh, fi->filename)) || (GNUNET_OK != - GNUNET_BIO_write_int64 (wh, fi->bo.expiration_time.abs_value)) || + GNUNET_BIO_write_int64 (wh, fi->bo.expiration_time.abs_value_us)) || (GNUNET_OK != GNUNET_BIO_write_int32 (wh, fi->bo.anonymity_level)) || (GNUNET_OK != GNUNET_BIO_write_int32 (wh, fi->bo.content_priority)) || (GNUNET_OK != GNUNET_BIO_write_int32 (wh, fi->bo.replication_level))) @@ -1311,6 +1350,8 @@ GNUNET_FS_file_information_sync_ (struct GNUNET_FS_FileInformation *fi) chks = NULL; GNUNET_free_non_null (ksks); ksks = NULL; + GNUNET_free_non_null (skss); + skss = NULL; switch (b) { @@ -1356,7 +1397,12 @@ GNUNET_FS_file_information_sync_ (struct GNUNET_FS_FileInformation *fi) } break; case 4: /* directory */ + if ( (NULL != fi->data.dir.entries) && + (NULL == fi->data.dir.entries->serialization) ) + GNUNET_FS_file_information_sync_ (fi->data.dir.entries); if ((GNUNET_OK != GNUNET_BIO_write_int32 (wh, fi->data.dir.dir_size)) || + (GNUNET_OK != GNUNET_BIO_write_int64 (wh, fi->data.dir.contents_completed)) || + (GNUNET_OK != GNUNET_BIO_write_int64 (wh, fi->data.dir.contents_size)) || (GNUNET_OK != GNUNET_BIO_write (wh, fi->data.dir.dir_data, (uint32_t) fi->data.dir.dir_size)) || @@ -1374,6 +1420,9 @@ GNUNET_FS_file_information_sync_ (struct GNUNET_FS_FileInformation *fi) GNUNET_assert (0); goto cleanup; } + if ( (NULL != fi->next) && + (NULL == fi->next->serialization) ) + GNUNET_FS_file_information_sync_ (fi->next); if (GNUNET_OK != GNUNET_BIO_write_string (wh, (fi->next != @@ -1394,6 +1443,7 @@ cleanup: (void) GNUNET_BIO_write_close (wh); GNUNET_free_non_null (chks); GNUNET_free_non_null (ksks); + GNUNET_free_non_null (skss); fn = get_serialization_file_name (fi->h, GNUNET_FS_SYNC_PATH_FILE_INFO, fi->serialization); if (NULL != fn) @@ -1417,7 +1467,8 @@ cleanup: * @return NULL if srch was not found in this subtree */ static struct GNUNET_FS_FileInformation * -find_file_position (struct GNUNET_FS_FileInformation *pos, const char *srch) +find_file_position (struct GNUNET_FS_FileInformation *pos, + const char *srch) { struct GNUNET_FS_FileInformation *r; @@ -1427,7 +1478,7 @@ find_file_position (struct GNUNET_FS_FileInformation *pos, const char *srch) return pos; if ( (GNUNET_YES == pos->is_directory) && (NULL != (r = find_file_position (pos->data.dir.entries, srch))) ) - return r; + return r; pos = pos->next; } return NULL; @@ -1438,7 +1489,7 @@ find_file_position (struct GNUNET_FS_FileInformation *pos, const char *srch) * Signal the FS's progress function that we are resuming * an upload. * - * @param cls closure (of type "struct GNUNET_FS_PublishContext*") + * @param cls closure (of type `struct GNUNET_FS_PublishContext *`, for the parent (!)) * @param fi the entry in the publish-structure * @param length length of the file or directory * @param meta metadata for the file or directory (can be modified) @@ -1446,13 +1497,16 @@ find_file_position (struct GNUNET_FS_FileInformation *pos, const char *srch) * @param bo block options (can be modified) * @param do_index should we index? * @param client_info pointer to client context set upon creation (can be modified) - * @return GNUNET_OK to continue (always) + * @return #GNUNET_OK to continue (always) */ static int -fip_signal_resume (void *cls, struct GNUNET_FS_FileInformation *fi, - uint64_t length, struct GNUNET_CONTAINER_MetaData *meta, +fip_signal_resume (void *cls, + struct GNUNET_FS_FileInformation *fi, + uint64_t length, + struct GNUNET_CONTAINER_MetaData *meta, struct GNUNET_FS_Uri **uri, - struct GNUNET_FS_BlockOptions *bo, int *do_index, + struct GNUNET_FS_BlockOptions *bo, + int *do_index, void **client_info) { struct GNUNET_FS_PublishContext *pc = cls; @@ -1464,8 +1518,8 @@ fip_signal_resume (void *cls, struct GNUNET_FS_FileInformation *fi, return GNUNET_OK; } pi.status = GNUNET_FS_STATUS_PUBLISH_RESUME; - pi.value.publish.specifics.resume.message = pc->fi->emsg; - pi.value.publish.specifics.resume.chk_uri = pc->fi->chk_uri; + pi.value.publish.specifics.resume.message = fi->emsg; + pi.value.publish.specifics.resume.chk_uri = fi->chk_uri; *client_info = GNUNET_FS_publish_make_status_ (&pi, pc, fi, 0); if (GNUNET_YES == GNUNET_FS_meta_data_test_for_directory (meta)) { @@ -1481,29 +1535,30 @@ fip_signal_resume (void *cls, struct GNUNET_FS_FileInformation *fi, * Function called with a filename of serialized publishing operation * to deserialize. * - * @param cls the 'struct GNUNET_FS_Handle*' + * @param cls the `struct GNUNET_FS_Handle *` * @param filename complete filename (absolute path) - * @return GNUNET_OK (continue to iterate) + * @return #GNUNET_OK (continue to iterate) */ static int -deserialize_publish_file (void *cls, const char *filename) +deserialize_publish_file (void *cls, + const char *filename) { struct GNUNET_FS_Handle *h = cls; struct GNUNET_BIO_ReadHandle *rh; struct GNUNET_FS_PublishContext *pc; int32_t options; int32_t all_done; + int32_t have_ns; char *fi_root; - char *ns; + struct GNUNET_CRYPTO_EcdsaPrivateKey ns; char *fi_pos; char *emsg; - pc = GNUNET_malloc (sizeof (struct GNUNET_FS_PublishContext)); + pc = GNUNET_new (struct GNUNET_FS_PublishContext); pc->h = h; pc->serialization = get_serialization_short_name (filename); fi_root = NULL; fi_pos = NULL; - ns = NULL; rh = GNUNET_BIO_read_open (filename); if (NULL == rh) { @@ -1515,10 +1570,12 @@ deserialize_publish_file (void *cls, const char *filename) GNUNET_BIO_read_string (rh, "publish-nuid", &pc->nuid, 1024)) || (GNUNET_OK != GNUNET_BIO_read_int32 (rh, &options)) || (GNUNET_OK != GNUNET_BIO_read_int32 (rh, &all_done)) || + (GNUNET_OK != GNUNET_BIO_read_int32 (rh, &have_ns)) || (GNUNET_OK != GNUNET_BIO_read_string (rh, "publish-firoot", &fi_root, 128)) || (GNUNET_OK != GNUNET_BIO_read_string (rh, "publish-fipos", &fi_pos, 128)) - || (GNUNET_OK != GNUNET_BIO_read_string (rh, "publish-ns", &ns, 1024))) + || ( (GNUNET_YES == have_ns) && + (GNUNET_OK != GNUNET_BIO_read (rh, "publish-ns", &ns, sizeof (ns)))) ) { GNUNET_break (0); goto cleanup; @@ -1536,17 +1593,10 @@ deserialize_publish_file (void *cls, const char *filename) GNUNET_break (0); goto cleanup; } - if (NULL != ns) + if (GNUNET_YES == have_ns) { - pc->namespace = GNUNET_FS_namespace_create (h, ns); - if (NULL == pc->namespace) - { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - _ - ("Failed to recover namespace `%s', cannot resume publishing operation.\n"), - ns); - goto cleanup; - } + pc->ns = GNUNET_new (struct GNUNET_CRYPTO_EcdsaPrivateKey); + *pc->ns = ns; } if ((0 == (pc->options & GNUNET_FS_PUBLISH_OPTION_SIMULATE_ONLY)) && (GNUNET_YES != pc->all_done)) @@ -1576,10 +1626,10 @@ deserialize_publish_file (void *cls, const char *filename) /* re-start publishing (if needed)... */ if (GNUNET_YES != pc->all_done) { - GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == pc->upload_task); + GNUNET_assert (NULL == pc->upload_task); pc->upload_task = GNUNET_SCHEDULER_add_with_priority - (GNUNET_SCHEDULER_PRIORITY_BACKGROUND, + (GNUNET_SCHEDULER_PRIORITY_BACKGROUND, &GNUNET_FS_publish_main_, pc); } if (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg)) @@ -1589,7 +1639,6 @@ deserialize_publish_file (void *cls, const char *filename) filename, emsg); GNUNET_free (emsg); } - GNUNET_free_non_null (ns); pc->top = GNUNET_FS_make_top (h, &GNUNET_FS_publish_signal_suspend_, pc); return GNUNET_OK; cleanup: @@ -1597,7 +1646,6 @@ cleanup: GNUNET_free_non_null (pc->nuid); GNUNET_free_non_null (fi_root); GNUNET_free_non_null (fi_pos); - GNUNET_free_non_null (ns); if ((NULL != rh) && (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg))) { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, @@ -1627,6 +1675,7 @@ void GNUNET_FS_publish_sync_ (struct GNUNET_FS_PublishContext *pc) { struct GNUNET_BIO_WriteHandle *wh; + int32_t have_ns; if (NULL == pc->serialization) pc->serialization = @@ -1648,17 +1697,20 @@ GNUNET_FS_publish_sync_ (struct GNUNET_FS_PublishContext *pc) GNUNET_break (0); goto cleanup; } + have_ns = (NULL != pc->ns) ? GNUNET_YES : GNUNET_NO; if ((GNUNET_OK != GNUNET_BIO_write_string (wh, pc->nid)) || (GNUNET_OK != GNUNET_BIO_write_string (wh, pc->nuid)) || (GNUNET_OK != GNUNET_BIO_write_int32 (wh, pc->options)) || (GNUNET_OK != GNUNET_BIO_write_int32 (wh, pc->all_done)) || + (GNUNET_OK != GNUNET_BIO_write_int32 (wh, have_ns)) || (GNUNET_OK != GNUNET_BIO_write_string (wh, pc->fi->serialization)) || (GNUNET_OK != GNUNET_BIO_write_string (wh, (NULL == pc->fi_pos) ? NULL : pc->fi_pos->serialization)) || - (GNUNET_OK != - GNUNET_BIO_write_string (wh, - (NULL == pc->namespace) ? NULL : pc->namespace->name))) + ( (NULL != pc->ns) && + (GNUNET_OK != GNUNET_BIO_write (wh, + pc->ns, + sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)) ) )) { GNUNET_break (0); goto cleanup; @@ -1748,9 +1800,9 @@ cleanup: /** * Serialize a download request. * - * @param wh the 'struct GNUNET_BIO_WriteHandle*' - * @param dr the 'struct DownloadRequest' - * @return GNUNET_YES on success, GNUNET_NO on error + * @param wh handle for writing the download request to disk + * @param dr the the request to write to disk + * @return #GNUNET_YES on success, #GNUNET_NO on error */ static int write_download_request (struct GNUNET_BIO_WriteHandle *wh, @@ -1777,8 +1829,8 @@ write_download_request (struct GNUNET_BIO_WriteHandle *wh, /** * Read a download request tree. * - * @param rh stream to read from - * @return value the 'struct DownloadRequest', NULL on error + * @param rh cadet to read from + * @return value the download request read from disk, NULL on error */ static struct DownloadRequest * read_download_request (struct GNUNET_BIO_ReadHandle *rh) @@ -1786,15 +1838,14 @@ read_download_request (struct GNUNET_BIO_ReadHandle *rh) struct DownloadRequest *dr; unsigned int i; - dr = GNUNET_malloc (sizeof (struct DownloadRequest)); + dr = GNUNET_new (struct DownloadRequest); if ((GNUNET_OK != GNUNET_BIO_read_int32 (rh, &dr->state)) || (GNUNET_OK != GNUNET_BIO_read_int64 (rh, &dr->offset)) || (GNUNET_OK != GNUNET_BIO_read_int32 (rh, &dr->num_children)) || (dr->num_children > CHK_PER_INODE) || - (GNUNET_OK != GNUNET_BIO_read_int32 (rh, &dr->depth)) || ((0 == dr->depth) - && - (dr->num_children - > 0)) || + (GNUNET_OK != GNUNET_BIO_read_int32 (rh, &dr->depth)) || + ( (0 == dr->depth) && + (dr->num_children > 0) ) || ((dr->depth > 0) && (0 == dr->num_children))) { GNUNET_break (0); @@ -1803,7 +1854,7 @@ read_download_request (struct GNUNET_BIO_ReadHandle *rh) } if (dr->num_children > 0) dr->children = - GNUNET_malloc (dr->num_children * sizeof (struct ContentHashKey)); + GNUNET_malloc (dr->num_children * sizeof (struct DownloadRequest *)); switch (dr->state) { case BRS_INIT: @@ -1848,7 +1899,8 @@ cleanup: */ static char * get_download_sync_filename (struct GNUNET_FS_DownloadContext *dc, - const char *uni, const char *ext) + const char *uni, + const char *ext) { char *par; char *epar; @@ -1988,10 +2040,12 @@ GNUNET_FS_search_result_sync_ (struct GNUNET_FS_SearchResult *sr) struct GNUNET_BIO_WriteHandle *wh; char *uris; + if (NULL == sr->sc) + return; uris = NULL; if (NULL == sr->serialization) sr->serialization = - make_serialization_file_name_in_dir (sr->sc->h, + make_serialization_file_name_in_dir (sr->h, (sr->sc->psearch_result == NULL) ? GNUNET_FS_SYNC_PATH_MASTER_SEARCH : @@ -1999,7 +2053,7 @@ GNUNET_FS_search_result_sync_ (struct GNUNET_FS_SearchResult *sr) sr->sc->serialization); if (NULL == sr->serialization) return; - wh = get_write_handle_in_dir (sr->sc->h, + wh = get_write_handle_in_dir (sr->h, (sr->sc->psearch_result == NULL) ? GNUNET_FS_SYNC_PATH_MASTER_SEARCH : GNUNET_FS_SYNC_PATH_CHILD_SEARCH, @@ -2030,7 +2084,7 @@ GNUNET_FS_search_result_sync_ (struct GNUNET_FS_SearchResult *sr) goto cleanup; } if ( (NULL != sr->uri) && - (ksk == sr->sc->uri->type) && + (GNUNET_FS_URI_KSK == sr->sc->uri->type) && (GNUNET_OK != GNUNET_BIO_write (wh, sr->keyword_bitmap, (sr->sc->uri->data.ksk.keywordCount + 7) / 8)) ) { @@ -2049,9 +2103,9 @@ cleanup: GNUNET_free_non_null (uris); if (NULL != wh) (void) GNUNET_BIO_write_close (wh); - remove_sync_file_in_dir (sr->sc->h, - (NULL == sr->sc->psearch_result) - ? GNUNET_FS_SYNC_PATH_MASTER_SEARCH + remove_sync_file_in_dir (sr->h, + (NULL == sr->sc->psearch_result) + ? GNUNET_FS_SYNC_PATH_MASTER_SEARCH : GNUNET_FS_SYNC_PATH_CHILD_SEARCH, sr->sc->serialization, sr->serialization); GNUNET_free (sr->serialization); @@ -2076,8 +2130,8 @@ GNUNET_FS_search_sync_ (struct GNUNET_FS_SearchContext *sc) const char *category; category = - (NULL == sc->psearch_result) - ? GNUNET_FS_SYNC_PATH_MASTER_SEARCH + (NULL == sc->psearch_result) + ? GNUNET_FS_SYNC_PATH_MASTER_SEARCH : GNUNET_FS_SYNC_PATH_CHILD_SEARCH; if (NULL == sc->serialization) sc->serialization = make_serialization_file_name (sc->h, category); @@ -2093,7 +2147,7 @@ GNUNET_FS_search_sync_ (struct GNUNET_FS_SearchContext *sc) GNUNET_assert ((GNUNET_YES == GNUNET_FS_uri_test_ksk (sc->uri)) || (GNUNET_YES == GNUNET_FS_uri_test_sks (sc->uri))); uris = GNUNET_FS_uri_to_string (sc->uri); - in_pause = (sc->task != GNUNET_SCHEDULER_NO_TASK) ? 'r' : '\0'; + in_pause = (sc->task != NULL) ? 'r' : '\0'; if ((GNUNET_OK != GNUNET_BIO_write_string (wh, uris)) || (GNUNET_OK != write_start_time (wh, sc->start_time)) || (GNUNET_OK != GNUNET_BIO_write_string (wh, sc->emsg)) || @@ -2127,12 +2181,13 @@ cleanup: * Function called with a filename of serialized unindexing operation * to deserialize. * - * @param cls the 'struct GNUNET_FS_Handle*' + * @param cls the `struct GNUNET_FS_Handle *` * @param filename complete filename (absolute path) - * @return GNUNET_OK (continue to iterate) + * @return #GNUNET_OK (continue to iterate) */ static int -deserialize_unindex_file (void *cls, const char *filename) +deserialize_unindex_file (void *cls, + const char *filename) { struct GNUNET_FS_Handle *h = cls; struct GNUNET_BIO_ReadHandle *rh; @@ -2142,7 +2197,7 @@ deserialize_unindex_file (void *cls, const char *filename) char *uris; uint32_t state; - uc = GNUNET_malloc (sizeof (struct GNUNET_FS_UnindexContext)); + uc = GNUNET_new (struct GNUNET_FS_UnindexContext); uc->h = h; uc->serialization = get_serialization_short_name (filename); rh = GNUNET_BIO_read_open (filename); @@ -2172,6 +2227,7 @@ deserialize_unindex_file (void *cls, const char *filename) if (NULL == uc->ksk_uri) { GNUNET_break (0); + GNUNET_free_non_null (emsg); goto cleanup; } } @@ -2181,7 +2237,7 @@ deserialize_unindex_file (void *cls, const char *filename) { GNUNET_break (0); goto cleanup; - } + } uc->state = (enum UnindexState) state; switch (state) { @@ -2261,7 +2317,8 @@ cleanup: if ((NULL != rh) && (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg))) { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - _("Failed to resume unindexing operation `%s': %s\n"), filename, + _("Failed to resume unindexing operation `%s': %s\n"), + filename, emsg); GNUNET_free (emsg); } @@ -2310,12 +2367,13 @@ deserialize_search (struct GNUNET_FS_Handle *h, * Function called with a filename of serialized search result * to deserialize. * - * @param cls the 'struct GNUNET_FS_SearchContext*' + * @param cls the `struct GNUNET_FS_SearchContext *` * @param filename complete filename (absolute path) - * @return GNUNET_OK (continue to iterate) + * @return #GNUNET_OK (continue to iterate) */ static int -deserialize_search_result (void *cls, const char *filename) +deserialize_search_result (void *cls, + const char *filename) { struct GNUNET_FS_SearchContext *sc = cls; char *ser; @@ -2334,8 +2392,8 @@ deserialize_search_result (void *cls, const char *filename) if (NULL != ser) { remove_sync_file_in_dir (sc->h, - (NULL == sc->psearch_result) - ? GNUNET_FS_SYNC_PATH_MASTER_SEARCH + (NULL == sc->psearch_result) + ? GNUNET_FS_SYNC_PATH_MASTER_SEARCH : GNUNET_FS_SYNC_PATH_CHILD_SEARCH, sc->serialization, ser); GNUNET_free (ser); @@ -2346,7 +2404,8 @@ deserialize_search_result (void *cls, const char *filename) uris = NULL; download = NULL; update_srch = NULL; - sr = GNUNET_malloc (sizeof (struct GNUNET_FS_SearchResult)); + sr = GNUNET_new (struct GNUNET_FS_SearchResult); + sr->h = sc->h; sr->sc = sc; sr->serialization = ser; if ((GNUNET_OK != GNUNET_BIO_read_string (rh, "result-uri", &uris, 10 * 1024)) @@ -2365,7 +2424,7 @@ deserialize_search_result (void *cls, const char *filename) GNUNET_break (0); goto cleanup; } - if (ksk == sr->sc->uri->type) + if (GNUNET_FS_URI_KSK == sr->sc->uri->type) { sr->keyword_bitmap = GNUNET_malloc ((sr->sc->uri->data.ksk.keywordCount + 7) / 8); /* round up, count bits */ if (GNUNET_OK != GNUNET_BIO_read (rh, "keyword-bitmap", @@ -2386,7 +2445,8 @@ deserialize_search_result (void *cls, const char *filename) if (GNUNET_OK != GNUNET_BIO_read_close (drh, &emsg)) { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - _("Failed to resume sub-download `%s': %s\n"), download, + _("Failed to resume sub-download `%s': %s\n"), + download, emsg); GNUNET_free (emsg); } @@ -2403,7 +2463,8 @@ deserialize_search_result (void *cls, const char *filename) if (GNUNET_OK != GNUNET_BIO_read_close (drh, &emsg)) { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - _("Failed to resume sub-search `%s': %s\n"), update_srch, + _("Failed to resume sub-search `%s': %s\n"), + update_srch, emsg); GNUNET_free (emsg); } @@ -2411,7 +2472,8 @@ deserialize_search_result (void *cls, const char *filename) GNUNET_free (update_srch); } GNUNET_break (GNUNET_YES == - GNUNET_CONTAINER_multihashmap_put (sc->master_result_map, &sr->key, sr, + GNUNET_CONTAINER_multihashmap_put (sc->master_result_map, + &sr->key, sr, GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE)); if (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg)) { @@ -2486,13 +2548,15 @@ signal_search_resume (struct GNUNET_FS_SearchContext *sc); * Iterator over search results signaling resume to the client for * each result. * - * @param cls closure, the 'struct GNUNET_FS_SearchContext' + * @param cls closure, the `struct GNUNET_FS_SearchContext *` * @param key current key code - * @param value value in the hash map, the 'struct GNUNET_FS_SearchResult' - * @return GNUNET_YES (we should continue to iterate) + * @param value value in the hash map, the `struct GNUNET_FS_SearchResult *` + * @return #GNUNET_YES (we should continue to iterate) */ static int -signal_result_resume (void *cls, const struct GNUNET_HashCode * key, void *value) +signal_result_resume (void *cls, + const struct GNUNET_HashCode *key, + void *value) { struct GNUNET_FS_SearchContext *sc = cls; struct GNUNET_FS_ProgressInfo pi; @@ -2510,7 +2574,7 @@ signal_result_resume (void *cls, const struct GNUNET_HashCode * key, void *value sr->availability_trials; pi.value.search.specifics.resume_result.applicability_rank = sr->optional_support; - sr->client_info = GNUNET_FS_search_make_status_ (&pi, sc); + sr->client_info = GNUNET_FS_search_make_status_ (&pi, sc->h, sc); } if (NULL != sr->download) { @@ -2538,13 +2602,15 @@ free_search_context (struct GNUNET_FS_SearchContext *sc); /** * Iterator over search results freeing each. * - * @param cls closure, the 'struct GNUNET_FS_SearchContext' + * @param cls closure, the `struct GNUNET_FS_SearchContext *` * @param key current key code - * @param value value in the hash map, the 'struct GNUNET_FS_SearchResult' - * @return GNUNET_YES (we should continue to iterate) + * @param value value in the hash map, the `struct GNUNET_FS_SearchResult *` + * @return #GNUNET_YES (we should continue to iterate) */ static int -free_result (void *cls, const struct GNUNET_HashCode * key, void *value) +free_result (void *cls, + const struct GNUNET_HashCode *key, + void *value) { struct GNUNET_FS_SearchResult *sr = value; @@ -2599,12 +2665,13 @@ free_search_context (struct GNUNET_FS_SearchContext *sc) * Function called with a filename of serialized sub-download * to deserialize. * - * @param cls the 'struct GNUNET_FS_DownloadContext*' (parent) + * @param cls the `struct GNUNET_FS_DownloadContext *` (parent) * @param filename complete filename (absolute path) - * @return GNUNET_OK (continue to iterate) + * @return #GNUNET_OK (continue to iterate) */ static int -deserialize_subdownload (void *cls, const char *filename) +deserialize_subdownload (void *cls, + const char *filename) { struct GNUNET_FS_DownloadContext *parent = cls; char *ser; @@ -2616,9 +2683,9 @@ deserialize_subdownload (void *cls, const char *filename) if (NULL == rh) { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - _ - ("Failed to resume sub-download `%s': could not open file `%s'\n"), - ser, filename); + _("Failed to resume sub-download `%s': could not open file `%s'\n"), + ser, + filename); GNUNET_free (ser); return GNUNET_OK; } @@ -2626,7 +2693,9 @@ deserialize_subdownload (void *cls, const char *filename) if (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg)) { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - _("Failed to resume sub-download `%s': %s\n"), ser, emsg); + _("Failed to resume sub-download `%s': %s\n"), + ser, + emsg); GNUNET_free (emsg); } GNUNET_free (ser); @@ -2656,7 +2725,9 @@ free_download_context (struct GNUNET_FS_DownloadContext *dc) GNUNET_free_non_null (dc->serialization); while (NULL != (dcc = dc->child_head)) { - GNUNET_CONTAINER_DLL_remove (dc->child_head, dc->child_tail, dcc); + GNUNET_CONTAINER_DLL_remove (dc->child_head, + dc->child_tail, + dcc); free_download_context (dcc); } GNUNET_FS_free_download_request_ (dc->top_request); @@ -2691,7 +2762,7 @@ deserialize_download (struct GNUNET_FS_Handle *h, uris = NULL; emsg = NULL; - dc = GNUNET_malloc (sizeof (struct GNUNET_FS_DownloadContext)); + dc = GNUNET_new (struct GNUNET_FS_DownloadContext); dc->parent = parent; dc->h = h; dc->serialization = GNUNET_strdup (serialization); @@ -2722,7 +2793,7 @@ deserialize_download (struct GNUNET_FS_Handle *h, } dc->options = (enum GNUNET_FS_DownloadOptions) options; dc->active = - GNUNET_CONTAINER_multihashmap_create (1 + 2 * (dc->length / DBLOCK_SIZE)); + GNUNET_CONTAINER_multihashmap_create (1 + 2 * (dc->length / DBLOCK_SIZE), GNUNET_NO); dc->has_finished = (int) status; dc->treedepth = GNUNET_FS_compute_depth (GNUNET_FS_uri_chk_get_file_size (dc->uri)); @@ -2741,13 +2812,12 @@ deserialize_download (struct GNUNET_FS_Handle *h, dn = get_download_sync_filename (dc, dc->serialization, ".dir"); if (NULL != dn) { - if (GNUNET_YES == GNUNET_DISK_directory_test (dn)) + if (GNUNET_YES == GNUNET_DISK_directory_test (dn, GNUNET_YES)) GNUNET_DISK_directory_scan (dn, &deserialize_subdownload, dc); GNUNET_free (dn); } if (NULL != parent) { - GNUNET_abort (); // for debugging for now - FIXME GNUNET_CONTAINER_DLL_insert (parent->child_head, parent->child_tail, dc); } if (NULL != search) @@ -2786,7 +2856,7 @@ signal_search_resume (struct GNUNET_FS_SearchContext *sc) pi.value.search.specifics.resume.message = sc->emsg; pi.value.search.specifics.resume.is_paused = (NULL == sc->client) ? GNUNET_YES : GNUNET_NO; - sc->client_info = GNUNET_FS_search_make_status_ (&pi, sc); + sc->client_info = GNUNET_FS_search_make_status_ (&pi, sc->h, sc); GNUNET_CONTAINER_multihashmap_iterate (sc->master_result_map, &signal_result_resume, sc); @@ -2821,7 +2891,7 @@ deserialize_search (struct GNUNET_FS_Handle *h, } uris = NULL; emsg = NULL; - sc = GNUNET_malloc (sizeof (struct GNUNET_FS_SearchContext)); + sc = GNUNET_new (struct GNUNET_FS_SearchContext); if (NULL != psearch_result) { sc->psearch_result = psearch_result; @@ -2829,8 +2899,9 @@ deserialize_search (struct GNUNET_FS_Handle *h, } sc->h = h; sc->serialization = GNUNET_strdup (serialization); - if ((GNUNET_OK != GNUNET_BIO_read_string (rh, "search-uri", &uris, 10 * 1024)) - || (NULL == (sc->uri = GNUNET_FS_uri_parse (uris, &emsg))) || + if ((GNUNET_OK != + GNUNET_BIO_read_string (rh, "search-uri", &uris, 10 * 1024)) || + (NULL == (sc->uri = GNUNET_FS_uri_parse (uris, &emsg))) || ((GNUNET_YES != GNUNET_FS_uri_test_ksk (sc->uri)) && (GNUNET_YES != GNUNET_FS_uri_test_sks (sc->uri))) || (GNUNET_OK != read_start_time (rh, &sc->start_time)) || @@ -2845,16 +2916,15 @@ deserialize_search (struct GNUNET_FS_Handle *h, goto cleanup; } sc->options = (enum GNUNET_FS_SearchOptions) options; - sc->master_result_map = GNUNET_CONTAINER_multihashmap_create (16); + sc->master_result_map = GNUNET_CONTAINER_multihashmap_create (16, GNUNET_NO); dn = get_serialization_file_name_in_dir (h, - (sc->psearch_result == - NULL) ? + (NULL == sc->psearch_result) ? GNUNET_FS_SYNC_PATH_MASTER_SEARCH : GNUNET_FS_SYNC_PATH_CHILD_SEARCH, sc->serialization, ""); if (NULL != dn) { - if (GNUNET_YES == GNUNET_DISK_directory_test (dn)) + if (GNUNET_YES == GNUNET_DISK_directory_test (dn, GNUNET_YES)) GNUNET_DISK_directory_scan (dn, &deserialize_search_result, sc); GNUNET_free (dn); } @@ -2862,8 +2932,7 @@ deserialize_search (struct GNUNET_FS_Handle *h, (GNUNET_OK != GNUNET_FS_search_start_searching_ (sc))) { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - _ - ("Could not resume running search, will resume as paused search\n")); + _("Could not resume running search, will resume as paused search\n")); } signal_search_resume (sc); GNUNET_free (uris); @@ -2880,12 +2949,13 @@ cleanup: * Function called with a filename of serialized search operation * to deserialize. * - * @param cls the 'struct GNUNET_FS_Handle*' + * @param cls the `struct GNUNET_FS_Handle *` * @param filename complete filename (absolute path) - * @return GNUNET_OK (continue to iterate) + * @return #GNUNET_OK (continue to iterate) */ static int -deserialize_search_file (void *cls, const char *filename) +deserialize_search_file (void *cls, + const char *filename) { struct GNUNET_FS_Handle *h = cls; char *ser; @@ -2931,9 +3001,9 @@ deserialize_search_file (void *cls, const char *filename) * Function called with a filename of serialized download operation * to deserialize. * - * @param cls the 'struct GNUNET_FS_Handle*' + * @param cls the `struct GNUNET_FS_Handle *` * @param filename complete filename (absolute path) - * @return GNUNET_OK (continue to iterate) + * @return #GNUNET_OK (continue to iterate) */ static int deserialize_download_file (void *cls, const char *filename) @@ -2981,7 +3051,7 @@ deserialization_master (const char *master_path, GNUNET_FileNameCallback proc, dn = get_serialization_file_name (h, master_path, ""); if (NULL == dn) return; - if (GNUNET_YES == GNUNET_DISK_directory_test (dn)) + if (GNUNET_YES == GNUNET_DISK_directory_test (dn, GNUNET_YES)) GNUNET_DISK_directory_scan (dn, proc, h); GNUNET_free (dn); } @@ -2993,21 +3063,23 @@ deserialization_master (const char *master_path, GNUNET_FileNameCallback proc, * @param cfg configuration to use * @param client_name unique identifier for this client * @param upcb function to call to notify about FS actions - * @param upcb_cls closure for upcb + * @param upcb_cls closure for @a upcb * @param flags specific attributes for fs-operations - * @param ... list of optional options, terminated with GNUNET_FS_OPTIONS_END + * @param ... list of optional options, terminated with #GNUNET_FS_OPTIONS_END * @return NULL on error */ struct GNUNET_FS_Handle * GNUNET_FS_start (const struct GNUNET_CONFIGURATION_Handle *cfg, - const char *client_name, GNUNET_FS_ProgressCallback upcb, - void *upcb_cls, enum GNUNET_FS_Flags flags, ...) + const char *client_name, + GNUNET_FS_ProgressCallback upcb, + void *upcb_cls, + enum GNUNET_FS_Flags flags, ...) { struct GNUNET_FS_Handle *ret; enum GNUNET_FS_OPTIONS opt; va_list ap; - ret = GNUNET_malloc (sizeof (struct GNUNET_FS_Handle)); + ret = GNUNET_new (struct GNUNET_FS_Handle); ret->cfg = cfg; ret->client_name = GNUNET_strdup (client_name); ret->upcb = upcb; @@ -3058,18 +3130,18 @@ GNUNET_FS_start (const struct GNUNET_CONFIGURATION_Handle *cfg, * The callback given to GNUNET_FS_start will no longer be * called after this function returns. * - * @param h handle that was returned from GNUNET_FS_start + * @param h handle that was returned from #GNUNET_FS_start() */ void GNUNET_FS_stop (struct GNUNET_FS_Handle *h) { while (h->top_head != NULL) h->top_head->ssf (h->top_head->ssf_cls); - if (h->queue_job != GNUNET_SCHEDULER_NO_TASK) + if (h->queue_job != NULL) GNUNET_SCHEDULER_cancel (h->queue_job); GNUNET_free (h->client_name); GNUNET_free (h); } -/* end of fs.c */ +/* end of fs_api.c */