[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r9386 - gnunet/src/topology
From: |
gnunet |
Subject: |
[GNUnet-SVN] r9386 - gnunet/src/topology |
Date: |
Mon, 2 Nov 2009 14:28:39 -0700 |
Author: grothoff
Date: 2009-11-02 14:28:39 -0700 (Mon, 02 Nov 2009)
New Revision: 9386
Added:
gnunet/src/topology/test_gnunet_service_topology.c
gnunet/src/topology/test_gnunet_service_topology_data.conf
Modified:
gnunet/src/topology/Makefile.am
gnunet/src/topology/gnunet-daemon-topology.c
Log:
basic topology test
Modified: gnunet/src/topology/Makefile.am
===================================================================
--- gnunet/src/topology/Makefile.am 2009-11-02 21:28:08 UTC (rev 9385)
+++ gnunet/src/topology/Makefile.am 2009-11-02 21:28:39 UTC (rev 9386)
@@ -18,3 +18,17 @@
$(GN_LIBINTL)
+
+check_PROGRAMS = \
+ test_gnunet_service_topology
+
+TESTS = $(check_PROGRAMS)
+
+test_gnunet_service_topology_SOURCES = \
+ test_gnunet_service_topology.c
+test_gnunet_service_topology_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+EXTRA_DIST = \
+ test_gnunet_service_topology_data.conf
Modified: gnunet/src/topology/gnunet-daemon-topology.c
===================================================================
--- gnunet/src/topology/gnunet-daemon-topology.c 2009-11-02 21:28:08 UTC
(rev 9385)
+++ gnunet/src/topology/gnunet-daemon-topology.c 2009-11-02 21:28:39 UTC
(rev 9386)
@@ -20,7 +20,7 @@
/**
* @file topology/gnunet-daemon-topology.c
- * @brief code for bootstrapping via topology servers
+ * @brief code for maintaining the mesh topology
* @author Christian Grothoff
*/
Added: gnunet/src/topology/test_gnunet_service_topology.c
===================================================================
--- gnunet/src/topology/test_gnunet_service_topology.c
(rev 0)
+++ gnunet/src/topology/test_gnunet_service_topology.c 2009-11-02 21:28:39 UTC
(rev 9386)
@@ -0,0 +1,121 @@
+/*
+ This file is part of GNUnet.
+ (C) 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 topology/test_gnunet_service_topology.c
+ * @brief testcase for topology maintenance code
+ */
+#include "platform.h"
+#include "gnunet_testing_lib.h"
+
+#define VERBOSE GNUNET_NO
+
+#define NUM_PEERS 10
+
+/**
+ * How long until we give up on connecting the peers?
+ */
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
+
+
+static int ok;
+
+static int peers_left;
+
+static struct GNUNET_TESTING_PeerGroup *pg;
+
+static struct GNUNET_SCHEDULER_Handle *sched;
+
+
+static void my_cb(void *cls,
+ const struct GNUNET_PeerIdentity *id,
+ const struct GNUNET_CONFIGURATION_Handle *cfg,
+ struct GNUNET_TESTING_Daemon *d,
+ const char *emsg)
+{
+ GNUNET_assert (id != NULL);
+ peers_left--;
+ if (peers_left == 0)
+ {
+ /* FIXME: connect a few... */
+ GNUNET_TESTING_daemons_stop (pg);
+ ok = 0;
+ }
+}
+
+
+static void
+run (void *cls,
+ struct GNUNET_SCHEDULER_Handle *s,
+ char *const *args,
+ const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+ sched = s;
+ ok = 1;
+#if VERBOSE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Starting daemons.\n");
+#endif
+ peers_left = NUM_PEERS;
+ pg = GNUNET_TESTING_daemons_start (sched, cfg,
+ peers_left,
+ &my_cb, NULL, NULL);
+ GNUNET_assert (pg != NULL);
+}
+
+static int
+check ()
+{
+ char *const argv[] = { "test-testing",
+ "-c",
+ "test_gnunet_service_topology_data.conf",
+#if VERBOSE
+ "-L", "DEBUG",
+#endif
+ NULL
+ };
+ struct GNUNET_GETOPT_CommandLineOption options[] = {
+ GNUNET_GETOPT_OPTION_END
+ };
+ GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
+ argv, "test-gnunet-service-topology", "nohelp",
+ options, &run, &ok);
+ return ok;
+}
+
+int
+main (int argc, char *argv[])
+{
+ int ret;
+
+ GNUNET_log_setup ("test-gnunet-service-topology",
+#if VERBOSE
+ "DEBUG",
+#else
+ "WARNING",
+#endif
+ NULL);
+ ret = check ();
+ sleep (1);
+ GNUNET_DISK_directory_remove ("/tmp/test-gnunet-topology");
+ return ret;
+}
+
+/* end of test_gnunet_service_topology.c */
Added: gnunet/src/topology/test_gnunet_service_topology_data.conf
===================================================================
--- gnunet/src/topology/test_gnunet_service_topology_data.conf
(rev 0)
+++ gnunet/src/topology/test_gnunet_service_topology_data.conf 2009-11-02
21:28:39 UTC (rev 9386)
@@ -0,0 +1,34 @@
+[PATHS]
+SERVICEHOME = /tmp/test-gnunet-topology/
+DEFAULTCONFIG = test_gnunet_service_topology_data.conf
+
+[resolver]
+PORT = 2664
+
+[transport]
+PORT = 2665
+PLUGINS = tcp
+#PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args
+#PREFIX = valgrind --tool=memcheck --log-file=logs%p
+
+[arm]
+PORT = 2666
+DEFAULTSERVICES = peerinfo transport core topology
+
+[statistics]
+PORT = 2667
+
+[transport-tcp]
+PORT = 2668
+
+[peerinfo]
+PORT = 2669
+
+[core]
+PORT = 2670
+
+[topology]
+
+
+[testing]
+WEAKRANDOM = YES
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r9386 - gnunet/src/topology,
gnunet <=