* unindexing. Signal the client.
*
* @param uc context for the failed unindexing operation
- * @param emsg the error message
*/
static void
-signal_unindex_error (struct GNUNET_FS_UnindexContext *uc,
- const char *emsg)
+signal_unindex_error (struct GNUNET_FS_UnindexContext *uc)
{
struct GNUNET_FS_ProgressInfo pi;
pi.status = GNUNET_FS_STATUS_UNINDEX_ERROR;
pi.value.unindex.eta = GNUNET_TIME_UNIT_FOREVER_REL;
- pi.value.unindex.specifics.error.message = emsg;
+ pi.value.unindex.specifics.error.message = uc->emsg;
GNUNET_FS_unindex_make_status_ (&pi, uc, 0);
}
struct GNUNET_FS_UnindexContext *uc = cls;
if (success == GNUNET_SYSERR)
{
- signal_unindex_error (uc,
- msg);
+ uc->emsg = GNUNET_strdup (msg);
+ signal_unindex_error (uc);
return;
- }
-
+ }
GNUNET_FS_tree_encoder_next (uc->tc);
}
query,
size,
data,
+ -2, 1,
+ GNUNET_CONSTANTS_SERVICE_TIMEOUT,
&process_cont,
- uc,
- GNUNET_CONSTANTS_SERVICE_TIMEOUT);
+ uc);
}
GNUNET_FS_tree_encoder_finish (uc->tc,
&uri,
&emsg);
+ uc->tc = NULL;
if (uri != NULL)
GNUNET_FS_uri_destroy (uri);
GNUNET_DISK_file_close (uc->fh);
uc->dsh = NULL;
if (emsg != NULL)
{
- signal_unindex_error (uc, emsg);
- GNUNET_free (emsg);
+ uc->state = UNINDEX_STATE_ERROR;
+ uc->emsg = emsg;
+ signal_unindex_error (uc);
}
- else
+ else
{
+ uc->state = UNINDEX_STATE_COMPLETE;
pi.status = GNUNET_FS_STATUS_UNINDEX_COMPLETED;
pi.value.unindex.eta = GNUNET_TIME_UNIT_ZERO;
GNUNET_FS_unindex_make_status_ (&pi, uc, uc->file_size);
}
+ GNUNET_FS_unindex_sync_ (uc);
}
}
if (uc->state != UNINDEX_STATE_FS_NOTIFY)
{
- GNUNET_FS_unindex_stop (uc);
+ uc->state = UNINDEX_STATE_ERROR;
+ uc->emsg = GNUNET_strdup (_("Unexpected time for a response from `fs' service."));
+ GNUNET_FS_unindex_sync_ (uc);
+ signal_unindex_error (uc);
return;
}
if (NULL == msg)
{
uc->state = UNINDEX_STATE_ERROR;
- signal_unindex_error (uc,
- _("Timeout waiting for `fs' service."));
+ uc->emsg = GNUNET_strdup (_("Timeout waiting for `fs' service."));
+ GNUNET_FS_unindex_sync_ (uc);
+ signal_unindex_error (uc);
return;
}
if (ntohs(msg->type) != GNUNET_MESSAGE_TYPE_FS_UNINDEX_OK)
{
uc->state = UNINDEX_STATE_ERROR;
- signal_unindex_error (uc,
- _("Invalid response from `fs' service."));
+ uc->emsg = GNUNET_strdup (_("Invalid response from `fs' service."));
+ GNUNET_FS_unindex_sync_ (uc);
+ signal_unindex_error (uc);
return;
}
uc->state = UNINDEX_STATE_DS_REMOVE;
+ GNUNET_FS_unindex_sync_ (uc);
GNUNET_FS_unindex_do_remove_ (uc);
}
if (NULL == uc->dsh)
{
uc->state = UNINDEX_STATE_ERROR;
- signal_unindex_error (uc,
- _("Failed to connect to `datastore' service."));
+ uc->emsg = GNUNET_strdup (_("Failed to connect to `datastore' service."));
+ GNUNET_FS_unindex_sync_ (uc);
+ signal_unindex_error (uc);
return;
}
uc->fh = GNUNET_DISK_file_open (uc->filename,
GNUNET_DATASTORE_disconnect (uc->dsh, GNUNET_NO);
uc->dsh = NULL;
uc->state = UNINDEX_STATE_ERROR;
- signal_unindex_error (uc,
- _("Failed to open file for unindexing."));
+ uc->emsg = GNUNET_strdup (_("Failed to open file for unindexing."));
+ GNUNET_FS_unindex_sync_ (uc);
+ signal_unindex_error (uc);
return;
}
uc->tc = GNUNET_FS_tree_encoder_create (uc->h,
struct GNUNET_FS_UnindexContext *uc = cls;
struct UnindexMessage req;
+ uc->fhc = NULL;
if (uc->state != UNINDEX_STATE_HASHING)
{
GNUNET_FS_unindex_stop (uc);
if (file_id == NULL)
{
uc->state = UNINDEX_STATE_ERROR;
- signal_unindex_error (uc,
- _("Failed to compute hash of file."));
+ uc->emsg = GNUNET_strdup (_("Failed to compute hash of file."));
+ GNUNET_FS_unindex_sync_ (uc);
+ signal_unindex_error (uc);
return;
}
uc->file_id = *file_id;
uc->state = UNINDEX_STATE_FS_NOTIFY;
+ GNUNET_FS_unindex_sync_ (uc);
uc->client = GNUNET_CLIENT_connect (uc->h->sched,
"fs",
uc->h->cfg);
}
+/**
+ * Create SUSPEND event for the given unindex operation
+ * and then clean up our state (without stop signal).
+ *
+ * @param cls the 'struct GNUNET_FS_UnindexContext' to signal for
+ */
+void
+GNUNET_FS_unindex_signal_suspend_ (void *cls)
+{
+ struct GNUNET_FS_UnindexContext *uc = cls;
+ struct GNUNET_FS_ProgressInfo pi;
+
+ if (uc->fhc != NULL)
+ {
+ GNUNET_CRYPTO_hash_file_cancel (uc->fhc);
+ uc->fhc = NULL;
+ }
+ if (uc->client != NULL)
+ {
+ GNUNET_CLIENT_disconnect (uc->client, GNUNET_NO);
+ uc->client = NULL;
+ }
+ if (NULL != uc->dsh)
+ {
+ GNUNET_DATASTORE_disconnect (uc->dsh, GNUNET_NO);
+ uc->dsh = NULL;
+ }
+ if (NULL != uc->tc)
+ {
+ GNUNET_FS_tree_encoder_finish (uc->tc,
+ NULL,
+ NULL);
+ uc->tc = NULL;
+ }
+ if (uc->fh != NULL)
+ {
+ GNUNET_DISK_file_close (uc->fh);
+ uc->fh = NULL;
+ }
+ GNUNET_FS_end_top (uc->h, uc->top);
+ pi.status = GNUNET_FS_STATUS_UNINDEX_SUSPEND;
+ GNUNET_FS_unindex_make_status_ (&pi, uc,
+ (uc->state == UNINDEX_STATE_COMPLETE)
+ ? uc->file_size : 0);
+ GNUNET_break (NULL == uc->client_info);
+ GNUNET_free (uc->filename);
+ GNUNET_free_non_null (uc->serialization);
+ GNUNET_free (uc);
+}
+
+
/**
* Unindex a file.
*
ret->start_time = GNUNET_TIME_absolute_get ();
ret->file_size = size;
ret->client_info = cctx;
-
- // FIXME: make persistent!
+ GNUNET_FS_unindex_sync_ (ret);
pi.status = GNUNET_FS_STATUS_UNINDEX_START;
pi.value.unindex.eta = GNUNET_TIME_UNIT_FOREVER_REL;
GNUNET_FS_unindex_make_status_ (&pi, ret, 0);
- GNUNET_CRYPTO_hash_file (h->sched,
- GNUNET_SCHEDULER_PRIORITY_IDLE,
- filename,
- HASHING_BLOCKSIZE,
- &GNUNET_FS_unindex_process_hash_,
- ret);
+ ret->fhc = GNUNET_CRYPTO_hash_file (h->sched,
+ GNUNET_SCHEDULER_PRIORITY_IDLE,
+ filename,
+ HASHING_BLOCKSIZE,
+ &GNUNET_FS_unindex_process_hash_,
+ ret);
+ ret->top = GNUNET_FS_make_top (h,
+ &GNUNET_FS_unindex_signal_suspend_,
+ ret);
return ret;
}
GNUNET_FS_unindex_stop (struct GNUNET_FS_UnindexContext *uc)
{
struct GNUNET_FS_ProgressInfo pi;
-
- if ( (uc->state != UNINDEX_STATE_COMPLETE) &&
- (uc->state != UNINDEX_STATE_ERROR) )
+
+ if (uc->fhc != NULL)
{
- uc->state = UNINDEX_STATE_ABORTED;
- return;
+ GNUNET_CRYPTO_hash_file_cancel (uc->fhc);
+ uc->fhc = NULL;
}
+ if (uc->client != NULL)
+ {
+ GNUNET_CLIENT_disconnect (uc->client, GNUNET_NO);
+ uc->client = NULL;
+ }
+ if (NULL != uc->dsh)
+ {
+ GNUNET_DATASTORE_disconnect (uc->dsh, GNUNET_NO);
+ uc->dsh = NULL;
+ }
+ if (NULL != uc->tc)
+ {
+ GNUNET_FS_tree_encoder_finish (uc->tc,
+ NULL,
+ NULL);
+ uc->tc = NULL;
+ }
+ if (uc->fh != NULL)
+ {
+ GNUNET_DISK_file_close (uc->fh);
+ uc->fh = NULL;
+ }
+ GNUNET_FS_end_top (uc->h, uc->top);
if (uc->serialization != NULL)
{
- GNUNET_FS_remove_sync_file_ (uc->h, "unindex", uc->serialization);
+ GNUNET_FS_remove_sync_file_ (uc->h, GNUNET_FS_SYNC_PATH_MASTER_UNINDEX, uc->serialization);
+ GNUNET_free (uc->serialization);
uc->serialization = NULL;
}
pi.status = GNUNET_FS_STATUS_UNINDEX_STOPPED;
? uc->file_size : 0);
GNUNET_break (NULL == uc->client_info);
GNUNET_free (uc->filename);
- GNUNET_free_non_null (uc->serialization);
GNUNET_free (uc);
}
projects / oweals / gnunet.git / blobdiff