[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r9301 - gnunet/src/fs
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r9301 - gnunet/src/fs |
|
Date: |
Mon, 26 Oct 2009 01:58:07 -0600 |
Author: grothoff
Date: 2009-10-26 01:58:07 -0600 (Mon, 26 Oct 2009)
New Revision: 9301
Added:
gnunet/src/fs/test_fs_file_information.c
gnunet/src/fs/test_fs_file_information_data.conf
gnunet/src/fs/test_fs_list_indexed.c
gnunet/src/fs/test_fs_list_indexed_data.conf
gnunet/src/fs/test_fs_publish.c
gnunet/src/fs/test_fs_publish_data.conf
Modified:
gnunet/src/fs/Makefile.am
gnunet/src/fs/fs.h
gnunet/src/fs/fs_file_information.c
Log:
additional fs tests or fs test harnesses
Modified: gnunet/src/fs/Makefile.am
===================================================================
--- gnunet/src/fs/Makefile.am 2009-10-26 05:52:26 UTC (rev 9300)
+++ gnunet/src/fs/Makefile.am 2009-10-26 07:58:07 UTC (rev 9301)
@@ -106,8 +106,11 @@
test_fs_collection \
test_fs_directory \
test_fs_download \
+ test_fs_file_information \
test_fs_getopt \
+ test_fs_list_indexed \
test_fs_namespace \
+ test_fs_publish \
test_fs_search \
test_fs_start_stop \
test_fs_unindex \
@@ -115,7 +118,8 @@
TESTS = \
test_fs_directory \
- test_fs_download \
+ test_fs_download \
+ test_fs_file_information \
test_fs_search \
test_fs_start_stop \
test_fs_unindex \
@@ -141,12 +145,25 @@
$(top_builddir)/src/arm/libgnunetarm.la \
$(top_builddir)/src/util/libgnunetutil.la
+test_fs_file_information_SOURCES = \
+ test_fs_file_information.c
+test_fs_file_information_LDADD = \
+ $(top_builddir)/src/fs/libgnunetfs.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
test_fs_getopt_SOURCES = \
test_fs_getopt.c
test_fs_getopt_LDADD = \
$(top_builddir)/src/fs/libgnunetfs.la \
$(top_builddir)/src/util/libgnunetutil.la
+test_fs_list_indexed_SOURCES = \
+ test_fs_list_indexed.c
+test_fs_list_indexed_LDADD = \
+ $(top_builddir)/src/fs/libgnunetfs.la \
+ $(top_builddir)/src/arm/libgnunetarm.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
test_fs_namespace_SOURCES = \
test_fs_namespace.c
test_fs_namespace_LDADD = \
@@ -154,6 +171,13 @@
$(top_builddir)/src/arm/libgnunetarm.la \
$(top_builddir)/src/util/libgnunetutil.la
+test_fs_publish_SOURCES = \
+ test_fs_publish.c
+test_fs_publish_LDADD = \
+ $(top_builddir)/src/fs/libgnunetfs.la \
+ $(top_builddir)/src/arm/libgnunetarm.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
test_fs_search_SOURCES = \
test_fs_search.c
test_fs_search_LDADD = $(top_builddir)/src/fs/libgnunetfs.la \
@@ -184,7 +208,10 @@
test_fs_data.conf \
test_fs_collection_data.conf \
test_fs_download_data.conf \
+ test_fs_file_information_data.conf \
+ test_fs_list_indexed_data.conf \
test_fs_namespace_data.conf \
+ test_fs_publish_data.conf \
test_fs_search_data.conf \
test_fs_unindex_data.conf \
test_fs_uri_data.conf
Modified: gnunet/src/fs/fs.h
===================================================================
--- gnunet/src/fs/fs.h 2009-10-26 05:52:26 UTC (rev 9300)
+++ gnunet/src/fs/fs.h 2009-10-26 07:58:07 UTC (rev 9301)
@@ -387,7 +387,7 @@
struct {
/**
- * Name of the directory.
+ * Name of the directory. FIXME: currently never set!
*/
char *dirname;
Modified: gnunet/src/fs/fs_file_information.c
===================================================================
--- gnunet/src/fs/fs_file_information.c 2009-10-26 05:52:26 UTC (rev 9300)
+++ gnunet/src/fs/fs_file_information.c 2009-10-26 07:58:07 UTC (rev 9301)
@@ -631,8 +631,8 @@
ksk = NULL; // FIXME...
// FIXME: create meta!
ret = GNUNET_FS_file_information_create_empty_directory (client_info,
+ ksk,
meta,
- ksk,
anonymity,
priority,
expirationTime);
@@ -668,8 +668,8 @@
*/
struct GNUNET_FS_FileInformation *
GNUNET_FS_file_information_create_empty_directory (void *client_info,
+ const struct GNUNET_FS_Uri
*keywords,
const struct
GNUNET_CONTAINER_MetaData *meta,
- const struct GNUNET_FS_Uri
*keywords,
uint32_t anonymity,
uint32_t priority,
struct GNUNET_TIME_Absolute
expirationTime)
@@ -820,7 +820,7 @@
&fi->expirationTime,
&fi->client_info);
GNUNET_free_non_null (fi->data.dir.dir_data);
- GNUNET_free (fi->data.dir.dirname);
+ GNUNET_free_non_null (fi->data.dir.dirname);
}
else
{
Added: gnunet/src/fs/test_fs_file_information.c
===================================================================
--- gnunet/src/fs/test_fs_file_information.c (rev 0)
+++ gnunet/src/fs/test_fs_file_information.c 2009-10-26 07:58:07 UTC (rev
9301)
@@ -0,0 +1,179 @@
+/*
+ This file is part of GNUnet.
+ (C) 2004, 2005, 2006, 2008, 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/test_fs_file_information.c
+ * @brief simple testcase for file_information operations
+ * @author Christian Grothoff
+ *
+ * TODO:
+ * - test that metatdata, etc. are all correct (for example,
+ * there is a known bug with dirname never being set that is
+ * not detected!)
+ * - need to iterate over file-information structure
+ * - other API functions may not yet be tested (such as
+ * filedata-from-callback)
+ */
+
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_fs_service.h"
+
+#define VERBOSE GNUNET_NO
+
+/**
+ * File-size we use for testing.
+ */
+#define FILESIZE (1024 * 1024 * 2)
+
+/**
+ * How long should our test-content live?
+ */
+#define LIFETIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15)
+
+
+static int
+mycleaner(void *cls,
+ struct GNUNET_FS_FileInformation *fi,
+ uint64_t length,
+ struct GNUNET_CONTAINER_MetaData *meta,
+ struct GNUNET_FS_Uri **uri,
+ uint32_t *anonymity,
+ uint32_t *priority,
+ struct GNUNET_TIME_Absolute *expirationTime,
+ void **client_info)
+{
+ return GNUNET_OK;
+}
+
+
+static void
+run (void *cls,
+ struct GNUNET_SCHEDULER_Handle *s,
+ char *const *args,
+ const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+ const char *keywords[] = {
+ "down_foo",
+ "down_bar",
+ };
+ char *fn1;
+ char *fn2;
+ char *buf;
+ struct GNUNET_CONTAINER_MetaData *meta;
+ struct GNUNET_FS_Uri *kuri;
+ struct GNUNET_FS_FileInformation *fi1;
+ struct GNUNET_FS_FileInformation *fi2;
+ struct GNUNET_FS_FileInformation *fidir;
+ size_t i;
+
+ fn1 = GNUNET_DISK_mktemp ("gnunet-file_information-test-dst");
+ buf = GNUNET_malloc (FILESIZE);
+ for (i = 0; i < FILESIZE; i++)
+ buf[i] = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 256);
+ GNUNET_assert (FILESIZE ==
+ GNUNET_DISK_fn_write (fn1,
+ buf,
+ FILESIZE,
+ GNUNET_DISK_PERM_USER_READ |
GNUNET_DISK_PERM_USER_WRITE));
+ GNUNET_free (buf);
+
+ fn2 = GNUNET_DISK_mktemp ("gnunet-file_information-test-dst");
+ buf = GNUNET_malloc (FILESIZE);
+ for (i = 0; i < FILESIZE; i++)
+ buf[i] = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 256);
+ GNUNET_assert (FILESIZE ==
+ GNUNET_DISK_fn_write (fn2,
+ buf,
+ FILESIZE,
+ GNUNET_DISK_PERM_USER_READ |
GNUNET_DISK_PERM_USER_WRITE));
+ GNUNET_free (buf);
+
+ meta = GNUNET_CONTAINER_meta_data_create ();
+ kuri = GNUNET_FS_uri_ksk_create_from_args (2, keywords);
+ fi1 = GNUNET_FS_file_information_create_from_file
("file_information-context1",
+ fn1,
+ kuri,
+ meta,
+ GNUNET_YES,
+ 1,
+ 42,
+
GNUNET_TIME_relative_to_absolute (LIFETIME));
+ fi2 = GNUNET_FS_file_information_create_from_file
("file_information-context2",
+ fn2,
+ kuri,
+ meta,
+ GNUNET_YES,
+ 1,
+ 42,
+
GNUNET_TIME_relative_to_absolute (LIFETIME));
+ fidir = GNUNET_FS_file_information_create_empty_directory
("file_information-context-dir",
+ kuri,
+ meta,
+ 1,
+ 42,
+
GNUNET_TIME_relative_to_absolute (LIFETIME));
+ GNUNET_assert (GNUNET_OK == GNUNET_FS_file_information_add (fidir, fi1));
+ GNUNET_assert (GNUNET_OK == GNUNET_FS_file_information_add (fidir, fi2));
+ GNUNET_FS_uri_destroy (kuri);
+ GNUNET_CONTAINER_meta_data_destroy (meta);
+ GNUNET_assert (NULL != fidir);
+ /* FIXME: test more of API! */
+ GNUNET_FS_file_information_destroy (fidir,
+ &mycleaner,
+ NULL);
+ GNUNET_DISK_directory_remove (fn1);
+ GNUNET_DISK_directory_remove (fn2);
+ GNUNET_free_non_null (fn1);
+ GNUNET_free_non_null (fn2);
+}
+
+
+int
+main (int argc, char *argv[])
+{
+ char *const argvx[] = {
+ "test-fs-file_information",
+ "-c",
+ "test_fs_file_information_data.conf",
+#if VERBOSE
+ "-L", "DEBUG",
+#endif
+ NULL
+ };
+ struct GNUNET_GETOPT_CommandLineOption options[] = {
+ GNUNET_GETOPT_OPTION_END
+ };
+
+ GNUNET_log_setup ("test_fs_file_information",
+#if VERBOSE
+ "DEBUG",
+#else
+ "WARNING",
+#endif
+ NULL);
+ GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1,
+ argvx, "test-fs-file_information",
+ "nohelp", options, &run, NULL);
+ return 0;
+}
+
+/* end of test_fs_file_information.c */
Added: gnunet/src/fs/test_fs_file_information_data.conf
===================================================================
--- gnunet/src/fs/test_fs_file_information_data.conf
(rev 0)
+++ gnunet/src/fs/test_fs_file_information_data.conf 2009-10-26 07:58:07 UTC
(rev 9301)
@@ -0,0 +1,42 @@
+[PATHS]
+SERVICEHOME = /tmp/gnunet-test-fs-file-information/
+DEFAULTCONFIG = test_fs_file_information_data.conf
+
+[gnunetd]
+HOSTKEY = $SERVICEHOME/.hostkey
+
+[resolver]
+PORT = 42464
+HOSTNAME = localhost
+
+[transport]
+PORT = 42465
+PLUGINS =
+
+[arm]
+PORT = 42466
+HOSTNAME = localhost
+DEFAULTSERVICES = resolver datastore transport core fs
+
+[datastore]
+#DEBUG = YES
+
+[statistics]
+PORT = 42467
+HOSTNAME = localhost
+
+[peerinfo]
+PORT = 42469
+HOSTNAME = localhost
+
+[core]
+PORT = 42470
+HOSTNAME = localhost
+
+[fs]
+PORT = 42471
+HOSTNAME = localhost
+#DEBUG = YES
+
+[testing]
+WEAKRANDOM = YES
Added: gnunet/src/fs/test_fs_list_indexed.c
===================================================================
--- gnunet/src/fs/test_fs_list_indexed.c (rev 0)
+++ gnunet/src/fs/test_fs_list_indexed.c 2009-10-26 07:58:07 UTC (rev
9301)
@@ -0,0 +1,322 @@
+/*
+ This file is part of GNUnet.
+ (C) 2004, 2005, 2006, 2008, 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/test_fs_list_indexed.c
+ * @brief simple testcase for list_indexed operation (indexing, listing
+ * indexed)
+ * @author Christian Grothoff
+ *
+ * TODO:
+ * - actually call list_indexed API!
+ */
+
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_arm_service.h"
+#include "gnunet_fs_service.h"
+
+#define VERBOSE GNUNET_NO
+
+#define START_ARM GNUNET_YES
+
+/**
+ * File-size we use for testing.
+ */
+#define FILESIZE (1024 * 1024 * 2)
+
+/**
+ * How long until we give up on transmitting the message?
+ */
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15)
+
+/**
+ * How long should our test-content live?
+ */
+#define LIFETIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15)
+
+struct PeerContext
+{
+ struct GNUNET_CONFIGURATION_Handle *cfg;
+ struct GNUNET_PeerIdentity id;
+#if START_ARM
+ pid_t arm_pid;
+#endif
+};
+
+static struct PeerContext p1;
+
+static struct GNUNET_TIME_Absolute start;
+
+static struct GNUNET_SCHEDULER_Handle *sched;
+
+static struct GNUNET_FS_Handle *fs;
+
+static struct GNUNET_FS_PublishContext *publish;
+
+static char *fn1;
+
+static char *fn2;
+
+static int err;
+
+static void
+abort_publish_task (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ GNUNET_FS_publish_stop (publish);
+ publish = NULL;
+ GNUNET_DISK_directory_remove (fn1);
+ GNUNET_free (fn1);
+ fn1 = NULL;
+ GNUNET_DISK_directory_remove (fn2);
+ GNUNET_free (fn2);
+ fn2 = NULL;
+}
+
+
+static void
+list_indexed_task (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+
+ GNUNET_SCHEDULER_add_continuation (sched,
+ GNUNET_NO,
+ &abort_publish_task,
+ NULL,
+ GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+}
+
+
+static void *
+progress_cb (void *cls,
+ const struct GNUNET_FS_ProgressInfo *event)
+{
+
+ switch (event->status)
+ {
+ case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
+ printf ("Publish complete, %llu kbps.\n",
+ (unsigned long long) (FILESIZE * 1000 /
(1+GNUNET_TIME_absolute_get_duration (start).value) / 1024));
+ GNUNET_SCHEDULER_add_continuation (sched,
+ GNUNET_NO,
+ &list_indexed_task,
+ NULL,
+ GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ break;
+ case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
+ GNUNET_assert (publish == event->value.publish.sc);
+#if VERBOSE
+ printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n",
+ (unsigned long long) event->value.publish.completed,
+ (unsigned long long) event->value.publish.size,
+ event->value.publish.specifics.progress.depth,
+ (unsigned long long)
event->value.publish.specifics.progress.offset);
+#endif
+ break;
+ case GNUNET_FS_STATUS_PUBLISH_ERROR:
+ fprintf (stderr,
+ "Error publishing file: %s\n",
+ event->value.publish.specifics.error.message);
+ err = 1;
+ GNUNET_SCHEDULER_add_continuation (sched,
+ GNUNET_NO,
+ &abort_publish_task,
+ NULL,
+ GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ break;
+ case GNUNET_FS_STATUS_PUBLISH_START:
+ GNUNET_assert (0 == strcmp ("publish-context",
event->value.publish.cctx));
+ GNUNET_assert (NULL == event->value.publish.pctx);
+ GNUNET_assert (FILESIZE == event->value.publish.size);
+ GNUNET_assert (0 == event->value.publish.completed);
+ GNUNET_assert (1 == event->value.publish.anonymity);
+ break;
+ case GNUNET_FS_STATUS_PUBLISH_STOPPED:
+ GNUNET_assert (publish == event->value.publish.sc);
+ publish = NULL;
+ break;
+ default:
+ printf ("Unexpected event: %d\n",
+ event->status);
+ break;
+ }
+ return NULL;
+}
+
+
+static void
+setup_peer (struct PeerContext *p, const char *cfgname)
+{
+ p->cfg = GNUNET_CONFIGURATION_create ();
+#if START_ARM
+ p->arm_pid = GNUNET_OS_start_process ("gnunet-service-arm",
+ "gnunet-service-arm",
+#if VERBOSE
+ "-L", "DEBUG",
+#endif
+ "-c", cfgname, NULL);
+ sleep (1); /* allow ARM to start */
+#endif
+ GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
+ GNUNET_ARM_start_services (p->cfg, sched, "core", NULL);
+}
+
+
+static void
+stop_arm (struct PeerContext *p)
+{
+#if START_ARM
+ if (0 != PLIBC_KILL (p->arm_pid, SIGTERM))
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+ if (GNUNET_OS_process_wait(p->arm_pid) != GNUNET_OK)
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "ARM process %u stopped\n", p->arm_pid);
+#endif
+ GNUNET_CONFIGURATION_destroy (p->cfg);
+}
+
+
+static void
+run (void *cls,
+ struct GNUNET_SCHEDULER_Handle *s,
+ char *const *args,
+ const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+ const char *keywords[] = {
+ "down_foo",
+ "down_bar",
+ };
+ char *buf;
+ struct GNUNET_CONTAINER_MetaData *meta;
+ struct GNUNET_FS_Uri *kuri;
+ struct GNUNET_FS_FileInformation *fi1;
+ struct GNUNET_FS_FileInformation *fi2;
+ struct GNUNET_FS_FileInformation *fidir;
+ size_t i;
+
+ sched = s;
+ setup_peer (&p1, "test_fs_list_indexed_data.conf");
+ fs = GNUNET_FS_start (sched,
+ cfg,
+ "test-fs-list_indexed",
+ &progress_cb,
+ NULL,
+ GNUNET_FS_FLAGS_NONE,
+ GNUNET_FS_OPTIONS_END);
+ GNUNET_assert (NULL != fs);
+ fn1 = GNUNET_DISK_mktemp ("gnunet-list_indexed-test-dst");
+ buf = GNUNET_malloc (FILESIZE);
+ for (i = 0; i < FILESIZE; i++)
+ buf[i] = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 256);
+ GNUNET_assert (FILESIZE ==
+ GNUNET_DISK_fn_write (fn1,
+ buf,
+ FILESIZE,
+ GNUNET_DISK_PERM_USER_READ |
GNUNET_DISK_PERM_USER_WRITE));
+ GNUNET_free (buf);
+
+ fn2 = GNUNET_DISK_mktemp ("gnunet-list_indexed-test-dst");
+ buf = GNUNET_malloc (FILESIZE);
+ for (i = 0; i < FILESIZE; i++)
+ buf[i] = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 256);
+ GNUNET_assert (FILESIZE ==
+ GNUNET_DISK_fn_write (fn2,
+ buf,
+ FILESIZE,
+ GNUNET_DISK_PERM_USER_READ |
GNUNET_DISK_PERM_USER_WRITE));
+ GNUNET_free (buf);
+
+ meta = GNUNET_CONTAINER_meta_data_create ();
+ kuri = GNUNET_FS_uri_ksk_create_from_args (2, keywords);
+ fi1 = GNUNET_FS_file_information_create_from_file ("list_indexed-context1",
+ fn1,
+ kuri,
+ meta,
+ GNUNET_YES,
+ 1,
+ 42,
+
GNUNET_TIME_relative_to_absolute (LIFETIME));
+ fi2 = GNUNET_FS_file_information_create_from_file ("list_indexed-context2",
+ fn2,
+ kuri,
+ meta,
+ GNUNET_YES,
+ 1,
+ 42,
+
GNUNET_TIME_relative_to_absolute (LIFETIME));
+ fidir = GNUNET_FS_file_information_create_empty_directory
("list_indexed-context-dir",
+ kuri,
+ meta,
+ 1,
+ 42,
+
GNUNET_TIME_relative_to_absolute (LIFETIME));
+ GNUNET_assert (GNUNET_OK == GNUNET_FS_file_information_add (fidir, fi1));
+ GNUNET_assert (GNUNET_OK == GNUNET_FS_file_information_add (fidir, fi2));
+ GNUNET_FS_uri_destroy (kuri);
+ GNUNET_CONTAINER_meta_data_destroy (meta);
+ GNUNET_assert (NULL != fidir);
+ start = GNUNET_TIME_absolute_get ();
+ publish = GNUNET_FS_publish_start (fs,
+ fidir,
+ NULL, NULL, NULL,
+ GNUNET_FS_PUBLISH_OPTION_NONE);
+ GNUNET_assert (publish != NULL);
+}
+
+
+int
+main (int argc, char *argv[])
+{
+ char *const argvx[] = {
+ "test-fs-list_indexed",
+ "-c",
+ "test_fs_list_indexed_data.conf",
+#if VERBOSE
+ "-L", "DEBUG",
+#endif
+ NULL
+ };
+ struct GNUNET_GETOPT_CommandLineOption options[] = {
+ GNUNET_GETOPT_OPTION_END
+ };
+
+ GNUNET_log_setup ("test_fs_list_indexed",
+#if VERBOSE
+ "DEBUG",
+#else
+ "WARNING",
+#endif
+ NULL);
+ GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1,
+ argvx, "test-fs-list_indexed",
+ "nohelp", options, &run, NULL);
+ stop_arm (&p1);
+ GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-list_indexed/");
+ GNUNET_DISK_directory_remove (fn1);
+ GNUNET_free_non_null (fn1);
+ GNUNET_DISK_directory_remove (fn2);
+ GNUNET_free_non_null (fn2);
+ return err;
+}
+
+/* end of test_fs_list_indexed.c */
Added: gnunet/src/fs/test_fs_list_indexed_data.conf
===================================================================
--- gnunet/src/fs/test_fs_list_indexed_data.conf
(rev 0)
+++ gnunet/src/fs/test_fs_list_indexed_data.conf 2009-10-26 07:58:07 UTC
(rev 9301)
@@ -0,0 +1,42 @@
+[PATHS]
+SERVICEHOME = /tmp/gnunet-test-fs-list-indexed/
+DEFAULTCONFIG = test_fs_list_indexed_data.conf
+
+[gnunetd]
+HOSTKEY = $SERVICEHOME/.hostkey
+
+[resolver]
+PORT = 42464
+HOSTNAME = localhost
+
+[transport]
+PORT = 42465
+PLUGINS =
+
+[arm]
+PORT = 42466
+HOSTNAME = localhost
+DEFAULTSERVICES = resolver datastore transport core fs
+
+[datastore]
+#DEBUG = YES
+
+[statistics]
+PORT = 42467
+HOSTNAME = localhost
+
+[peerinfo]
+PORT = 42469
+HOSTNAME = localhost
+
+[core]
+PORT = 42470
+HOSTNAME = localhost
+
+[fs]
+PORT = 42471
+HOSTNAME = localhost
+#DEBUG = YES
+
+[testing]
+WEAKRANDOM = YES
Added: gnunet/src/fs/test_fs_publish.c
===================================================================
--- gnunet/src/fs/test_fs_publish.c (rev 0)
+++ gnunet/src/fs/test_fs_publish.c 2009-10-26 07:58:07 UTC (rev 9301)
@@ -0,0 +1,310 @@
+/*
+ This file is part of GNUnet.
+ (C) 2004, 2005, 2006, 2008, 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/test_fs_publish.c
+ * @brief simple testcase for publish operation (indexing, listing
+ * indexed, directory structure)
+ * @author Christian Grothoff
+ */
+
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_arm_service.h"
+#include "gnunet_fs_service.h"
+
+#define VERBOSE GNUNET_NO
+
+#define START_ARM GNUNET_YES
+
+/**
+ * File-size we use for testing.
+ */
+#define FILESIZE (1024 * 1024 * 2)
+
+/**
+ * How long until we give up on transmitting the message?
+ */
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15)
+
+/**
+ * How long should our test-content live?
+ */
+#define LIFETIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15)
+
+struct PeerContext
+{
+ struct GNUNET_CONFIGURATION_Handle *cfg;
+ struct GNUNET_PeerIdentity id;
+#if START_ARM
+ pid_t arm_pid;
+#endif
+};
+
+static struct PeerContext p1;
+
+static struct GNUNET_TIME_Absolute start;
+
+static struct GNUNET_SCHEDULER_Handle *sched;
+
+static struct GNUNET_FS_Handle *fs;
+
+static struct GNUNET_FS_PublishContext *publish;
+
+static struct GNUNET_FS_PublishContext *publish;
+
+static char *fn1;
+
+static char *fn2;
+
+
+static void
+abort_publish_task (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ GNUNET_FS_publish_stop (publish);
+ publish = NULL;
+ GNUNET_DISK_directory_remove (fn1);
+ GNUNET_free (fn1);
+ fn1 = NULL;
+ GNUNET_DISK_directory_remove (fn2);
+ GNUNET_free (fn2);
+ fn2 = NULL;
+}
+
+
+static void *
+progress_cb (void *cls,
+ const struct GNUNET_FS_ProgressInfo *event)
+{
+
+ switch (event->status)
+ {
+ case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
+ printf ("Publish complete, %llu kbps.\n",
+ (unsigned long long) (FILESIZE * 1000 /
(1+GNUNET_TIME_absolute_get_duration (start).value) / 1024));
+ GNUNET_SCHEDULER_add_continuation (sched,
+ GNUNET_NO,
+ &abort_publish_task,
+ NULL,
+ GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ break;
+ case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
+ GNUNET_assert (publish == event->value.publish.sc);
+#if VERBOSE
+ printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n",
+ (unsigned long long) event->value.publish.completed,
+ (unsigned long long) event->value.publish.size,
+ event->value.publish.specifics.progress.depth,
+ (unsigned long long)
event->value.publish.specifics.progress.offset);
+#endif
+ break;
+ case GNUNET_FS_STATUS_PUBLISH_ERROR:
+ fprintf (stderr,
+ "Error publishing file: %s\n",
+ event->value.publish.specifics.error.message);
+ GNUNET_SCHEDULER_add_continuation (sched,
+ GNUNET_NO,
+ &abort_publish_task,
+ NULL,
+ GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ break;
+ case GNUNET_FS_STATUS_PUBLISH_START:
+ GNUNET_assert (0 == strcmp ("publish-context",
event->value.publish.cctx));
+ GNUNET_assert (NULL == event->value.publish.pctx);
+ GNUNET_assert (FILESIZE == event->value.publish.size);
+ GNUNET_assert (0 == event->value.publish.completed);
+ GNUNET_assert (1 == event->value.publish.anonymity);
+ break;
+ case GNUNET_FS_STATUS_PUBLISH_STOPPED:
+ GNUNET_assert (publish == event->value.publish.sc);
+ GNUNET_SCHEDULER_add_continuation (sched,
+ GNUNET_NO,
+ &abort_publish_task,
+ NULL,
+ GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ break;
+ default:
+ printf ("Unexpected event: %d\n",
+ event->status);
+ break;
+ }
+ return NULL;
+}
+
+
+static void
+setup_peer (struct PeerContext *p, const char *cfgname)
+{
+ p->cfg = GNUNET_CONFIGURATION_create ();
+#if START_ARM
+ p->arm_pid = GNUNET_OS_start_process ("gnunet-service-arm",
+ "gnunet-service-arm",
+#if VERBOSE
+ "-L", "DEBUG",
+#endif
+ "-c", cfgname, NULL);
+ sleep (1); /* allow ARM to start */
+#endif
+ GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
+ GNUNET_ARM_start_services (p->cfg, sched, "core", NULL);
+}
+
+
+static void
+stop_arm (struct PeerContext *p)
+{
+#if START_ARM
+ if (0 != PLIBC_KILL (p->arm_pid, SIGTERM))
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+ if (GNUNET_OS_process_wait(p->arm_pid) != GNUNET_OK)
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "ARM process %u stopped\n", p->arm_pid);
+#endif
+ GNUNET_CONFIGURATION_destroy (p->cfg);
+}
+
+
+static void
+run (void *cls,
+ struct GNUNET_SCHEDULER_Handle *s,
+ char *const *args,
+ const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+ const char *keywords[] = {
+ "down_foo",
+ "down_bar",
+ };
+ char *buf;
+ struct GNUNET_CONTAINER_MetaData *meta;
+ struct GNUNET_FS_Uri *kuri;
+ struct GNUNET_FS_FileInformation *fi1;
+ struct GNUNET_FS_FileInformation *fi2;
+ struct GNUNET_FS_FileInformation *fidir;
+ size_t i;
+
+ sched = s;
+ setup_peer (&p1, "test_fs_publish_data.conf");
+ fs = GNUNET_FS_start (sched,
+ cfg,
+ "test-fs-publish",
+ &progress_cb,
+ NULL,
+ GNUNET_FS_FLAGS_NONE,
+ GNUNET_FS_OPTIONS_END);
+ GNUNET_assert (NULL != fs);
+ fn1 = GNUNET_DISK_mktemp ("gnunet-publish-test-dst");
+ buf = GNUNET_malloc (FILESIZE);
+ for (i = 0; i < FILESIZE; i++)
+ buf[i] = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 256);
+ GNUNET_assert (FILESIZE ==
+ GNUNET_DISK_fn_write (fn1,
+ buf,
+ FILESIZE,
+ GNUNET_DISK_PERM_USER_READ |
GNUNET_DISK_PERM_USER_WRITE));
+ GNUNET_free (buf);
+
+ fn2 = GNUNET_DISK_mktemp ("gnunet-publish-test-dst");
+ buf = GNUNET_malloc (FILESIZE);
+ for (i = 0; i < FILESIZE; i++)
+ buf[i] = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 256);
+ GNUNET_assert (FILESIZE ==
+ GNUNET_DISK_fn_write (fn2,
+ buf,
+ FILESIZE,
+ GNUNET_DISK_PERM_USER_READ |
GNUNET_DISK_PERM_USER_WRITE));
+ GNUNET_free (buf);
+
+ meta = GNUNET_CONTAINER_meta_data_create ();
+ kuri = GNUNET_FS_uri_ksk_create_from_args (2, keywords);
+ fi1 = GNUNET_FS_file_information_create_from_file ("publish-context1",
+ fn1,
+ kuri,
+ meta,
+ GNUNET_YES,
+ 1,
+ 42,
+
GNUNET_TIME_relative_to_absolute (LIFETIME));
+ fi2 = GNUNET_FS_file_information_create_from_file ("publish-context2",
+ fn2,
+ kuri,
+ meta,
+ GNUNET_YES,
+ 1,
+ 42,
+
GNUNET_TIME_relative_to_absolute (LIFETIME));
+ fidir = GNUNET_FS_file_information_create_empty_directory
("publish-context-dir",
+ kuri,
+ meta,
+ 1,
+ 42,
+
GNUNET_TIME_relative_to_absolute (LIFETIME));
+ GNUNET_assert (GNUNET_OK == GNUNET_FS_file_information_add (fidir, fi1));
+ GNUNET_assert (GNUNET_OK == GNUNET_FS_file_information_add (fidir, fi2));
+ GNUNET_FS_uri_destroy (kuri);
+ GNUNET_CONTAINER_meta_data_destroy (meta);
+ GNUNET_assert (NULL != fidir);
+ start = GNUNET_TIME_absolute_get ();
+ publish = GNUNET_FS_publish_start (fs,
+ fidir,
+ NULL, NULL, NULL,
+ GNUNET_FS_PUBLISH_OPTION_NONE);
+ GNUNET_assert (publish != NULL);
+}
+
+
+int
+main (int argc, char *argv[])
+{
+ char *const argvx[] = {
+ "test-fs-publish",
+ "-c",
+ "test_fs_publish_data.conf",
+#if VERBOSE
+ "-L", "DEBUG",
+#endif
+ NULL
+ };
+ struct GNUNET_GETOPT_CommandLineOption options[] = {
+ GNUNET_GETOPT_OPTION_END
+ };
+
+ GNUNET_log_setup ("test_fs_publish",
+#if VERBOSE
+ "DEBUG",
+#else
+ "WARNING",
+#endif
+ NULL);
+ GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1,
+ argvx, "test-fs-publish",
+ "nohelp", options, &run, NULL);
+ stop_arm (&p1);
+ GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-publish/");
+ GNUNET_DISK_directory_remove (fn1);
+ GNUNET_free_non_null (fn1);
+ GNUNET_DISK_directory_remove (fn2);
+ GNUNET_free_non_null (fn2);
+ return 0;
+}
+
+/* end of test_fs_publish.c */
Added: gnunet/src/fs/test_fs_publish_data.conf
===================================================================
--- gnunet/src/fs/test_fs_publish_data.conf (rev 0)
+++ gnunet/src/fs/test_fs_publish_data.conf 2009-10-26 07:58:07 UTC (rev
9301)
@@ -0,0 +1,42 @@
+[PATHS]
+SERVICEHOME = /tmp/gnunet-test-fs-publish/
+DEFAULTCONFIG = test_fs_publish_data.conf
+
+[gnunetd]
+HOSTKEY = $SERVICEHOME/.hostkey
+
+[resolver]
+PORT = 42464
+HOSTNAME = localhost
+
+[transport]
+PORT = 42465
+PLUGINS =
+
+[arm]
+PORT = 42466
+HOSTNAME = localhost
+DEFAULTSERVICES = resolver datastore transport core fs
+
+[datastore]
+#DEBUG = YES
+
+[statistics]
+PORT = 42467
+HOSTNAME = localhost
+
+[peerinfo]
+PORT = 42469
+HOSTNAME = localhost
+
+[core]
+PORT = 42470
+HOSTNAME = localhost
+
+[fs]
+PORT = 42471
+HOSTNAME = localhost
+#DEBUG = YES
+
+[testing]
+WEAKRANDOM = YES
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r9301 - gnunet/src/fs,
gnunet <=