[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r24462 - gnunet/src/testbed
From: |
gnunet |
Subject: |
[GNUnet-SVN] r24462 - gnunet/src/testbed |
Date: |
Mon, 22 Oct 2012 22:52:27 +0200 |
Author: harsha
Date: 2012-10-22 22:52:27 +0200 (Mon, 22 Oct 2012)
New Revision: 24462
Added:
gnunet/src/testbed/test_testbed_api_topology_clique.c
Modified:
gnunet/src/testbed/
gnunet/src/testbed/Makefile.am
gnunet/src/testbed/testbed_api_topology.c
Log:
clique topology
Index: gnunet/src/testbed
===================================================================
--- gnunet/src/testbed 2012-10-22 18:18:04 UTC (rev 24461)
+++ gnunet/src/testbed 2012-10-22 20:52:27 UTC (rev 24462)
Property changes on: gnunet/src/testbed
___________________________________________________________________
Modified: svn:ignore
## -19,4 +19,4 ##
test_testbed_api_test
test_gnunet_helper_testbed
test_testbed_api_topology
-
+test_testbed_api_topology_clique
Modified: gnunet/src/testbed/Makefile.am
===================================================================
--- gnunet/src/testbed/Makefile.am 2012-10-22 18:18:04 UTC (rev 24461)
+++ gnunet/src/testbed/Makefile.am 2012-10-22 20:52:27 UTC (rev 24462)
@@ -87,7 +87,8 @@
test_testbed_api_testbed_run \
test_testbed_api_test \
test_gnunet_helper_testbed \
- test_testbed_api_topology
+ test_testbed_api_topology \
+ test_testbed_api_topology_clique
if ENABLE_TEST_RUN
TESTS = \
@@ -100,7 +101,8 @@
test_testbed_api_controllerlink \
test_testbed_api_testbed_run \
test_testbed_api_test \
- test_testbed_api_topology
+ test_testbed_api_topology \
+ test_testbed_api_topology_clique
endif
test_testbed_api_hosts_SOURCES = \
@@ -161,6 +163,12 @@
$(top_builddir)/src/util/libgnunetutil.la \
libgnunettestbed.la
+test_testbed_api_topology_clique_SOURCES = \
+ test_testbed_api_topology_clique.c
+test_testbed_api_topology_clique_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettestbed.la
+
test_gnunet_helper_testbed_SOURCES = \
test_gnunet_helper_testbed.c
test_gnunet_helper_testbed_LDADD = \
Copied: gnunet/src/testbed/test_testbed_api_topology_clique.c (from rev 24461,
gnunet/src/testbed/test_testbed_api_topology.c)
===================================================================
--- gnunet/src/testbed/test_testbed_api_topology_clique.c
(rev 0)
+++ gnunet/src/testbed/test_testbed_api_topology_clique.c 2012-10-22
20:52:27 UTC (rev 24462)
@@ -0,0 +1,169 @@
+/*
+ This file is part of GNUnet
+ (C) 2008--2012 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 3, 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 src/testbed/test_testbed_api_topology.c
+ * @brief testing cases for testing high level testbed api helper functions
+ * @author Sree Harsha Totakura <address@hidden>
+ */
+
+#include "platform.h"
+#include "gnunet_common.h"
+#include "gnunet_testbed_service.h"
+
+/**
+ * Number of peers we want to start
+ */
+#define NUM_PEERS 10
+
+/**
+ * Array of peers
+ */
+static struct GNUNET_TESTBED_Peer **peers;
+
+/**
+ * Operation handle
+ */
+static struct GNUNET_TESTBED_Operation *op;
+
+/**
+ * Shutdown task
+ */
+static GNUNET_SCHEDULER_TaskIdentifier shutdown_task;
+
+/**
+ * Testing result
+ */
+static int result;
+
+/**
+ * Counter for counting overlay connections
+ */
+static unsigned int overlay_connects;
+
+
+/**
+ * Shutdown nicely
+ *
+ * @param cls NULL
+ * @param tc the task context
+ */
+static void
+do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ shutdown_task = GNUNET_SCHEDULER_NO_TASK;
+ if (NULL != op)
+ {
+ GNUNET_TESTBED_operation_done (op);
+ op = NULL;
+ }
+ GNUNET_SCHEDULER_shutdown ();
+}
+
+/**
+ * Controller event callback
+ *
+ * @param cls NULL
+ * @param event the controller event
+ */
+static void
+controller_event_cb (void *cls,
+ const struct GNUNET_TESTBED_EventInformation *event)
+{
+ switch (event->type)
+ {
+ case GNUNET_TESTBED_ET_CONNECT:
+ overlay_connects++;
+ if ((NUM_PEERS * (NUM_PEERS - 1)) == overlay_connects)
+ {
+ result = GNUNET_OK;
+ GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ }
+ break;
+ case GNUNET_TESTBED_ET_OPERATION_FINISHED:
+ GNUNET_assert (NULL != event->details.operation_finished.emsg);
+ break;
+ default:
+ GNUNET_break (0);
+ if ((GNUNET_TESTBED_ET_OPERATION_FINISHED == event->type) &&
+ (NULL != event->details.operation_finished.emsg))
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "An operation failed with error: %s\n",
+ event->details.operation_finished.emsg);
+ result = GNUNET_SYSERR;
+ GNUNET_SCHEDULER_cancel (shutdown_task);
+ shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ }
+}
+
+
+/**
+ * Signature of a main function for a testcase.
+ *
+ * @param cls closure
+ * @param num_peers number of peers in 'peers'
+ * @param peers handle to peers run in the testbed
+ */
+static void
+test_master (void *cls, unsigned int num_peers,
+ struct GNUNET_TESTBED_Peer **peers_)
+{
+ unsigned int peer;
+
+ GNUNET_assert (NULL == cls);
+ GNUNET_assert (NUM_PEERS == num_peers);
+ GNUNET_assert (NULL != peers_);
+ for (peer = 0; peer < num_peers; peer++)
+ GNUNET_assert (NULL != peers_[peer]);
+ peers = peers_;
+ overlay_connects = 0;
+ op = GNUNET_TESTBED_overlay_configure_topology (NULL, NUM_PEERS, peers,
+
GNUNET_TESTBED_TOPOLOGY_CLIQUE,
+ /*
GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI, */
+ /* NUM_PEERS, */
+
GNUNET_TESTBED_TOPOLOGY_OPTION_END);
+ GNUNET_assert (NULL != op);
+ shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS,
120),
+ do_shutdown, NULL);
+}
+
+
+/**
+ * Main function
+ */
+int
+main (int argc, char **argv)
+{
+ uint64_t event_mask;
+
+ result = GNUNET_SYSERR;
+ event_mask = 0;
+ event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT);
+ event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED);
+ GNUNET_TESTBED_test_run ("test_testbed_api_test", "test_testbed_api.conf",
+ NUM_PEERS, event_mask, &controller_event_cb, NULL,
+ &test_master, NULL);
+ if (GNUNET_OK != result)
+ return 1;
+ return 0;
+}
+
+/* end of test_testbed_api_topology.c */
Modified: gnunet/src/testbed/testbed_api_topology.c
===================================================================
--- gnunet/src/testbed/testbed_api_topology.c 2012-10-22 18:18:04 UTC (rev
24461)
+++ gnunet/src/testbed/testbed_api_topology.c 2012-10-22 20:52:27 UTC (rev
24462)
@@ -298,6 +298,30 @@
tc->link_array[cnt].tc = tc;
}
break;
+ case GNUNET_TESTBED_TOPOLOGY_CLIQUE:
+ tc->link_array_size = num_peers * (num_peers - 1);
+ tc->link_array = GNUNET_malloc (sizeof (struct OverlayLink) *
+ tc->link_array_size);
+ {
+ unsigned int offset;
+
+ offset = 0;
+ for (cnt=0; cnt < num_peers; cnt++)
+ {
+ unsigned int neighbour;
+
+ for (neighbour=0; neighbour < num_peers; neighbour++)
+ {
+ if (neighbour == cnt)
+ continue;
+ tc->link_array[offset].A = cnt;
+ tc->link_array[offset].B = neighbour;
+ tc->link_array[offset].tc = tc;
+ offset++;
+ }
+ }
+ }
+ break;
default:
GNUNET_break (0);
return NULL;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r24462 - gnunet/src/testbed,
gnunet <=