[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r8913 - in gnunet/src: fs include util
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r8913 - in gnunet/src: fs include util |
|
Date: |
Mon, 31 Aug 2009 15:14:22 -0600 |
Author: grothoff
Date: 2009-08-31 15:14:22 -0600 (Mon, 31 Aug 2009)
New Revision: 8913
Added:
gnunet/src/fs/fs_list_indexed.c
Modified:
gnunet/src/fs/Makefile.am
gnunet/src/fs/fs.h
gnunet/src/fs/fs_publish.c
gnunet/src/fs/fs_unindex.c
gnunet/src/include/gnunet_disk_lib.h
gnunet/src/include/gnunet_protocols.h
gnunet/src/util/disk.c
Log:
working on unindex
Modified: gnunet/src/fs/Makefile.am
===================================================================
--- gnunet/src/fs/Makefile.am 2009-08-31 17:14:21 UTC (rev 8912)
+++ gnunet/src/fs/Makefile.am 2009-08-31 21:14:22 UTC (rev 8913)
@@ -19,6 +19,7 @@
fs_download.c \
fs_file_information.c \
fs_getopt.c \
+ fs_list_indexed.c \
fs_publish.c \
fs_namespace.c \
fs_search.c \
Modified: gnunet/src/fs/fs.h
===================================================================
--- gnunet/src/fs/fs.h 2009-08-31 17:14:21 UTC (rev 8912)
+++ gnunet/src/fs/fs.h 2009-08-31 21:14:22 UTC (rev 8913)
@@ -52,7 +52,16 @@
#define MAX_INLINE_SIZE 65536
+/**
+ * Blocksize to use when hashing files
+ * for indexing (blocksize for IO, not for
+ * the DBlocks). Larger blocksizes can
+ * be more efficient but will be more disruptive
+ * as far as the scheduler is concerned.
+ */
+#define HASHING_BLOCKSIZE (1024 * 1024)
+
/**
* @brief content hash key
*/
@@ -491,10 +500,106 @@
/**
+ * Phases of unindex processing (state machine).
+ */
+enum UnindexState
+ {
+ /**
+ * We're currently hashing the file.
+ */
+ UNINDEX_STATE_HASHING = 0,
+
+ /**
+ * We're notifying the FS service about
+ * the unindexing.
+ */
+ UNINDEX_STATE_FS_NOTIFY = 1,
+
+ /**
+ * We're telling the datastore to delete
+ * the respective entries.
+ */
+ UNINDEX_STATE_DS_REMOVE = 2,
+
+ /**
+ * We're done.
+ */
+ UNINDEX_STATE_COMPLETE = 3,
+
+ /**
+ * We've encountered a fatal error.
+ */
+ UNINDEX_STATE_ERROR = 4,
+
+ /**
+ * We've been aborted. The next callback should clean up the
+ * struct.
+ */
+ UNINDEX_STATE_ABORTED = 5
+ };
+
+
+/**
* Handle for controlling an unindexing operation.
*/
struct GNUNET_FS_UnindexContext
{
+
+ /**
+ * Global FS context.
+ */
+ struct GNUNET_FS_Handle *h;
+
+ /**
+ * Name of the file that we are unindexing.
+ */
+ char *filename;
+
+ /**
+ * Connection to the FS service,
+ * only valid during the UNINDEX_STATE_FS_NOTIFY
+ * phase.
+ */
+ struct GNUNET_CLIENT_Connection *client;
+
+ /**
+ * Connection to the datastore service,
+ * only valid during the UNINDEX_STATE_DS_NOTIFY
+ * phase.
+ */
+ struct GNUNET_DATASTORE_Handle *dsh;
+
+ /**
+ * Pointer kept for the client.
+ */
+ void *client_info;
+
+ /**
+ * Overall size of the file.
+ */
+ uint64_t file_size;
+
+ /**
+ * How far have we gotten?
+ */
+ uint64_t unindex_offset;
+
+ /**
+ * When did we start?
+ */
+ struct GNUNET_TIME_Absolute start_time;
+
+ /**
+ * Hash of the file's contents (once
+ * computed).
+ */
+ GNUNET_HashCode file_id;
+
+ /**
+ * Current operatinonal phase.
+ */
+ enum UnindexState state;
+
};
@@ -695,6 +800,38 @@
};
+/**
+ * Message sent from a GNUnet (fs) unindexing
+ * activity to the gnunet-fs-service to
+ * indicate that a file will be unindexed. The service
+ * is supposed to remove the file from the
+ * list of indexed files and response with
+ * a confirmation message (even if the file
+ * was already not on the list).
+ */
+struct UnindexMessage
+{
+
+ /**
+ * Message type will be
+ * GNUNET_MESSAGE_TYPE_FS_UNINDEX.
+ */
+ struct GNUNET_MessageHeader header;
+
+ /**
+ * Always zero.
+ */
+ uint32_t reserved;
+
+ /**
+ * Hash of the file that we will unindex.
+ */
+ GNUNET_HashCode file_id;
+
+};
+
+
+
#endif
/* end of fs.h */
Copied: gnunet/src/fs/fs_list_indexed.c (from rev 8904,
gnunet/src/fs/fs_unindex.c)
===================================================================
--- gnunet/src/fs/fs_list_indexed.c (rev 0)
+++ gnunet/src/fs/fs_list_indexed.c 2009-08-31 21:14:22 UTC (rev 8913)
@@ -0,0 +1,252 @@
+/*
+ This file is part of GNUnet.
+ (C) 2003, 2004, 2006, 2009 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
+ by the Free Software Foundation; either version 2, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING. If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file fs/fs_list_indexed.c
+ * @author Christian Grothoff
+ * @brief provide a list of all indexed files
+ */
+
+#include "platform.h"
+#include "gnunet_constants.h"
+#include "gnunet_fs_service.h"
+#include "gnunet_protocols.h"
+#include "fs.h"
+
+
+/**
+ * Context for "GNUNET_FS_get_indexed_files".
+ */
+struct GetIndexedContext
+{
+ /**
+ * Handle to global FS context.
+ */
+ struct GNUNET_FS_Handle *h;
+
+ /**
+ * Connection to the FS service.
+ */
+ struct GNUNET_CLIENT_Connection *client;
+
+ /**
+ * Function to call for each indexed file.
+ */
+ GNUNET_FS_IndexedFileProcessor iterator;
+
+ /**
+ * Closure for iterator.
+ */
+ void *iterator_cls;
+
+ /**
+ * Continuation to trigger at the end.
+ */
+ GNUNET_SCHEDULER_Task cont;
+
+ /**
+ * Closure for cont.
+ */
+ void *cont_cls;
+};
+
+
+/**
+ * Function called on each response from the FS
+ * service with information about indexed files.
+ *
+ * @param cls closure (of type "struct GetIndexedContext*")
+ * @param msg message with indexing information
+ */
+static void
+handle_index_info (void *cls,
+ const struct GNUNET_MessageHeader *msg)
+{
+ struct GetIndexedContext *gic = cls;
+ const struct IndexInfoMessage *iim;
+ uint16_t msize;
+ const char *filename;
+
+ if (NULL == msg)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Failed to receive response for `%s' request from `%s'
service.\n"),
+ "GET_INDEXED",
+ "fs");
+ GNUNET_SCHEDULER_add_continuation (gic->h->sched,
+ GNUNET_NO,
+ gic->cont,
+ gic->cont_cls,
+ GNUNET_SCHEDULER_REASON_TIMEOUT);
+ GNUNET_CLIENT_disconnect (gic->client);
+ GNUNET_free (gic);
+ return;
+ }
+ if (ntohs (msg->type) == GNUNET_MESSAGE_TYPE_FS_INDEX_LIST_END)
+ {
+ /* normal end-of-list */
+ GNUNET_SCHEDULER_add_continuation (gic->h->sched,
+ GNUNET_NO,
+ gic->cont,
+ gic->cont_cls,
+ GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ GNUNET_CLIENT_disconnect (gic->client);
+ GNUNET_free (gic);
+ return;
+ }
+ msize = ntohs (msg->size);
+ iim = (const struct IndexInfoMessage*) msg;
+ filename = (const char*) &iim[1];
+ if ( (ntohs (msg->type) != GNUNET_MESSAGE_TYPE_FS_INDEX_LIST_ENTRY) ||
+ (msize <= sizeof (struct IndexInfoMessage)) ||
+ (filename[msize-sizeof (struct IndexInfoMessage) -1] != '\0') )
+ {
+ /* bogus reply */
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Failed to receive valid response for `%s' request from
`%s' service.\n"),
+ "GET_INDEXED",
+ "fs");
+ GNUNET_SCHEDULER_add_continuation (gic->h->sched,
+ GNUNET_NO,
+ gic->cont,
+ gic->cont_cls,
+ GNUNET_SCHEDULER_REASON_TIMEOUT);
+ GNUNET_CLIENT_disconnect (gic->client);
+ GNUNET_free (gic);
+ return;
+ }
+ if (GNUNET_OK !=
+ gic->iterator (gic->iterator_cls,
+ filename,
+ &iim->file_id))
+ {
+ GNUNET_SCHEDULER_add_continuation (gic->h->sched,
+ GNUNET_NO,
+ gic->cont,
+ gic->cont_cls,
+ GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ GNUNET_CLIENT_disconnect (gic->client);
+ GNUNET_free (gic);
+ return;
+ }
+ /* get more */
+ GNUNET_CLIENT_receive (gic->client,
+ &handle_index_info,
+ gic,
+ GNUNET_CONSTANTS_SERVICE_TIMEOUT);
+}
+
+
+/**
+ * Transmit the request to get a list of all
+ * indexed files to the "FS" service.
+ *
+ * @param cls closure (of type "struct GetIndexedContext*")
+ * @param size number of bytes availabe in buf
+ * @param buf where to write the message, NULL on error
+ * @return number of bytes written to buf
+ */
+static size_t
+transmit_get_indexed (void *cls,
+ size_t size,
+ void *buf)
+{
+ struct GetIndexedContext *gic = cls;
+ struct GNUNET_MessageHeader *hdr;
+
+ if (NULL == buf)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Failed to transmit `%s' request to `%s' service.\n"),
+ "GET_INDEXED",
+ "fs");
+ GNUNET_SCHEDULER_add_continuation (gic->h->sched,
+ GNUNET_NO,
+ gic->cont,
+ gic->cont_cls,
+ GNUNET_SCHEDULER_REASON_TIMEOUT);
+ GNUNET_CLIENT_disconnect (gic->client);
+ GNUNET_free (gic);
+ return 0;
+ }
+ GNUNET_assert (size >= sizeof (struct GNUNET_MessageHeader));
+ hdr = buf;
+ hdr->size = htons (sizeof (struct GNUNET_MessageHeader));
+ hdr->type = htons (GNUNET_MESSAGE_TYPE_FS_INDEX_LIST_GET);
+ GNUNET_CLIENT_receive (gic->client,
+ &handle_index_info,
+ gic,
+ GNUNET_CONSTANTS_SERVICE_TIMEOUT);
+ return sizeof (struct GNUNET_MessageHeader);
+}
+
+
+/**
+ * Iterate over all indexed files.
+ *
+ * @param h handle to the file sharing subsystem
+ * @param iterator function to call on each indexed file
+ * @param iterator_cls closure for iterator
+ * @param cont continuation to call when done;
+ * reason should be "TIMEOUT" (on
+ * error) or "PREREQ_DONE" (on success)
+ * @param cont_cls closure for cont
+ */
+void
+GNUNET_FS_get_indexed_files (struct GNUNET_FS_Handle *h,
+ GNUNET_FS_IndexedFileProcessor iterator,
+ void *iterator_cls,
+ GNUNET_SCHEDULER_Task cont,
+ void *cont_cls)
+{
+ struct GNUNET_CLIENT_Connection *client;
+ struct GetIndexedContext *gic;
+
+ client = GNUNET_CLIENT_connect (h->sched,
+ "fs",
+ h->cfg);
+ if (NULL == client)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Failed to not connect to `%s' service.\n"),
+ "fs");
+ GNUNET_SCHEDULER_add_continuation (h->sched,
+ GNUNET_NO,
+ cont,
+ cont_cls,
+ GNUNET_SCHEDULER_REASON_TIMEOUT);
+ return;
+ }
+
+ gic = GNUNET_malloc (sizeof (struct GetIndexedContext));
+ gic->h = h;
+ gic->client = client;
+ gic->iterator = iterator;
+ gic->iterator_cls = iterator_cls;
+ gic->cont = cont;
+ gic->cont_cls = cont_cls;
+ GNUNET_CLIENT_notify_transmit_ready (client,
+ sizeof (struct GNUNET_MessageHeader),
+ GNUNET_CONSTANTS_SERVICE_TIMEOUT,
+ &transmit_get_indexed,
+ gic);
+}
+
+/* end of fs_list_indexed.c */
Modified: gnunet/src/fs/fs_publish.c
===================================================================
--- gnunet/src/fs/fs_publish.c 2009-08-31 17:14:21 UTC (rev 8912)
+++ gnunet/src/fs/fs_publish.c 2009-08-31 21:14:22 UTC (rev 8913)
@@ -53,15 +53,6 @@
#define MAX_SBLOCK_SIZE 60000
/**
- * Blocksize to use when hashing files
- * for indexing (blocksize for IO, not for
- * the DBlocks). Larger blocksizes can
- * be more efficient but will be more disruptive
- * as far as the scheduler is concerned.
- */
-#define HASHING_BLOCKSIZE (1024 * 1024)
-
-/**
* Main function that performs the upload.
* @param cls "struct GNUNET_FS_PublishContext" identifies the upload
* @param tc task context
Modified: gnunet/src/fs/fs_unindex.c
===================================================================
--- gnunet/src/fs/fs_unindex.c 2009-08-31 17:14:21 UTC (rev 8912)
+++ gnunet/src/fs/fs_unindex.c 2009-08-31 21:14:22 UTC (rev 8913)
@@ -27,7 +27,6 @@
* TODO:
* - code cleanup (share more with upload.c)
*/
-
#include "platform.h"
#include "gnunet_constants.h"
#include "gnunet_fs_service.h"
@@ -35,222 +34,144 @@
#include "fs.h"
+
+
/**
- * Context for "GNUNET_FS_get_indexed_files".
+ * Fill in all of the generic fields for
+ * an unindex event.
+ *
+ * @param pc structure to fill in
+ * @param sc overall unindex context
*/
-struct GetIndexedContext
+static void
+make_unindex_status (struct GNUNET_FS_ProgressInfo *pi,
+ struct GNUNET_FS_UnindexContext *uc)
{
- /**
- * Handle to global FS context.
- */
- struct GNUNET_FS_Handle *h;
+ pi->value.unindex.uc = uc;
+ pi->value.unindex.cctx = uc->client_info;
+ pi->value.unindex.filename = uc->filename;
+ pi->value.unindex.size = uc->file_size;
+ pi->value.unindex.eta
+ = GNUNET_TIME_calculate_eta (uc->start_time,
+ uc->unindex_offset,
+ uc->file_size);
+ pi->value.publish.duration = GNUNET_TIME_absolute_get_duration
(uc->start_time);
+ pi->value.publish.completed = uc->unindex_offset;
+}
- /**
- * Connection to the FS service.
- */
- struct GNUNET_CLIENT_Connection *client;
- /**
- * Function to call for each indexed file.
- */
- GNUNET_FS_IndexedFileProcessor iterator;
+/**
+ * We've encountered an error during
+ * 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)
+{
+ struct GNUNET_FS_ProgressInfo pi;
+
+ pi.status = GNUNET_FS_STATUS_UNINDEX_ERROR;
+ make_unindex_status (&pi, uc);
+ pi.value.unindex.eta = GNUNET_TIME_UNIT_FOREVER_REL;
+ pi.value.unindex.specifics.error.message = emsg;
+ uc->client_info
+ = uc->h->upcb (uc->h->upcb_cls,
+ &pi);
+}
- /**
- * Closure for iterator.
- */
- void *iterator_cls;
- /**
- * Continuation to trigger at the end.
- */
- GNUNET_SCHEDULER_Task cont;
-
- /**
- * Closure for cont.
- */
- void *cont_cls;
-};
-
-
/**
- * Function called on each response from the FS
- * service with information about indexed files.
+ * Function called with the response from the
+ * FS service to our unindexing request.
*
- * @param cls closure (of type "struct GetIndexedContext*")
- * @param msg message with indexing information
+ * @param cls closure, unindex context
+ * @param msg NULL on timeout, otherwise the response
*/
static void
-handle_index_info (void *cls,
- const struct GNUNET_MessageHeader *msg)
+process_fs_response (void *cls,
+ const struct GNUNET_MessageHeader *msg)
{
- struct GetIndexedContext *gic = cls;
- const struct IndexInfoMessage *iim;
- uint16_t msize;
- const char *filename;
+ struct GNUNET_FS_UnindexContext *uc = cls;
- if (NULL == msg)
+ GNUNET_CLIENT_disconnect (uc->client);
+ uc->client = NULL;
+ if (uc->state != UNINDEX_STATE_FS_NOTIFY)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Failed to receive response for `%s' request from `%s'
service.\n"),
- "GET_INDEXED",
- "fs");
- GNUNET_SCHEDULER_add_continuation (gic->h->sched,
- GNUNET_NO,
- gic->cont,
- gic->cont_cls,
- GNUNET_SCHEDULER_REASON_TIMEOUT);
- GNUNET_CLIENT_disconnect (gic->client);
- GNUNET_free (gic);
+ GNUNET_FS_unindex_stop (uc);
return;
}
- if (ntohs (msg->type) == GNUNET_MESSAGE_TYPE_FS_INDEX_LIST_END)
+ if (NULL == msg)
{
- /* normal end-of-list */
- GNUNET_SCHEDULER_add_continuation (gic->h->sched,
- GNUNET_NO,
- gic->cont,
- gic->cont_cls,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
- GNUNET_CLIENT_disconnect (gic->client);
- GNUNET_free (gic);
+ uc->state = UNINDEX_STATE_ERROR;
+ signal_unindex_error (uc,
+ _("Timeout waiting for `fs' service."));
return;
}
- msize = ntohs (msg->size);
- iim = (const struct IndexInfoMessage*) msg;
- filename = (const char*) &iim[1];
- if ( (ntohs (msg->type) != GNUNET_MESSAGE_TYPE_FS_INDEX_LIST_ENTRY) ||
- (msize <= sizeof (struct IndexInfoMessage)) ||
- (filename[msize-sizeof (struct IndexInfoMessage) -1] != '\0') )
+ if (ntohs(msg->type) != GNUNET_MESSAGE_TYPE_FS_UNINDEX_OK)
{
- /* bogus reply */
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Failed to receive valid response for `%s' request from
`%s' service.\n"),
- "GET_INDEXED",
- "fs");
- GNUNET_SCHEDULER_add_continuation (gic->h->sched,
- GNUNET_NO,
- gic->cont,
- gic->cont_cls,
- GNUNET_SCHEDULER_REASON_TIMEOUT);
- GNUNET_CLIENT_disconnect (gic->client);
- GNUNET_free (gic);
- return;
+ uc->state = UNINDEX_STATE_ERROR;
+ signal_unindex_error (uc,
+ _("Invalid response from `fs' service."));
+ return;
}
- if (GNUNET_OK !=
- gic->iterator (gic->iterator_cls,
- filename,
- &iim->file_id))
+ uc->state = UNINDEX_STATE_DS_REMOVE;
+ uc->dsh = GNUNET_DATASTORE_connect (uc->h->cfg,
+ uc->h->sched);
+ if (NULL == uc->dsh)
{
- GNUNET_SCHEDULER_add_continuation (gic->h->sched,
- GNUNET_NO,
- gic->cont,
- gic->cont_cls,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
- GNUNET_CLIENT_disconnect (gic->client);
- GNUNET_free (gic);
+ uc->state = UNINDEX_STATE_ERROR;
+ signal_unindex_error (uc,
+ _("Failed to connect to `datastore' service."));
return;
}
- /* get more */
- GNUNET_CLIENT_receive (gic->client,
- &handle_index_info,
- gic,
- GNUNET_CONSTANTS_SERVICE_TIMEOUT);
+
+ // FIXME: call shared code with publishing...
}
/**
- * Transmit the request to get a list of all
- * indexed files to the "FS" service.
+ * Function called once the hash of the file
+ * that is being unindexed has been computed.
*
- * @param cls closure (of type "struct GetIndexedContext*")
- * @param size number of bytes availabe in buf
- * @param buf where to write the message, NULL on error
- * @return number of bytes written to buf
+ * @param cls closure, unindex context
+ * @param file_id computed hash, NULL on error
*/
-static size_t
-transmit_get_indexed (void *cls,
- size_t size,
- void *buf)
+static void
+process_hash (void *cls,
+ const GNUNET_HashCode *file_id)
{
- struct GetIndexedContext *gic = cls;
- struct GNUNET_MessageHeader *hdr;
+ struct GNUNET_FS_UnindexContext *uc = cls;
+ struct UnindexMessage req;
- if (NULL == buf)
+ if (uc->state != UNINDEX_STATE_HASHING)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Failed to transmit `%s' request to `%s' service.\n"),
- "GET_INDEXED",
- "fs");
- GNUNET_SCHEDULER_add_continuation (gic->h->sched,
- GNUNET_NO,
- gic->cont,
- gic->cont_cls,
- GNUNET_SCHEDULER_REASON_TIMEOUT);
- GNUNET_CLIENT_disconnect (gic->client);
- GNUNET_free (gic);
- return 0;
+ GNUNET_FS_unindex_stop (uc);
+ return;
}
- GNUNET_assert (size >= sizeof (struct GNUNET_MessageHeader));
- hdr = buf;
- hdr->size = htons (sizeof (struct GNUNET_MessageHeader));
- hdr->type = htons (GNUNET_MESSAGE_TYPE_FS_INDEX_LIST_GET);
- GNUNET_CLIENT_receive (gic->client,
- &handle_index_info,
- gic,
- GNUNET_CONSTANTS_SERVICE_TIMEOUT);
- return sizeof (struct GNUNET_MessageHeader);
-}
-
-
-/**
- * Iterate over all indexed files.
- *
- * @param h handle to the file sharing subsystem
- * @param iterator function to call on each indexed file
- * @param iterator_cls closure for iterator
- * @param cont continuation to call when done;
- * reason should be "TIMEOUT" (on
- * error) or "PREREQ_DONE" (on success)
- * @param cont_cls closure for cont
- */
-void
-GNUNET_FS_get_indexed_files (struct GNUNET_FS_Handle *h,
- GNUNET_FS_IndexedFileProcessor iterator,
- void *iterator_cls,
- GNUNET_SCHEDULER_Task cont,
- void *cont_cls)
-{
- struct GNUNET_CLIENT_Connection *client;
- struct GetIndexedContext *gic;
-
- client = GNUNET_CLIENT_connect (h->sched,
- "fs",
- h->cfg);
- if (NULL == client)
+ if (file_id == NULL)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Failed to not connect to `%s' service.\n"),
- "fs");
- GNUNET_SCHEDULER_add_continuation (h->sched,
- GNUNET_NO,
- cont,
- cont_cls,
- GNUNET_SCHEDULER_REASON_TIMEOUT);
+ uc->state = UNINDEX_STATE_ERROR;
+ signal_unindex_error (uc,
+ _("Failed to compute hash of file."));
return;
}
-
- gic = GNUNET_malloc (sizeof (struct GetIndexedContext));
- gic->h = h;
- gic->client = client;
- gic->iterator = iterator;
- gic->iterator_cls = iterator_cls;
- gic->cont = cont;
- gic->cont_cls = cont_cls;
- GNUNET_CLIENT_notify_transmit_ready (client,
- sizeof (struct GNUNET_MessageHeader),
- GNUNET_CONSTANTS_SERVICE_TIMEOUT,
- &transmit_get_indexed,
- gic);
+ uc->file_id = *file_id;
+ uc->state = UNINDEX_STATE_FS_NOTIFY;
+ uc->client = GNUNET_CLIENT_connect (uc->h->sched,
+ "fs",
+ uc->h->cfg);
+ req.header.size = htons (sizeof (struct UnindexMessage));
+ req.header.type = htons (GNUNET_MESSAGE_TYPE_FS_UNINDEX);
+ req.reserved = 0;
+ req.file_id = *file_id;
+ GNUNET_CLIENT_transmit_and_get_response (uc->client,
+ &req.header,
+ GNUNET_CONSTANTS_SERVICE_TIMEOUT,
+ &process_fs_response,
+ uc);
}
@@ -265,10 +186,36 @@
GNUNET_FS_unindex (struct GNUNET_FS_Handle *h,
const char *filename)
{
- // 1: compute file-id (hash over entire file)
- // 2: notify FS service about file no longer being indexed
- // 3: remove corresponding blocks from datastore!
- return NULL;
+ struct GNUNET_FS_UnindexContext *ret;
+ struct GNUNET_FS_ProgressInfo pi;
+ uint64_t size;
+
+ if (GNUNET_OK !=
+ GNUNET_DISK_file_size (filename,
+ &size,
+ GNUNET_YES))
+ return NULL;
+ ret = GNUNET_malloc (sizeof (struct GNUNET_FS_UnindexContext));
+ ret->h = h;
+ ret->filename = GNUNET_strdup (filename);
+ ret->start_time = GNUNET_TIME_absolute_get ();
+ ret->file_size = size;
+
+ // FIXME: make persistent!
+ pi.status = GNUNET_FS_STATUS_UNINDEX_START;
+ make_unindex_status (&pi, ret);
+ pi.value.unindex.eta = GNUNET_TIME_UNIT_FOREVER_REL;
+ ret->client_info
+ = h->upcb (h->upcb_cls,
+ &pi);
+ GNUNET_CRYPTO_hash_file (h->sched,
+ GNUNET_SCHEDULER_PRIORITY_IDLE,
+ GNUNET_NO,
+ filename,
+ HASHING_BLOCKSIZE,
+ &process_hash,
+ ret);
+ return ret;
}
@@ -279,365 +226,25 @@
*/
void
GNUNET_FS_unindex_stop (struct GNUNET_FS_UnindexContext *uc)
-{
-}
+{
+ struct GNUNET_FS_ProgressInfo pi;
-
-
-#if 0
-
-#define STRICT_CHECKS GNUNET_NO
-
-/**
- * Append the given key and query to the iblock[level].
- * If iblock[level] is already full, compute its chk
- * and push it to level+1. iblocks is guaranteed to
- * be big enough.
- *
- * This function matches exactly upload.c::pushBlock,
- * except in the call to 'GNUNET_FS_delete'. TODO: refactor
- * to avoid code duplication (move to block.c, pass
- * GNUNET_FS_delete as argument!).
- */
-static int
-pushBlock (struct GNUNET_ClientServerConnection *sock,
- const GNUNET_EC_ContentHashKey * chk, unsigned int level,
- GNUNET_DatastoreValue ** iblocks)
-{
- unsigned int size;
- unsigned int present;
- GNUNET_DatastoreValue *value;
- GNUNET_EC_DBlock *db;
- GNUNET_EC_ContentHashKey ichk;
-
- size = ntohl (iblocks[level]->size) - sizeof (GNUNET_DatastoreValue);
- present =
- (size - sizeof (GNUNET_EC_DBlock)) / sizeof (GNUNET_EC_ContentHashKey);
- db = (GNUNET_EC_DBlock *) & iblocks[level][1];
- if (present == GNUNET_ECRS_CHK_PER_INODE)
+ if ( (uc->state != UNINDEX_STATE_COMPLETE) &&
+ (uc->state != UNINDEX_STATE_ERROR) )
{
- GNUNET_EC_file_block_get_key (db, size, &ichk.key);
- GNUNET_EC_file_block_get_query (db, size, &ichk.query);
- if (GNUNET_OK != pushBlock (sock, &ichk, level + 1, iblocks))
- {
- GNUNET_GE_BREAK (NULL, 0);
- return GNUNET_SYSERR;
- }
- GNUNET_EC_file_block_encode (db, size, &ichk.query, &value);
-#if STRICT_CHECKS
- if (GNUNET_SYSERR == GNUNET_FS_delete (sock, value))
- {
- GNUNET_free (value);
- GNUNET_GE_BREAK (NULL, 0);
- return GNUNET_SYSERR;
- }
-#else
- GNUNET_FS_delete (sock, value);
-#endif
- GNUNET_free (value);
- size = sizeof (GNUNET_EC_DBlock);
+ uc->state = UNINDEX_STATE_ABORTED;
+ return;
}
- /* append GNUNET_EC_ContentHashKey */
- memcpy (&((char *) db)[size], chk, sizeof (GNUNET_EC_ContentHashKey));
- iblocks[level]->size = htonl (size +
- sizeof (GNUNET_EC_ContentHashKey) +
- sizeof (GNUNET_DatastoreValue));
- return GNUNET_OK;
+ // FIXME: make unpersistent!
+ pi.status = GNUNET_FS_STATUS_UNINDEX_STOPPED;
+ make_unindex_status (&pi, uc);
+ pi.value.unindex.eta = GNUNET_TIME_UNIT_ZERO;
+ uc->client_info
+ = uc->h->upcb (uc->h->upcb_cls,
+ &pi);
+ GNUNET_break (NULL == uc->client_info);
+ GNUNET_free (uc->filename);
+ GNUNET_free (uc);
}
-
-
-/**
- * Undo sym-linking operation:
- * a) check if we have a symlink
- * b) delete symbolic link
- */
-static int
-undoSymlinking (struct GNUNET_GE_Context *ectx,
- const char *fn,
- const GNUNET_HashCode * fileId,
- struct GNUNET_ClientServerConnection *sock)
-{
- GNUNET_EncName enc;
- char *serverDir;
- char *serverFN;
- struct stat buf;
-
-#ifndef S_ISLNK
- if (1)
- return GNUNET_OK; /* symlinks do not exist? */
-#endif
- if (0 != LSTAT (fn, &buf))
- {
- GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK |
- GNUNET_GE_USER | GNUNET_GE_ADMIN, "stat",
- fn);
- return GNUNET_SYSERR;
- }
-#ifdef S_ISLNK
- if (!S_ISLNK (buf.st_mode))
- return GNUNET_OK;
-#endif
- serverDir =
- GNUNET_get_daemon_configuration_value (sock, "FS", "INDEX-DIRECTORY");
- if (serverDir == NULL)
- return GNUNET_OK;
- serverFN = GNUNET_malloc (strlen (serverDir) + 2 + sizeof (GNUNET_EncName));
- strcpy (serverFN, serverDir);
- GNUNET_free (serverDir);
- if (serverFN[strlen (serverFN) - 1] != DIR_SEPARATOR)
- strcat (serverFN, DIR_SEPARATOR_STR);
- GNUNET_hash_to_enc (fileId, &enc);
- strcat (serverFN, (char *) &enc);
-
- if (0 != UNLINK (serverFN))
- {
- GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK |
- GNUNET_GE_USER | GNUNET_GE_ADMIN, "unlink",
- serverFN);
- GNUNET_free (serverFN);
- return GNUNET_SYSERR;
- }
- GNUNET_free (serverFN);
- return GNUNET_OK;
-}
-
-
-
-/**
- * Unindex a file.
- *
- * @return GNUNET_SYSERR if the unindexing failed (i.e. not indexed)
- */
-int
-GNUNET_ECRS_file_unindex (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- const char *filename,
- GNUNET_ECRS_UploadProgressCallback upcb,
- void *upcbClosure, GNUNET_ECRS_TestTerminate tt,
- void *ttClosure)
-{
- unsigned long long filesize;
- unsigned long long pos;
- unsigned int treedepth;
- int fd;
- int i;
- unsigned int size;
- GNUNET_DatastoreValue **iblocks;
- GNUNET_DatastoreValue *dblock;
- GNUNET_EC_DBlock *db;
- GNUNET_DatastoreValue *value;
- struct GNUNET_ClientServerConnection *sock;
- GNUNET_HashCode fileId;
- GNUNET_EC_ContentHashKey chk;
- GNUNET_CronTime eta;
- GNUNET_CronTime start;
- GNUNET_CronTime now;
- int wasIndexed;
-
- start = GNUNET_get_time ();
- if (GNUNET_YES != GNUNET_disk_file_test (ectx, filename))
- {
- GNUNET_GE_BREAK (ectx, 0);
- return GNUNET_SYSERR;
- }
- if (GNUNET_OK !=
- GNUNET_disk_file_size (ectx, filename, &filesize, GNUNET_YES))
- return GNUNET_SYSERR;
- sock = GNUNET_client_connection_create (ectx, cfg);
- if (sock == NULL)
- return GNUNET_SYSERR;
- eta = 0;
- if (upcb != NULL)
- upcb (filesize, 0, eta, upcbClosure);
- if (GNUNET_SYSERR == GNUNET_hash_file (ectx, filename, &fileId))
- {
- GNUNET_client_connection_destroy (sock);
- GNUNET_GE_BREAK (ectx, 0);
- return GNUNET_SYSERR;
- }
- now = GNUNET_get_time ();
- eta = now + 2 * (now - start);
- /* very rough estimate: GNUNET_hash reads once through the file,
- we'll do that once more and write it. But of course
- the second read may be cached, and we have the encryption,
- so a factor of two is really, really just a rough estimate */
- start = now;
- /* reset the counter since the formula later does not
- take the time for GNUNET_hash_file into account */
- treedepth = GNUNET_ECRS_compute_depth (filesize);
-
- /* Test if file is indexed! */
- wasIndexed = GNUNET_FS_test_indexed (sock, &fileId);
-
- fd = GNUNET_disk_file_open (ectx, filename, O_RDONLY | O_LARGEFILE);
- if (fd == -1)
- {
- GNUNET_client_connection_destroy (sock);
- return GNUNET_SYSERR;
- }
- dblock =
- GNUNET_malloc (sizeof (GNUNET_DatastoreValue) + GNUNET_ECRS_DBLOCK_SIZE +
- sizeof (GNUNET_EC_DBlock));
- dblock->size =
- htonl (sizeof (GNUNET_DatastoreValue) + GNUNET_ECRS_DBLOCK_SIZE +
- sizeof (GNUNET_EC_DBlock));
- dblock->anonymity_level = htonl (0);
- dblock->priority = htonl (0);
- dblock->type = htonl (GNUNET_ECRS_BLOCKTYPE_DATA);
- dblock->expiration_time = GNUNET_htonll (0);
- db = (GNUNET_EC_DBlock *) & dblock[1];
- db->type = htonl (GNUNET_ECRS_BLOCKTYPE_DATA);
- iblocks =
- GNUNET_malloc (sizeof (GNUNET_DatastoreValue *) * (treedepth + 1));
- for (i = 0; i <= treedepth; i++)
- {
- iblocks[i] =
- GNUNET_malloc (sizeof (GNUNET_DatastoreValue) +
- GNUNET_ECRS_IBLOCK_SIZE + sizeof (GNUNET_EC_DBlock));
- iblocks[i]->size =
- htonl (sizeof (GNUNET_DatastoreValue) + sizeof (GNUNET_EC_DBlock));
- iblocks[i]->anonymity_level = htonl (0);
- iblocks[i]->priority = htonl (0);
- iblocks[i]->type = htonl (GNUNET_ECRS_BLOCKTYPE_DATA);
- iblocks[i]->expiration_time = GNUNET_htonll (0);
- ((GNUNET_EC_DBlock *) & iblocks[i][1])->type =
- htonl (GNUNET_ECRS_BLOCKTYPE_DATA);
- }
-
- pos = 0;
- while (pos < filesize)
- {
- if (upcb != NULL)
- upcb (filesize, pos, eta, upcbClosure);
- if (tt != NULL)
- if (GNUNET_OK != tt (ttClosure))
- goto FAILURE;
- size = GNUNET_ECRS_DBLOCK_SIZE;
- if (size > filesize - pos)
- {
- size = filesize - pos;
- memset (&db[1], 0, GNUNET_ECRS_DBLOCK_SIZE);
- }
- dblock->size =
- htonl (sizeof (GNUNET_DatastoreValue) + size +
- sizeof (GNUNET_EC_DBlock));
- if (size != READ (fd, &db[1], size))
- {
- GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER |
- GNUNET_GE_ADMIN | GNUNET_GE_BULK,
- "READ", filename);
- goto FAILURE;
- }
- if (tt != NULL)
- if (GNUNET_OK != tt (ttClosure))
- goto FAILURE;
- GNUNET_EC_file_block_get_key (db, size + sizeof (GNUNET_EC_DBlock),
- &chk.key);
- GNUNET_EC_file_block_get_query (db, size + sizeof (GNUNET_EC_DBlock),
- &chk.query);
- if (GNUNET_OK != pushBlock (sock, &chk, 0, /* dblocks are on
level 0 */
- iblocks))
- {
- GNUNET_GE_BREAK (ectx, 0);
- goto FAILURE;
- }
- if (!wasIndexed)
- {
- if (GNUNET_OK ==
- GNUNET_EC_file_block_encode (db, size, &chk.query, &value))
- {
- *value = *dblock; /* copy options! */
-#if STRICT_CHECKS
- if (GNUNET_OK != GNUNET_FS_delete (sock, value))
- {
- GNUNET_free (value);
- GNUNET_GE_BREAK (ectx, 0);
- goto FAILURE;
- }
-#else
- GNUNET_FS_delete (sock, value);
-#endif
- GNUNET_free (value);
- }
- else
- {
- goto FAILURE;
- }
- }
- pos += size;
- now = GNUNET_get_time ();
- eta = (GNUNET_CronTime) (start +
- (((double) (now - start) / (double) pos))
- * (double) filesize);
- }
- if (tt != NULL)
- if (GNUNET_OK != tt (ttClosure))
- goto FAILURE;
- for (i = 0; i < treedepth; i++)
- {
- size = ntohl (iblocks[i]->size) - sizeof (GNUNET_DatastoreValue);
- db = (GNUNET_EC_DBlock *) & iblocks[i][1];
- GNUNET_EC_file_block_get_key (db, size, &chk.key);
- GNUNET_EC_file_block_get_query (db, size, &chk.query);
- if (GNUNET_OK != pushBlock (sock, &chk, i + 1, iblocks))
- {
- GNUNET_GE_BREAK (ectx, 0);
- goto FAILURE;
- }
- GNUNET_EC_file_block_encode (db, size, &chk.query, &value);
-#if STRICT_CHECKS
- if (GNUNET_OK != GNUNET_FS_delete (sock, value))
- {
- GNUNET_free (value);
- GNUNET_GE_BREAK (ectx, 0);
- goto FAILURE;
- }
-#else
- GNUNET_FS_delete (sock, value);
-#endif
- GNUNET_free (value);
- GNUNET_free (iblocks[i]);
- iblocks[i] = NULL;
- }
-
- if (wasIndexed)
- {
- if (GNUNET_OK == undoSymlinking (ectx, filename, &fileId, sock))
- {
- if (GNUNET_OK !=
- GNUNET_FS_unindex (sock, GNUNET_ECRS_DBLOCK_SIZE, &fileId))
- {
- GNUNET_GE_BREAK (ectx, 0);
- goto FAILURE;
- }
- }
- else
- {
- GNUNET_GE_BREAK (ectx, 0);
- goto FAILURE;
- }
- }
- GNUNET_free (iblocks[treedepth]);
- /* free resources */
- GNUNET_free (iblocks);
- GNUNET_free (dblock);
- CLOSE (fd);
- GNUNET_client_connection_destroy (sock);
- return GNUNET_OK;
-FAILURE:
- for (i = 0; i <= treedepth; i++)
- GNUNET_free_non_null (iblocks[i]);
- GNUNET_free (iblocks);
- GNUNET_free (dblock);
- CLOSE (fd);
- GNUNET_client_connection_destroy (sock);
- return GNUNET_SYSERR;
-}
-
-#endif
-
/* end of fs_unindex.c */
Modified: gnunet/src/include/gnunet_disk_lib.h
===================================================================
--- gnunet/src/include/gnunet_disk_lib.h 2009-08-31 17:14:21 UTC (rev
8912)
+++ gnunet/src/include/gnunet_disk_lib.h 2009-08-31 21:14:22 UTC (rev
8913)
@@ -125,21 +125,27 @@
* @return the new position on success, GNUNET_SYSERR otherwise
*/
off_t
-GNUNET_DISK_file_seek (const struct GNUNET_DISK_FileHandle *h, off_t offset,
- enum GNUNET_DISK_Seek whence);
+GNUNET_DISK_file_seek (const struct GNUNET_DISK_FileHandle *h,
+ off_t offset,
+ enum GNUNET_DISK_Seek whence);
/**
* Get the size of the file (or directory)
* of the given file (in bytes).
*
+ * @param filename name of the file or directory
+ * @param size set to the size of the file (or,
+ * in the case of directories, the sum
+ * of all sizes of files in the directory)
* @param includeSymLinks should symbolic links be
* included?
*
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
int GNUNET_DISK_file_size (const char *filename,
- unsigned long long *size, int includeSymLinks);
+ uint64_t *size,
+ int includeSymLinks);
/**
Modified: gnunet/src/include/gnunet_protocols.h
===================================================================
--- gnunet/src/include/gnunet_protocols.h 2009-08-31 17:14:21 UTC (rev
8912)
+++ gnunet/src/include/gnunet_protocols.h 2009-08-31 21:14:22 UTC (rev
8913)
@@ -399,7 +399,17 @@
*/
#define GNUNET_MESSAGE_TYPE_FS_INDEX_LIST_END 133
+/**
+ * Request from client to unindex a file.
+ */
+#define GNUNET_MESSAGE_TYPE_FS_UNINDEX 134
+/**
+ * Reply to client indicating unindex receipt.
+ */
+#define GNUNET_MESSAGE_TYPE_FS_UNINDEX_OK 135
+
+
/*
TODO:
- DV
Modified: gnunet/src/util/disk.c
===================================================================
--- gnunet/src/util/disk.c 2009-08-31 17:14:21 UTC (rev 8912)
+++ gnunet/src/util/disk.c 2009-08-31 21:14:22 UTC (rev 8913)
@@ -71,7 +71,7 @@
typedef struct
{
- unsigned long long total;
+ uint64_t total;
int include_sym_links;
} GetFileSizeData;
@@ -176,7 +176,8 @@
*/
int
GNUNET_DISK_file_size (const char *filename,
- unsigned long long *size, int includeSymLinks)
+ uint64_t *size,
+ int includeSymLinks)
{
GetFileSizeData gfsd;
int ret;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r8913 - in gnunet/src: fs include util,
gnunet <=