[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r10393 - gnunet/src/fs
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r10393 - gnunet/src/fs |
|
Date: |
Mon, 22 Feb 2010 11:09:38 +0100 |
Author: grothoff
Date: 2010-02-22 11:09:38 +0100 (Mon, 22 Feb 2010)
New Revision: 10393
Added:
gnunet/src/fs/fs_test_lib.c
gnunet/src/fs/fs_test_lib.h
gnunet/src/fs/test_fs_test_lib.c
Removed:
gnunet/src/fs/test_fs_lib.c
gnunet/src/fs/test_fs_lib.h
Modified:
gnunet/src/fs/Makefile.am
gnunet/src/fs/test_gnunet_service_fs_p2p.c
Log:
fix leak, rename
Modified: gnunet/src/fs/Makefile.am
===================================================================
--- gnunet/src/fs/Makefile.am 2010-02-22 10:09:34 UTC (rev 10392)
+++ gnunet/src/fs/Makefile.am 2010-02-22 10:09:38 UTC (rev 10393)
@@ -42,7 +42,7 @@
libgnunetfstest_a_SOURCES = \
- test_fs_lib.c test_fs_lib.h
+ fs_test_lib.c fs_test_lib.h
libgnunetfstest_a_LIBADD = \
$(top_builddir)/src/fs/libgnunetfs.la \
@@ -138,6 +138,7 @@
test_fs_start_stop \
test_fs_unindex \
test_fs_uri \
+ test_fs_test_lib \
test_gnunet_service_fs_p2p
# $(check_PROGRAMS)
@@ -220,6 +221,14 @@
$(top_builddir)/src/fs/libgnunetfs.la \
$(top_builddir)/src/util/libgnunetutil.la
+test_fs_test_lib_SOURCES = \
+ test_fs_test_lib.c
+test_fs_test_lib_LDADD = \
+ $(top_builddir)/src/fs/libgnunetfstest.a \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/fs/libgnunetfs.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
test_gnunet_service_fs_p2p_SOURCES = \
test_gnunet_service_fs_p2p.c
test_gnunet_service_fs_p2p_LDADD = \
Copied: gnunet/src/fs/fs_test_lib.c (from rev 10388,
gnunet/src/fs/test_fs_lib.c)
===================================================================
--- gnunet/src/fs/fs_test_lib.c (rev 0)
+++ gnunet/src/fs/fs_test_lib.c 2010-02-22 10:09:38 UTC (rev 10393)
@@ -0,0 +1,611 @@
+/*
+ This file is part of GNUnet.
+ (C) 2010 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_lib.c
+ * @brief library routines for testing FS publishing and downloading
+ * with multiple peers; this code is limited to flat files
+ * and no keywords (those functions can be tested with
+ * single-peer setups; this is for testing routing).
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "fs_test_lib.h"
+#include "gnunet_testing_lib.h"
+
+
+/**
+ * Handle for a daemon started for testing FS.
+ */
+struct GNUNET_FS_TestDaemon
+{
+
+ /**
+ * Handle to the file sharing context using this daemon.
+ */
+ struct GNUNET_FS_Handle *fs;
+
+ /**
+ * Handle to the daemon via testing.
+ */
+ struct GNUNET_TESTING_Daemon *daemon;
+
+ /**
+ * Note that 'group' will be the same value for all of the
+ * daemons started jointly.
+ */
+ struct GNUNET_TESTING_PeerGroup *group;
+
+ /**
+ * Configuration for accessing this peer.
+ */
+ struct GNUNET_CONFIGURATION_Handle *cfg;
+
+ /**
+ * ID of this peer.
+ */
+ struct GNUNET_PeerIdentity id;
+
+ /**
+ * Scheduler to use (for publish_cont).
+ */
+ struct GNUNET_SCHEDULER_Handle *publish_sched;
+
+ /**
+ * Function to call when upload is done.
+ */
+ GNUNET_FS_TEST_UriContinuation publish_cont;
+
+ /**
+ * Closure for publish_cont.
+ */
+ void *publish_cont_cls;
+
+ /**
+ * Task to abort publishing (timeout).
+ */
+ GNUNET_SCHEDULER_TaskIdentifier publish_timeout_task;
+
+ /**
+ * Seed for file generation.
+ */
+ uint32_t publish_seed;
+
+ /**
+ * Context for current publishing operation.
+ */
+ struct GNUNET_FS_PublishContext *publish_context;
+
+ /**
+ * Result URI.
+ */
+ struct GNUNET_FS_Uri *publish_uri;
+
+ /**
+ * Scheduler to use (for download_cont).
+ */
+ struct GNUNET_SCHEDULER_Handle *download_sched;
+
+ /**
+ * Function to call when download is done.
+ */
+ GNUNET_SCHEDULER_Task download_cont;
+
+ /**
+ * Closure for download_cont.
+ */
+ void *download_cont_cls;
+
+ /**
+ * Seed for download verification.
+ */
+ uint32_t download_seed;
+
+ /**
+ * Task to abort downloading (timeout).
+ */
+ GNUNET_SCHEDULER_TaskIdentifier download_timeout_task;
+
+ /**
+ * Context for current download operation.
+ */
+ struct GNUNET_FS_DownloadContext *download_context;
+
+ /**
+ * Verbosity level of the current operation.
+ */
+ int verbose;
+
+
+};
+
+
+static void
+report_uri (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct GNUNET_FS_TestDaemon *daemon = cls;
+ GNUNET_FS_TEST_UriContinuation cont;
+ struct GNUNET_FS_Uri *uri;
+
+ GNUNET_FS_publish_stop (daemon->publish_context);
+ daemon->publish_context = NULL;
+ daemon->publish_sched = NULL;
+ cont = daemon->publish_cont;
+ daemon->publish_cont = NULL;
+ uri = daemon->publish_uri;
+ cont (daemon->publish_cont_cls,
+ uri);
+ GNUNET_FS_uri_destroy (uri);
+}
+
+
+static void
+report_success (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct GNUNET_FS_TestDaemon *daemon = cls;
+
+ GNUNET_FS_download_stop (daemon->download_context, GNUNET_YES);
+ daemon->download_context = NULL;
+ GNUNET_SCHEDULER_add_continuation (daemon->download_sched,
+ daemon->download_cont,
+ daemon->download_cont_cls,
+ GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ daemon->download_cont = NULL;
+ daemon->download_sched = NULL;
+}
+
+static void*
+progress_cb (void *cls,
+ const struct GNUNET_FS_ProgressInfo *info)
+{
+ struct GNUNET_FS_TestDaemon *daemon = cls;
+
+ switch (info->status)
+ {
+ case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
+ GNUNET_SCHEDULER_cancel (daemon->publish_sched,
+ daemon->publish_timeout_task);
+ daemon->publish_timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ daemon->publish_uri = GNUNET_FS_uri_dup
(info->value.publish.specifics.completed.chk_uri);
+ GNUNET_SCHEDULER_add_continuation (daemon->publish_sched,
+ &report_uri,
+ daemon,
+ GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ break;
+ case GNUNET_FS_STATUS_DOWNLOAD_COMPLETED:
+ GNUNET_SCHEDULER_cancel (daemon->download_sched,
+ daemon->download_timeout_task);
+ daemon->download_timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_SCHEDULER_add_continuation (daemon->download_sched,
+ &report_success,
+ daemon,
+ GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ break;
+ /* FIXME: monitor data correctness during download progress */
+ /* FIXME: do performance reports given sufficient verbosity */
+ /* FIXME: advance timeout task to "immediate" on error */
+ default:
+ break;
+ }
+ return NULL;
+}
+
+
+
+struct StartContext
+{
+ struct GNUNET_SCHEDULER_Handle *sched;
+ struct GNUNET_TIME_Relative timeout;
+ unsigned int total;
+ unsigned int have;
+ struct GNUNET_FS_TestDaemon **daemons;
+ GNUNET_SCHEDULER_Task cont;
+ void *cont_cls;
+ struct GNUNET_TESTING_PeerGroup *group;
+ struct GNUNET_CONFIGURATION_Handle *cfg;
+ GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+};
+
+
+static void
+notify_running (void *cls,
+ const struct GNUNET_PeerIdentity *id,
+ const struct GNUNET_CONFIGURATION_Handle *cfg,
+ struct GNUNET_TESTING_Daemon *d,
+ const char *emsg)
+{
+ struct StartContext *sctx = cls;
+ unsigned int i;
+
+ if (emsg != NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Failed to start daemon: %s\n"),
+ emsg);
+ return;
+ }
+ GNUNET_assert (sctx->have < sctx->total);
+ sctx->daemons[sctx->have]->cfg = GNUNET_CONFIGURATION_dup (cfg);
+ sctx->daemons[sctx->have]->group = sctx->group;
+ sctx->daemons[sctx->have]->daemon = d;
+ sctx->daemons[sctx->have]->id = *id;
+ sctx->have++;
+ if (sctx->have == sctx->total)
+ {
+ GNUNET_SCHEDULER_add_continuation (sctx->sched,
+ sctx->cont,
+ sctx->cont_cls,
+ GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ GNUNET_CONFIGURATION_destroy (sctx->cfg);
+ GNUNET_SCHEDULER_cancel (sctx->sched,
+ sctx->timeout_task);
+ for (i=0;i<sctx->total;i++)
+ sctx->daemons[i]->fs = GNUNET_FS_start (sctx->sched,
+ sctx->daemons[i]->cfg,
+ "<tester>",
+ &progress_cb,
+ sctx->daemons[i],
+ GNUNET_FS_FLAGS_NONE,
+ GNUNET_FS_OPTIONS_END);
+ GNUNET_free (sctx);
+ }
+}
+
+
+static void
+start_timeout (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct StartContext *sctx = cls;
+ unsigned int i;
+
+ GNUNET_TESTING_daemons_stop (sctx->group);
+ for (i=0;i<sctx->total;i++)
+ {
+ if (i < sctx->have)
+ GNUNET_CONFIGURATION_destroy (sctx->daemons[i]->cfg);
+ GNUNET_free (sctx->daemons[i]);
+ }
+ GNUNET_CONFIGURATION_destroy (sctx->cfg);
+ GNUNET_SCHEDULER_add_continuation (sctx->sched,
+ sctx->cont,
+ sctx->cont_cls,
+ GNUNET_SCHEDULER_REASON_TIMEOUT);
+ GNUNET_free (sctx);
+}
+
+
+/**
+ * Start daemons for testing.
+ *
+ * @param sched scheduler to use
+ * @param timeout if this operation cannot be completed within the
+ * given period, call the continuation with an error code
+ * @param total number of daemons to start
+ * @param daemons array of 'total' entries to be initialized
+ * (array must already be allocated, will be filled)
+ * @param cont function to call when done
+ * @param cont_cls closure for cont
+ */
+void
+GNUNET_FS_TEST_daemons_start (struct GNUNET_SCHEDULER_Handle *sched,
+ struct GNUNET_TIME_Relative timeout,
+ unsigned int total,
+ struct GNUNET_FS_TestDaemon **daemons,
+ GNUNET_SCHEDULER_Task cont,
+ void *cont_cls)
+{
+ struct StartContext *sctx;
+ unsigned int i;
+
+ GNUNET_assert (total > 0);
+ sctx = GNUNET_malloc (sizeof (struct StartContext));
+ sctx->sched = sched;
+ sctx->daemons = daemons;
+ sctx->total = total;
+ sctx->cont = cont;
+ sctx->cont_cls = cont_cls;
+ sctx->cfg = GNUNET_CONFIGURATION_create ();
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_load (sctx->cfg,
+ "test_fs_lib_data.conf"))
+ {
+ GNUNET_break (0);
+ GNUNET_CONFIGURATION_destroy (sctx->cfg);
+ GNUNET_free (sctx);
+ GNUNET_SCHEDULER_add_continuation (sched,
+ cont,
+ cont_cls,
+ GNUNET_SCHEDULER_REASON_TIMEOUT);
+ return;
+ }
+ for (i=0;i<total;i++)
+ daemons[i] = GNUNET_malloc (sizeof (struct GNUNET_FS_TestDaemon));
+ sctx->group = GNUNET_TESTING_daemons_start (sched,
+ sctx->cfg,
+ total,
+ ¬ify_running,
+ sctx,
+ NULL, NULL,
+ NULL);
+ sctx->timeout_task = GNUNET_SCHEDULER_add_delayed (sched,
+ timeout,
+ &start_timeout,
+ sctx);
+}
+
+
+struct ConnectContext
+{
+ struct GNUNET_SCHEDULER_Handle *sched;
+ GNUNET_SCHEDULER_Task cont;
+ void *cont_cls;
+};
+
+
+static void
+notify_connection (void *cls,
+ const struct GNUNET_PeerIdentity *first,
+ const struct GNUNET_PeerIdentity *second,
+ const struct GNUNET_CONFIGURATION_Handle *first_cfg,
+ const struct GNUNET_CONFIGURATION_Handle *second_cfg,
+ struct GNUNET_TESTING_Daemon *first_daemon,
+ struct GNUNET_TESTING_Daemon *second_daemon,
+ const char *emsg)
+{
+ struct ConnectContext *cc = cls;
+
+ if (emsg != NULL)
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Failed to connect peers: %s\n"),
+ emsg);
+ GNUNET_SCHEDULER_add_continuation (cc->sched,
+ cc->cont,
+ cc->cont_cls,
+ (emsg != NULL)
+ ? GNUNET_SCHEDULER_REASON_TIMEOUT
+ : GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ GNUNET_free (cc);
+}
+
+
+/**
+ * Connect two daemons for testing.
+ *
+ * @param sched scheduler to use
+ * @param daemon1 first daemon to connect
+ * @param daemon2 second first daemon to connect
+ * @param timeout if this operation cannot be completed within the
+ * given period, call the continuation with an error code
+ * @param cont function to call when done
+ * @param cont_cls closure for cont
+ */
+void
+GNUNET_FS_TEST_daemons_connect (struct GNUNET_SCHEDULER_Handle *sched,
+ struct GNUNET_FS_TestDaemon *daemon1,
+ struct GNUNET_FS_TestDaemon *daemon2,
+ struct GNUNET_TIME_Relative timeout,
+ GNUNET_SCHEDULER_Task cont,
+ void *cont_cls)
+{
+ struct ConnectContext *ncc;
+
+ ncc = GNUNET_malloc (sizeof (struct ConnectContext));
+ ncc->sched = sched;
+ ncc->cont = cont;
+ ncc->cont_cls = cont_cls;
+ GNUNET_TESTING_daemons_connect (daemon1->daemon,
+ daemon2->daemon,
+ timeout,
+ ¬ify_connection,
+ ncc);
+}
+
+
+/**
+ * Stop daemons used for testing.
+ *
+ * @param sched scheduler to use
+ * @param timeout if this operation cannot be completed within the
+ * given period, call the continuation with an error code
+ * @param total number of daemons to stop
+ * @param daemons array with the daemons (values will be clobbered)
+ * @param cont function to call when done
+ * @param cont_cls closure for cont
+ */
+void
+GNUNET_FS_TEST_daemons_stop (struct GNUNET_SCHEDULER_Handle *sched,
+ unsigned int total,
+ struct GNUNET_FS_TestDaemon **daemons)
+{
+ unsigned int i;
+
+ GNUNET_assert (total > 0);
+ GNUNET_TESTING_daemons_stop (daemons[0]->group);
+ for (i=0;i<total;i++)
+ {
+ GNUNET_FS_stop (daemons[i]->fs);
+ GNUNET_CONFIGURATION_destroy (daemons[i]->cfg);
+ GNUNET_free (daemons[i]);
+ daemons[i] = NULL;
+ }
+}
+
+
+static void
+publish_timeout (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct GNUNET_FS_TestDaemon *daemon = cls;
+ GNUNET_FS_TEST_UriContinuation cont;
+
+ cont = daemon->publish_cont;
+ daemon->publish_timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ daemon->publish_cont = NULL;
+ GNUNET_FS_publish_stop (daemon->publish_context);
+ daemon->publish_context = NULL;
+ cont (daemon->publish_cont_cls,
+ NULL);
+}
+
+
+static size_t
+file_generator (void *cls,
+ uint64_t offset,
+ size_t max,
+ void *buf,
+ char **emsg)
+{
+ struct GNUNET_FS_TestDaemon *daemon = cls;
+ uint64_t pos;
+ uint8_t *cbuf = buf;
+
+ for (pos=0;pos<max;pos++)
+ cbuf[pos] = (uint8_t) ((offset * daemon->publish_seed) % (255 - (offset /
1024 / 32)));
+ return max;
+}
+
+
+
+/**
+ * Publish a file at the given daemon.
+ *
+ * @param sched scheduler to use
+ * @param daemon where to publish
+ * @param timeout if this operation cannot be completed within the
+ * given period, call the continuation with an error code
+ * @param anonymity option for publication
+ * @param do_index GNUNET_YES for index, GNUNET_NO for insertion,
+ * GNUNET_SYSERR for simulation
+ * @param size size of the file to publish
+ * @param seed seed to use for file generation
+ * @param verbose how verbose to be in reporting
+ * @param cont function to call when done
+ * @param cont_cls closure for cont
+ */
+void
+GNUNET_FS_TEST_publish (struct GNUNET_SCHEDULER_Handle *sched,
+ struct GNUNET_FS_TestDaemon *daemon,
+ struct GNUNET_TIME_Relative timeout,
+ uint32_t anonymity,
+ int do_index,
+ uint64_t size,
+ uint32_t seed,
+ unsigned int verbose,
+ GNUNET_FS_TEST_UriContinuation cont,
+ void *cont_cls)
+{
+ GNUNET_assert (daemon->publish_cont == NULL);
+ struct GNUNET_FS_FileInformation *fi;
+
+ daemon->publish_cont = cont;
+ daemon->publish_cont_cls = cont_cls;
+ daemon->publish_seed = seed;
+ daemon->verbose = verbose;
+ daemon->publish_sched = sched;
+ fi = GNUNET_FS_file_information_create_from_reader (daemon,
+ size,
+ &file_generator,
+ daemon,
+ NULL,
+ NULL,
+ do_index,
+ anonymity,
+ 42 /* priority */,
+
GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_HOURS));
+ daemon->publish_context = GNUNET_FS_publish_start (daemon->fs,
+ fi,
+ NULL, NULL, NULL,
+
GNUNET_FS_PUBLISH_OPTION_NONE);
+ daemon->publish_timeout_task = GNUNET_SCHEDULER_add_delayed (sched,
+ timeout,
+ &publish_timeout,
+ daemon);
+}
+
+
+static void
+download_timeout (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct GNUNET_FS_TestDaemon *daemon = cls;
+
+ daemon->download_timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_SCHEDULER_add_continuation (daemon->download_sched,
+ daemon->download_cont,
+ daemon->download_cont_cls,
+ GNUNET_SCHEDULER_REASON_TIMEOUT);
+ daemon->download_cont = NULL;
+ daemon->download_sched = NULL;
+}
+
+
+/**
+ * Perform test download.
+ *
+ * @param sched scheduler to use
+ * @param daemon which peer to download from
+ * @param timeout if this operation cannot be completed within the
+ * given period, call the continuation with an error code
+ * @param anonymity option for download
+ * @param seed used for file validation
+ * @param verbose how verbose to be in reporting
+ * @param cont function to call when done
+ * @param cont_cls closure for cont
+ */
+void
+GNUNET_FS_TEST_download (struct GNUNET_SCHEDULER_Handle *sched,
+ struct GNUNET_FS_TestDaemon *daemon,
+ struct GNUNET_TIME_Relative timeout,
+ uint32_t anonymity,
+ uint32_t seed,
+ const struct GNUNET_FS_Uri *uri,
+ unsigned int verbose,
+ GNUNET_SCHEDULER_Task cont,
+ void *cont_cls)
+{
+ uint64_t size;
+
+ GNUNET_assert (daemon->download_cont == NULL);
+ size = GNUNET_FS_uri_chk_get_file_size (uri);
+ daemon->verbose = verbose;
+ daemon->download_sched = sched;
+ daemon->download_cont = cont;
+ daemon->download_cont_cls = cont_cls;
+ daemon->download_seed = seed;
+ daemon->download_context = GNUNET_FS_download_start (daemon->fs,
+ uri,
+ NULL,
+ NULL,
+ 0,
+ size,
+ anonymity,
+
GNUNET_FS_DOWNLOAD_OPTION_NONE,
+ NULL,
+ NULL);
+ daemon->download_timeout_task = GNUNET_SCHEDULER_add_delayed (sched,
+ timeout,
+
&download_timeout,
+ daemon);
+}
+
+/* end of test_fs_lib.c */
Copied: gnunet/src/fs/fs_test_lib.h (from rev 10388,
gnunet/src/fs/test_fs_lib.h)
===================================================================
--- gnunet/src/fs/fs_test_lib.h (rev 0)
+++ gnunet/src/fs/fs_test_lib.h 2010-02-22 10:09:38 UTC (rev 10393)
@@ -0,0 +1,161 @@
+/*
+ This file is part of GNUnet.
+ (C) 2010 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_lib.h
+ * @brief library routines for testing FS publishing and downloading
+ * with multiple peers; this code is limited to flat files
+ * and no keywords (those functions can be tested with
+ * single-peer setups; this is for testing routing).
+ * @author Christian Grothoff
+ */
+#ifndef TEST_FS_LIB_H
+#define TEST_FS_LIB_H
+
+#include "gnunet_util_lib.h"
+#include "gnunet_fs_service.h"
+
+/**
+ * Handle for a daemon started for testing FS.
+ */
+struct GNUNET_FS_TestDaemon;
+
+
+/**
+ * Start daemons for testing.
+ *
+ * @param sched scheduler to use
+ * @param timeout if this operation cannot be completed within the
+ * given period, call the continuation with an error code
+ * @param total number of daemons to start
+ * @param daemons array of 'total' entries to be initialized
+ * (array must already be allocated, will be filled)
+ * @param cont function to call when done
+ * @param cont_cls closure for cont
+ */
+void
+GNUNET_FS_TEST_daemons_start (struct GNUNET_SCHEDULER_Handle *sched,
+ struct GNUNET_TIME_Relative timeout,
+ unsigned int total,
+ struct GNUNET_FS_TestDaemon **daemons,
+ GNUNET_SCHEDULER_Task cont,
+ void *cont_cls);
+
+
+/**
+ * Connect two daemons for testing.
+ *
+ * @param sched scheduler to use
+ * @param daemon1 first daemon to connect
+ * @param daemon2 second first daemon to connect
+ * @param timeout if this operation cannot be completed within the
+ * given period, call the continuation with an error code
+ * @param cont function to call when done
+ * @param cont_cls closure for cont
+ */
+void
+GNUNET_FS_TEST_daemons_connect (struct GNUNET_SCHEDULER_Handle *sched,
+ struct GNUNET_FS_TestDaemon *daemon1,
+ struct GNUNET_FS_TestDaemon *daemon2,
+ struct GNUNET_TIME_Relative timeout,
+ GNUNET_SCHEDULER_Task cont,
+ void *cont_cls);
+
+
+/**
+ * Stop daemons used for testing.
+ *
+ * @param sched scheduler to use
+ * @param total number of daemons to stop
+ * @param daemons array with the daemons (values will be clobbered)
+ */
+void
+GNUNET_FS_TEST_daemons_stop (struct GNUNET_SCHEDULER_Handle *sched,
+ unsigned int total,
+ struct GNUNET_FS_TestDaemon **daemons);
+
+
+/**
+ * Function signature.
+ *
+ * @param cls closure (user defined)
+ * @param uri a URI, NULL for errors
+ */
+typedef void
+(*GNUNET_FS_TEST_UriContinuation)(void *cls,
+ const struct GNUNET_FS_Uri *uri);
+
+
+/**
+ * Publish a file at the given daemon.
+ *
+ * @param sched scheduler to use
+ * @param daemon where to publish
+ * @param timeout if this operation cannot be completed within the
+ * given period, call the continuation with an error code
+ * @param anonymity option for publication
+ * @param do_index GNUNET_YES for index, GNUNET_NO for insertion,
+ * GNUNET_SYSERR for simulation
+ * @param size size of the file to publish
+ * @param seed seed to use for file generation
+ * @param verbose how verbose to be in reporting
+ * @param cont function to call when done
+ * @param cont_cls closure for cont
+ */
+void
+GNUNET_FS_TEST_publish (struct GNUNET_SCHEDULER_Handle *sched,
+ struct GNUNET_FS_TestDaemon *daemon,
+ struct GNUNET_TIME_Relative timeout,
+ uint32_t anonymity,
+ int do_index,
+ uint64_t size,
+ uint32_t seed,
+ unsigned int verbose,
+ GNUNET_FS_TEST_UriContinuation cont,
+ void *cont_cls);
+
+
+/**
+ * Perform test download.
+ *
+ * @param sched scheduler to use
+ * @param daemon which peer to download from
+ * @param timeout if this operation cannot be completed within the
+ * given period, call the continuation with an error code
+ * @param anonymity option for download
+ * @param seed used for file validation
+ * @param verbose how verbose to be in reporting
+ * @param cont function to call when done
+ * @param cont_cls closure for cont
+ */
+void
+GNUNET_FS_TEST_download (struct GNUNET_SCHEDULER_Handle *sched,
+ struct GNUNET_FS_TestDaemon *daemon,
+ struct GNUNET_TIME_Relative timeout,
+ uint32_t anonymity,
+ uint32_t seed,
+ const struct GNUNET_FS_Uri *uri,
+ unsigned int verbose,
+ GNUNET_SCHEDULER_Task cont,
+ void *cont_cls);
+
+
+
+#endif
Deleted: gnunet/src/fs/test_fs_lib.c
===================================================================
--- gnunet/src/fs/test_fs_lib.c 2010-02-22 10:09:34 UTC (rev 10392)
+++ gnunet/src/fs/test_fs_lib.c 2010-02-22 10:09:38 UTC (rev 10393)
@@ -1,610 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2010 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_lib.c
- * @brief library routines for testing FS publishing and downloading
- * with multiple peers; this code is limited to flat files
- * and no keywords (those functions can be tested with
- * single-peer setups; this is for testing routing).
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include "test_fs_lib.h"
-#include "gnunet_testing_lib.h"
-
-
-/**
- * Handle for a daemon started for testing FS.
- */
-struct GNUNET_FS_TestDaemon
-{
-
- /**
- * Handle to the file sharing context using this daemon.
- */
- struct GNUNET_FS_Handle *fs;
-
- /**
- * Handle to the daemon via testing.
- */
- struct GNUNET_TESTING_Daemon *daemon;
-
- /**
- * Note that 'group' will be the same value for all of the
- * daemons started jointly.
- */
- struct GNUNET_TESTING_PeerGroup *group;
-
- /**
- * Configuration for accessing this peer.
- */
- struct GNUNET_CONFIGURATION_Handle *cfg;
-
- /**
- * ID of this peer.
- */
- struct GNUNET_PeerIdentity id;
-
- /**
- * Scheduler to use (for publish_cont).
- */
- struct GNUNET_SCHEDULER_Handle *publish_sched;
-
- /**
- * Function to call when upload is done.
- */
- GNUNET_FS_TEST_UriContinuation publish_cont;
-
- /**
- * Closure for publish_cont.
- */
- void *publish_cont_cls;
-
- /**
- * Task to abort publishing (timeout).
- */
- GNUNET_SCHEDULER_TaskIdentifier publish_timeout_task;
-
- /**
- * Seed for file generation.
- */
- uint32_t publish_seed;
-
- /**
- * Context for current publishing operation.
- */
- struct GNUNET_FS_PublishContext *publish_context;
-
- /**
- * Result URI.
- */
- struct GNUNET_FS_Uri *publish_uri;
-
- /**
- * Scheduler to use (for download_cont).
- */
- struct GNUNET_SCHEDULER_Handle *download_sched;
-
- /**
- * Function to call when download is done.
- */
- GNUNET_SCHEDULER_Task download_cont;
-
- /**
- * Closure for download_cont.
- */
- void *download_cont_cls;
-
- /**
- * Seed for download verification.
- */
- uint32_t download_seed;
-
- /**
- * Task to abort downloading (timeout).
- */
- GNUNET_SCHEDULER_TaskIdentifier download_timeout_task;
-
- /**
- * Context for current download operation.
- */
- struct GNUNET_FS_DownloadContext *download_context;
-
- /**
- * Verbosity level of the current operation.
- */
- int verbose;
-
-
-};
-
-
-static void
-report_uri (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct GNUNET_FS_TestDaemon *daemon = cls;
- GNUNET_FS_TEST_UriContinuation cont;
- struct GNUNET_FS_Uri *uri;
-
- GNUNET_FS_publish_stop (daemon->publish_context);
- daemon->publish_context = NULL;
- daemon->publish_sched = NULL;
- cont = daemon->publish_cont;
- daemon->publish_cont = NULL;
- uri = daemon->publish_uri;
- cont (daemon->publish_cont_cls,
- uri);
- GNUNET_FS_uri_destroy (uri);
-}
-
-
-static void
-report_success (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct GNUNET_FS_TestDaemon *daemon = cls;
-
- GNUNET_FS_download_stop (daemon->download_context, GNUNET_YES);
- daemon->download_context = NULL;
- GNUNET_SCHEDULER_add_continuation (daemon->download_sched,
- daemon->download_cont,
- daemon->download_cont_cls,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
- daemon->download_cont = NULL;
- daemon->download_sched = NULL;
-}
-
-static void*
-progress_cb (void *cls,
- const struct GNUNET_FS_ProgressInfo *info)
-{
- struct GNUNET_FS_TestDaemon *daemon = cls;
-
- switch (info->status)
- {
- case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
- GNUNET_SCHEDULER_cancel (daemon->publish_sched,
- daemon->publish_timeout_task);
- daemon->publish_timeout_task = GNUNET_SCHEDULER_NO_TASK;
- daemon->publish_uri = GNUNET_FS_uri_dup
(info->value.publish.specifics.completed.chk_uri);
- GNUNET_SCHEDULER_add_continuation (daemon->publish_sched,
- &report_uri,
- daemon,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
- break;
- case GNUNET_FS_STATUS_DOWNLOAD_COMPLETED:
- GNUNET_SCHEDULER_cancel (daemon->download_sched,
- daemon->download_timeout_task);
- daemon->download_timeout_task = GNUNET_SCHEDULER_NO_TASK;
- GNUNET_SCHEDULER_add_continuation (daemon->download_sched,
- &report_success,
- daemon,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
- break;
- /* FIXME: monitor data correctness during download progress */
- /* FIXME: do performance reports given sufficient verbosity */
- /* FIXME: advance timeout task to "immediate" on error */
- default:
- break;
- }
- return NULL;
-}
-
-
-
-struct StartContext
-{
- struct GNUNET_SCHEDULER_Handle *sched;
- struct GNUNET_TIME_Relative timeout;
- unsigned int total;
- unsigned int have;
- struct GNUNET_FS_TestDaemon **daemons;
- GNUNET_SCHEDULER_Task cont;
- void *cont_cls;
- struct GNUNET_TESTING_PeerGroup *group;
- struct GNUNET_CONFIGURATION_Handle *cfg;
- GNUNET_SCHEDULER_TaskIdentifier timeout_task;
-};
-
-
-static void
-notify_running (void *cls,
- const struct GNUNET_PeerIdentity *id,
- const struct GNUNET_CONFIGURATION_Handle *cfg,
- struct GNUNET_TESTING_Daemon *d,
- const char *emsg)
-{
- struct StartContext *sctx = cls;
- unsigned int i;
-
- if (emsg != NULL)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to start daemon: %s\n"),
- emsg);
- return;
- }
- GNUNET_assert (sctx->have < sctx->total);
- sctx->daemons[sctx->have]->cfg = GNUNET_CONFIGURATION_dup (cfg);
- sctx->daemons[sctx->have]->group = sctx->group;
- sctx->daemons[sctx->have]->daemon = d;
- sctx->daemons[sctx->have]->id = *id;
- sctx->have++;
- if (sctx->have == sctx->total)
- {
- GNUNET_SCHEDULER_add_continuation (sctx->sched,
- sctx->cont,
- sctx->cont_cls,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
- GNUNET_CONFIGURATION_destroy (sctx->cfg);
- GNUNET_SCHEDULER_cancel (sctx->sched,
- sctx->timeout_task);
- for (i=0;i<sctx->total;i++)
- sctx->daemons[i]->fs = GNUNET_FS_start (sctx->sched,
- sctx->daemons[i]->cfg,
- "<tester>",
- &progress_cb,
- sctx->daemons[i],
- GNUNET_FS_FLAGS_NONE,
- GNUNET_FS_OPTIONS_END);
- GNUNET_free (sctx);
- }
-}
-
-
-static void
-start_timeout (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct StartContext *sctx = cls;
- unsigned int i;
-
- GNUNET_TESTING_daemons_stop (sctx->group);
- for (i=0;i<sctx->total;i++)
- {
- if (i < sctx->have)
- GNUNET_CONFIGURATION_destroy (sctx->daemons[i]->cfg);
- GNUNET_free (sctx->daemons[i]);
- }
- GNUNET_CONFIGURATION_destroy (sctx->cfg);
- GNUNET_SCHEDULER_add_continuation (sctx->sched,
- sctx->cont,
- sctx->cont_cls,
- GNUNET_SCHEDULER_REASON_TIMEOUT);
- GNUNET_free (sctx);
-}
-
-
-/**
- * Start daemons for testing.
- *
- * @param sched scheduler to use
- * @param timeout if this operation cannot be completed within the
- * given period, call the continuation with an error code
- * @param total number of daemons to start
- * @param daemons array of 'total' entries to be initialized
- * (array must already be allocated, will be filled)
- * @param cont function to call when done
- * @param cont_cls closure for cont
- */
-void
-GNUNET_FS_TEST_daemons_start (struct GNUNET_SCHEDULER_Handle *sched,
- struct GNUNET_TIME_Relative timeout,
- unsigned int total,
- struct GNUNET_FS_TestDaemon **daemons,
- GNUNET_SCHEDULER_Task cont,
- void *cont_cls)
-{
- struct StartContext *sctx;
- unsigned int i;
-
- GNUNET_assert (total > 0);
- sctx = GNUNET_malloc (sizeof (struct StartContext));
- sctx->sched = sched;
- sctx->daemons = daemons;
- sctx->total = total;
- sctx->cont = cont;
- sctx->cont_cls = cont_cls;
- sctx->cfg = GNUNET_CONFIGURATION_create ();
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_load (sctx->cfg,
- "test_fs_lib_data.conf"))
- {
- GNUNET_break (0);
- GNUNET_CONFIGURATION_destroy (sctx->cfg);
- GNUNET_free (sctx);
- GNUNET_SCHEDULER_add_continuation (sched,
- cont,
- cont_cls,
- GNUNET_SCHEDULER_REASON_TIMEOUT);
- return;
- }
- for (i=0;i<total;i++)
- daemons[i] = GNUNET_malloc (sizeof (struct GNUNET_FS_TestDaemon));
- sctx->group = GNUNET_TESTING_daemons_start (sched,
- sctx->cfg,
- total,
- ¬ify_running,
- sctx,
- NULL, NULL,
- NULL);
- sctx->timeout_task = GNUNET_SCHEDULER_add_delayed (sched,
- timeout,
- &start_timeout,
- sctx);
-}
-
-
-struct ConnectContext
-{
- struct GNUNET_SCHEDULER_Handle *sched;
- GNUNET_SCHEDULER_Task cont;
- void *cont_cls;
-};
-
-
-static void
-notify_connection (void *cls,
- const struct GNUNET_PeerIdentity *first,
- const struct GNUNET_PeerIdentity *second,
- const struct GNUNET_CONFIGURATION_Handle *first_cfg,
- const struct GNUNET_CONFIGURATION_Handle *second_cfg,
- struct GNUNET_TESTING_Daemon *first_daemon,
- struct GNUNET_TESTING_Daemon *second_daemon,
- const char *emsg)
-{
- struct ConnectContext *cc = cls;
-
- if (emsg != NULL)
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Failed to connect peers: %s\n"),
- emsg);
- GNUNET_SCHEDULER_add_continuation (cc->sched,
- cc->cont,
- cc->cont_cls,
- (emsg != NULL)
- ? GNUNET_SCHEDULER_REASON_TIMEOUT
- : GNUNET_SCHEDULER_REASON_PREREQ_DONE);
- GNUNET_free (cc);
-}
-
-
-/**
- * Connect two daemons for testing.
- *
- * @param sched scheduler to use
- * @param daemon1 first daemon to connect
- * @param daemon2 second first daemon to connect
- * @param timeout if this operation cannot be completed within the
- * given period, call the continuation with an error code
- * @param cont function to call when done
- * @param cont_cls closure for cont
- */
-void
-GNUNET_FS_TEST_daemons_connect (struct GNUNET_SCHEDULER_Handle *sched,
- struct GNUNET_FS_TestDaemon *daemon1,
- struct GNUNET_FS_TestDaemon *daemon2,
- struct GNUNET_TIME_Relative timeout,
- GNUNET_SCHEDULER_Task cont,
- void *cont_cls)
-{
- struct ConnectContext *ncc;
-
- ncc = GNUNET_malloc (sizeof (struct ConnectContext));
- ncc->sched = sched;
- ncc->cont = cont;
- ncc->cont_cls = cont_cls;
- GNUNET_TESTING_daemons_connect (daemon1->daemon,
- daemon2->daemon,
- timeout,
- ¬ify_connection,
- ncc);
-}
-
-
-/**
- * Stop daemons used for testing.
- *
- * @param sched scheduler to use
- * @param timeout if this operation cannot be completed within the
- * given period, call the continuation with an error code
- * @param total number of daemons to stop
- * @param daemons array with the daemons (values will be clobbered)
- * @param cont function to call when done
- * @param cont_cls closure for cont
- */
-void
-GNUNET_FS_TEST_daemons_stop (struct GNUNET_SCHEDULER_Handle *sched,
- unsigned int total,
- struct GNUNET_FS_TestDaemon **daemons)
-{
- unsigned int i;
-
- GNUNET_assert (total > 0);
- GNUNET_TESTING_daemons_stop (daemons[0]->group);
- for (i=0;i<total;i++)
- {
- GNUNET_CONFIGURATION_destroy (daemons[i]->cfg);
- GNUNET_free (daemons[i]);
- daemons[i] = NULL;
- }
-}
-
-
-static void
-publish_timeout (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct GNUNET_FS_TestDaemon *daemon = cls;
- GNUNET_FS_TEST_UriContinuation cont;
-
- cont = daemon->publish_cont;
- daemon->publish_timeout_task = GNUNET_SCHEDULER_NO_TASK;
- daemon->publish_cont = NULL;
- GNUNET_FS_publish_stop (daemon->publish_context);
- daemon->publish_context = NULL;
- cont (daemon->publish_cont_cls,
- NULL);
-}
-
-
-static size_t
-file_generator (void *cls,
- uint64_t offset,
- size_t max,
- void *buf,
- char **emsg)
-{
- struct GNUNET_FS_TestDaemon *daemon = cls;
- uint64_t pos;
- uint8_t *cbuf = buf;
-
- for (pos=0;pos<max;pos++)
- cbuf[pos] = (uint8_t) ((offset * daemon->publish_seed) % (255 - (offset /
1024 / 32)));
- return max;
-}
-
-
-
-/**
- * Publish a file at the given daemon.
- *
- * @param sched scheduler to use
- * @param daemon where to publish
- * @param timeout if this operation cannot be completed within the
- * given period, call the continuation with an error code
- * @param anonymity option for publication
- * @param do_index GNUNET_YES for index, GNUNET_NO for insertion,
- * GNUNET_SYSERR for simulation
- * @param size size of the file to publish
- * @param seed seed to use for file generation
- * @param verbose how verbose to be in reporting
- * @param cont function to call when done
- * @param cont_cls closure for cont
- */
-void
-GNUNET_FS_TEST_publish (struct GNUNET_SCHEDULER_Handle *sched,
- struct GNUNET_FS_TestDaemon *daemon,
- struct GNUNET_TIME_Relative timeout,
- uint32_t anonymity,
- int do_index,
- uint64_t size,
- uint32_t seed,
- unsigned int verbose,
- GNUNET_FS_TEST_UriContinuation cont,
- void *cont_cls)
-{
- GNUNET_assert (daemon->publish_cont == NULL);
- struct GNUNET_FS_FileInformation *fi;
-
- daemon->publish_cont = cont;
- daemon->publish_cont_cls = cont_cls;
- daemon->publish_seed = seed;
- daemon->verbose = verbose;
- daemon->publish_sched = sched;
- fi = GNUNET_FS_file_information_create_from_reader (daemon,
- size,
- &file_generator,
- daemon,
- NULL,
- NULL,
- do_index,
- anonymity,
- 42 /* priority */,
-
GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_HOURS));
- daemon->publish_context = GNUNET_FS_publish_start (daemon->fs,
- fi,
- NULL, NULL, NULL,
-
GNUNET_FS_PUBLISH_OPTION_NONE);
- daemon->publish_timeout_task = GNUNET_SCHEDULER_add_delayed (sched,
- timeout,
- &publish_timeout,
- daemon);
-}
-
-
-static void
-download_timeout (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct GNUNET_FS_TestDaemon *daemon = cls;
-
- daemon->download_timeout_task = GNUNET_SCHEDULER_NO_TASK;
- GNUNET_SCHEDULER_add_continuation (daemon->download_sched,
- daemon->download_cont,
- daemon->download_cont_cls,
- GNUNET_SCHEDULER_REASON_TIMEOUT);
- daemon->download_cont = NULL;
- daemon->download_sched = NULL;
-}
-
-
-/**
- * Perform test download.
- *
- * @param sched scheduler to use
- * @param daemon which peer to download from
- * @param timeout if this operation cannot be completed within the
- * given period, call the continuation with an error code
- * @param anonymity option for download
- * @param seed used for file validation
- * @param verbose how verbose to be in reporting
- * @param cont function to call when done
- * @param cont_cls closure for cont
- */
-void
-GNUNET_FS_TEST_download (struct GNUNET_SCHEDULER_Handle *sched,
- struct GNUNET_FS_TestDaemon *daemon,
- struct GNUNET_TIME_Relative timeout,
- uint32_t anonymity,
- uint32_t seed,
- const struct GNUNET_FS_Uri *uri,
- unsigned int verbose,
- GNUNET_SCHEDULER_Task cont,
- void *cont_cls)
-{
- uint64_t size;
-
- GNUNET_assert (daemon->download_cont == NULL);
- size = GNUNET_FS_uri_chk_get_file_size (uri);
- daemon->verbose = verbose;
- daemon->download_sched = sched;
- daemon->download_cont = cont;
- daemon->download_cont_cls = cont_cls;
- daemon->download_seed = seed;
- daemon->download_context = GNUNET_FS_download_start (daemon->fs,
- uri,
- NULL,
- NULL,
- 0,
- size,
- anonymity,
-
GNUNET_FS_DOWNLOAD_OPTION_NONE,
- NULL,
- NULL);
- daemon->download_timeout_task = GNUNET_SCHEDULER_add_delayed (sched,
- timeout,
-
&download_timeout,
- daemon);
-}
-
-/* end of test_fs_lib.c */
Deleted: gnunet/src/fs/test_fs_lib.h
===================================================================
--- gnunet/src/fs/test_fs_lib.h 2010-02-22 10:09:34 UTC (rev 10392)
+++ gnunet/src/fs/test_fs_lib.h 2010-02-22 10:09:38 UTC (rev 10393)
@@ -1,161 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2010 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_lib.h
- * @brief library routines for testing FS publishing and downloading
- * with multiple peers; this code is limited to flat files
- * and no keywords (those functions can be tested with
- * single-peer setups; this is for testing routing).
- * @author Christian Grothoff
- */
-#ifndef TEST_FS_LIB_H
-#define TEST_FS_LIB_H
-
-#include "gnunet_util_lib.h"
-#include "gnunet_fs_service.h"
-
-/**
- * Handle for a daemon started for testing FS.
- */
-struct GNUNET_FS_TestDaemon;
-
-
-/**
- * Start daemons for testing.
- *
- * @param sched scheduler to use
- * @param timeout if this operation cannot be completed within the
- * given period, call the continuation with an error code
- * @param total number of daemons to start
- * @param daemons array of 'total' entries to be initialized
- * (array must already be allocated, will be filled)
- * @param cont function to call when done
- * @param cont_cls closure for cont
- */
-void
-GNUNET_FS_TEST_daemons_start (struct GNUNET_SCHEDULER_Handle *sched,
- struct GNUNET_TIME_Relative timeout,
- unsigned int total,
- struct GNUNET_FS_TestDaemon **daemons,
- GNUNET_SCHEDULER_Task cont,
- void *cont_cls);
-
-
-/**
- * Connect two daemons for testing.
- *
- * @param sched scheduler to use
- * @param daemon1 first daemon to connect
- * @param daemon2 second first daemon to connect
- * @param timeout if this operation cannot be completed within the
- * given period, call the continuation with an error code
- * @param cont function to call when done
- * @param cont_cls closure for cont
- */
-void
-GNUNET_FS_TEST_daemons_connect (struct GNUNET_SCHEDULER_Handle *sched,
- struct GNUNET_FS_TestDaemon *daemon1,
- struct GNUNET_FS_TestDaemon *daemon2,
- struct GNUNET_TIME_Relative timeout,
- GNUNET_SCHEDULER_Task cont,
- void *cont_cls);
-
-
-/**
- * Stop daemons used for testing.
- *
- * @param sched scheduler to use
- * @param total number of daemons to stop
- * @param daemons array with the daemons (values will be clobbered)
- */
-void
-GNUNET_FS_TEST_daemons_stop (struct GNUNET_SCHEDULER_Handle *sched,
- unsigned int total,
- struct GNUNET_FS_TestDaemon **daemons);
-
-
-/**
- * Function signature.
- *
- * @param cls closure (user defined)
- * @param uri a URI, NULL for errors
- */
-typedef void
-(*GNUNET_FS_TEST_UriContinuation)(void *cls,
- const struct GNUNET_FS_Uri *uri);
-
-
-/**
- * Publish a file at the given daemon.
- *
- * @param sched scheduler to use
- * @param daemon where to publish
- * @param timeout if this operation cannot be completed within the
- * given period, call the continuation with an error code
- * @param anonymity option for publication
- * @param do_index GNUNET_YES for index, GNUNET_NO for insertion,
- * GNUNET_SYSERR for simulation
- * @param size size of the file to publish
- * @param seed seed to use for file generation
- * @param verbose how verbose to be in reporting
- * @param cont function to call when done
- * @param cont_cls closure for cont
- */
-void
-GNUNET_FS_TEST_publish (struct GNUNET_SCHEDULER_Handle *sched,
- struct GNUNET_FS_TestDaemon *daemon,
- struct GNUNET_TIME_Relative timeout,
- uint32_t anonymity,
- int do_index,
- uint64_t size,
- uint32_t seed,
- unsigned int verbose,
- GNUNET_FS_TEST_UriContinuation cont,
- void *cont_cls);
-
-
-/**
- * Perform test download.
- *
- * @param sched scheduler to use
- * @param daemon which peer to download from
- * @param timeout if this operation cannot be completed within the
- * given period, call the continuation with an error code
- * @param anonymity option for download
- * @param seed used for file validation
- * @param verbose how verbose to be in reporting
- * @param cont function to call when done
- * @param cont_cls closure for cont
- */
-void
-GNUNET_FS_TEST_download (struct GNUNET_SCHEDULER_Handle *sched,
- struct GNUNET_FS_TestDaemon *daemon,
- struct GNUNET_TIME_Relative timeout,
- uint32_t anonymity,
- uint32_t seed,
- const struct GNUNET_FS_Uri *uri,
- unsigned int verbose,
- GNUNET_SCHEDULER_Task cont,
- void *cont_cls);
-
-
-
-#endif
Copied: gnunet/src/fs/test_fs_test_lib.c (from rev 10388,
gnunet/src/fs/test_gnunet_service_fs_p2p.c)
===================================================================
--- gnunet/src/fs/test_fs_test_lib.c (rev 0)
+++ gnunet/src/fs/test_fs_test_lib.c 2010-02-22 10:09:38 UTC (rev 10393)
@@ -0,0 +1,162 @@
+/*
+ This file is part of GNUnet.
+ (C) 2010 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_test_lib.c
+ * @brief test fs test library
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "test_fs_lib.h"
+
+#define VERBOSE 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, 60)
+
+#define NUM_DAEMONS 2
+
+#define SEED 42
+
+static struct GNUNET_FS_TestDaemon *daemons[NUM_DAEMONS];
+
+static struct GNUNET_SCHEDULER_Handle *sched;
+
+
+static void
+do_stop (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ GNUNET_assert (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Finished download, shutting down\n",
+ (unsigned long long) FILESIZE);
+ GNUNET_FS_TEST_daemons_stop (sched,
+ NUM_DAEMONS,
+ daemons);
+}
+
+
+static void
+do_download (void *cls,
+ const struct GNUNET_FS_Uri *uri)
+{
+ GNUNET_assert (NULL != uri);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Downloading %llu bytes\n",
+ (unsigned long long) FILESIZE);
+ GNUNET_FS_TEST_download (sched,
+ daemons[0],
+ TIMEOUT,
+ 1, SEED, uri,
+ VERBOSE,
+ &do_stop, NULL);
+}
+
+
+static void
+do_publish (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ GNUNET_assert (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Publishing %llu bytes\n",
+ (unsigned long long) FILESIZE);
+ GNUNET_FS_TEST_publish (sched,
+ daemons[0],
+ TIMEOUT,
+ 1, GNUNET_NO, FILESIZE, SEED,
+ VERBOSE,
+ &do_download, NULL);
+}
+
+
+static void
+do_connect (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ GNUNET_assert (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Daemons started, will now try to connect them\n");
+ GNUNET_FS_TEST_daemons_connect (sched,
+ daemons[0],
+ daemons[1],
+ TIMEOUT,
+ &do_publish,
+ NULL);
+}
+
+
+static void
+run (void *cls,
+ struct GNUNET_SCHEDULER_Handle *s,
+ char *const *args,
+ const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+ sched = s;
+ GNUNET_FS_TEST_daemons_start (sched,
+ TIMEOUT,
+ NUM_DAEMONS,
+ daemons,
+ &do_connect,
+ NULL);
+}
+
+
+int
+main (int argc, char *argv[])
+{
+ char *const argvx[] = {
+ "test-gnunet-service-fs-p2p",
+ "-c",
+ "test_fs_lib_data.conf",
+#if VERBOSE
+ "-L", "DEBUG",
+#endif
+ NULL
+ };
+ struct GNUNET_GETOPT_CommandLineOption options[] = {
+ GNUNET_GETOPT_OPTION_END
+ };
+
+ GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
+ GNUNET_log_setup ("test_gnunet_service_fs_p2p",
+#if VERBOSE
+ "DEBUG",
+#else
+ "WARNING",
+#endif
+ NULL);
+ GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1,
+ argvx, "test-gnunet-service-fs-p2p",
+ "nohelp", options, &run, NULL);
+ GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
+ return 0;
+}
+
+/* end of test_gnunet_service_fs_p2p.c */
Modified: gnunet/src/fs/test_gnunet_service_fs_p2p.c
===================================================================
--- gnunet/src/fs/test_gnunet_service_fs_p2p.c 2010-02-22 10:09:34 UTC (rev
10392)
+++ gnunet/src/fs/test_gnunet_service_fs_p2p.c 2010-02-22 10:09:38 UTC (rev
10393)
@@ -87,7 +87,7 @@
"Publishing %llu bytes\n",
(unsigned long long) FILESIZE);
GNUNET_FS_TEST_publish (sched,
- daemons[0],
+ daemons[1],
TIMEOUT,
1, GNUNET_NO, FILESIZE, SEED,
VERBOSE,
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r10393 - gnunet/src/fs,
gnunet <=