[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r6851 - GNUnet/src/applications/dht/tools
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r6851 - GNUnet/src/applications/dht/tools |
|
Date: |
Mon, 19 May 2008 20:25:27 -0600 (MDT) |
Author: grothoff
Date: 2008-05-19 20:25:27 -0600 (Mon, 19 May 2008)
New Revision: 6851
Added:
GNUnet/src/applications/dht/tools/dht_loopback_test.c
GNUnet/src/applications/dht/tools/dht_multipeer_test.c
GNUnet/src/applications/dht/tools/dht_twopeer_test.c
Removed:
GNUnet/src/applications/dht/tools/dhttest.c
GNUnet/src/applications/dht/tools/dhttest2.c
Modified:
GNUnet/src/applications/dht/tools/Makefile.am
Log:
renaming and new test
Modified: GNUnet/src/applications/dht/tools/Makefile.am
===================================================================
--- GNUnet/src/applications/dht/tools/Makefile.am 2008-05-19 18:00:50 UTC
(rev 6850)
+++ GNUnet/src/applications/dht/tools/Makefile.am 2008-05-20 02:25:27 UTC
(rev 6851)
@@ -21,26 +21,35 @@
check_PROGRAMS = \
- dhttest2 \
- dhttest
+ dhttest_loopback_test \
+ dhttest_twopeer_test \
+ dhttest_multipeer_test
TESTS = $(check_PROGRAMS)
-dhttest2_SOURCES = \
- dhttest2.c
-dhttest2_LDADD = \
+dht_loopback_test_SOURCES = \
+ dht_loopback_test.c
+dht_loopback_test_LDADD = \
$(top_builddir)/src/applications/stats/libgnunetstats_api.la \
$(top_builddir)/src/applications/testing/libgnunettesting_api.la \
$(top_builddir)/src/applications/dht/tools/libgnunetdht_api.la \
$(top_builddir)/src/util/libgnunetutil.la
-dhttest_SOURCES = \
- dhttest.c
-dhttest_LDADD = \
+dht_twopeer_test_SOURCES = \
+ dht_twopeer_test.c
+dht_twopeer_test_LDADD = \
$(top_builddir)/src/applications/stats/libgnunetstats_api.la \
$(top_builddir)/src/applications/testing/libgnunettesting_api.la \
$(top_builddir)/src/applications/dht/tools/libgnunetdht_api.la \
$(top_builddir)/src/util/libgnunetutil.la
+dht_multipeer_test_SOURCES = \
+ dht_multipeer_test.c
+dht_multipeer_test_LDADD = \
+ $(top_builddir)/src/applications/stats/libgnunetstats_api.la \
+ $(top_builddir)/src/applications/testing/libgnunettesting_api.la \
+ $(top_builddir)/src/applications/dht/tools/libgnunetdht_api.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
EXTRA_DIST = \
check.conf
Added: GNUnet/src/applications/dht/tools/dht_loopback_test.c
===================================================================
--- GNUnet/src/applications/dht/tools/dht_loopback_test.c
(rev 0)
+++ GNUnet/src/applications/dht/tools/dht_loopback_test.c 2008-05-20
02:25:27 UTC (rev 6851)
@@ -0,0 +1,148 @@
+/*
+ This file is part of GNUnet.
+ (C) 2005, 2006, 2007, 2008 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 applications/dht/tools/dht_loopback_test.c
+ * @brief DHT testcase using only a single peer
+ * @author Christian Grothoff
+ */
+
+#include "platform.h"
+#include "gnunet_protocols.h"
+#include "gnunet_dht_lib.h"
+#include "gnunet_testing_lib.h"
+#include "gnunet_stats_lib.h"
+#include "gnunet_util.h"
+
+
+#define START_PEERS 1
+
+
+static int ok;
+
+static int
+waitForConnect (const char *name, unsigned long long value, void *cls)
+{
+ if ((value > 0) && (0 == strcmp (_("# dht connections"), name)))
+ {
+ ok = 1;
+ return GNUNET_SYSERR;
+ }
+ return GNUNET_OK;
+}
+
+#define CHECK(a) do { if (!(a)) { ret = 1; GNUNET_GE_BREAK(ectx, 0); goto
FAILURE; } } while(0)
+
+/**
+ * Testcase to test DHT routing (2 peers only).
+ * @return 0: ok, -1: error
+ */
+int
+main (int argc, const char **argv)
+{
+#if START_PEERS
+ struct GNUNET_TESTING_DaemonContext *peers;
+#endif
+ int ret = 0;
+ GNUNET_HashCode key;
+ char *value;
+ struct GNUNET_GE_Context *ectx;
+ struct GNUNET_GC_Configuration *cfg;
+ struct GNUNET_ClientServerConnection *sock;
+ int left;
+
+ ectx = NULL;
+ cfg = GNUNET_GC_create ();
+ if (-1 == GNUNET_GC_parse_configuration (cfg, "check.conf"))
+ {
+ GNUNET_GC_free (cfg);
+ return -1;
+ }
+#if START_PEERS
+ peers = GNUNET_TESTING_start_daemons ("",
+ "advertising dht stats",
+ "/tmp/gnunet-dht-loopback-test",
+ 2087, 10000, 1);
+ if (peers == NULL)
+ {
+ GNUNET_GC_free (cfg);
+ return -1;
+ }
+#endif
+ GNUNET_GC_set_configuration_value_string (cfg,
+ ectx,
+ "NETWORK", "HOST",
+ "localhost:2087");
+ sock = GNUNET_client_connection_create (NULL, cfg);
+ /* actual test code */
+ GNUNET_hash ("key2", 4, &key);
+ value = GNUNET_malloc (8);
+ memset (&value[1], 'A', 8);
+ printf ("Storing key2\n");
+ CHECK (GNUNET_OK == GNUNET_DHT_put (cfg,
+ ectx,
+ &key,
+ GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
+ 8, value));
+ printf ("Getting key2\n");
+ CHECK (1 == GNUNET_DHT_get (cfg,
+ ectx,
+ GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
+ &key, 10 * GNUNET_CRON_SECONDS, NULL, NULL));
+ GNUNET_hash ("key", 3, &key);
+ value = GNUNET_malloc (8);
+ memset (&value[1], 'B', 8);
+ printf ("Storing key.\n");
+ CHECK (GNUNET_OK == GNUNET_DHT_put (cfg,
+ ectx,
+ &key,
+ GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
+ 8, value));
+ printf ("Getting key.\n");
+ CHECK (1 == GNUNET_DHT_get (cfg,
+ ectx,
+ GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
+ &key, 10 * GNUNET_CRON_SECONDS, NULL, NULL));
+ GNUNET_hash ("key2", 4, &key);
+ printf ("Getting key2");
+ left = 10;
+ do
+ {
+ fprintf (stderr, ".");
+ if (1 == GNUNET_DHT_get (cfg,
+ ectx,
+ GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
+ &key, 15 * GNUNET_CRON_SECONDS, NULL, NULL))
+ break;
+ left--;
+ }
+ while (left > 0);
+ fprintf (stderr, left > 0 ? "!\n" : "?\n");
+ /* end of actual test code */
+
+FAILURE:
+#if START_PEERS
+ GNUNET_TESTING_stop_daemons (peers);
+#endif
+ GNUNET_GC_free (cfg);
+ return ret;
+}
+
+/* end of dht_loopback_test.c */
Copied: GNUnet/src/applications/dht/tools/dht_multipeer_test.c (from rev 6839,
GNUnet/src/applications/dht/tools/dhttest.c)
===================================================================
--- GNUnet/src/applications/dht/tools/dht_multipeer_test.c
(rev 0)
+++ GNUnet/src/applications/dht/tools/dht_multipeer_test.c 2008-05-20
02:25:27 UTC (rev 6851)
@@ -0,0 +1,194 @@
+/*
+ This file is part of GNUnet.
+ (C) 2007 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 applications/dht/tools/dht_multipeer_test.c
+ * @brief DHT testcase
+ * @author Christian Grothoff
+ */
+
+#include "platform.h"
+#include "gnunet_protocols.h"
+#include "gnunet_dht_lib.h"
+#include "gnunet_testing_lib.h"
+#include "gnunet_stats_lib.h"
+#include "gnunet_util.h"
+
+/**
+ * How many peers should the testcase run? Note that
+ * we create a clique topology so the cost is quadratic!
+ */
+#define NUM_PEERS 8
+
+/**
+ * How many times will we try the DHT-GET operation before
+ * giving up for good?
+ */
+#define NUM_ROUNDS 10
+
+static int ok;
+
+static int
+waitForConnect (const char *name, unsigned long long value, void *cls)
+{
+ if ((value > 0) && (0 == strcmp (_("# dht connections"), name)))
+ {
+ ok = 1;
+ return GNUNET_SYSERR;
+ }
+ return GNUNET_OK;
+}
+
+#define CHECK(a) do { if (!(a)) { ret = 1; GNUNET_GE_BREAK(ectx, 0); goto
FAILURE; } } while(0)
+
+/**
+ * Testcase to test DHT routing (many peers).
+ * @return 0: ok, -1: error
+ */
+int
+main (int argc, const char **argv)
+{
+ struct GNUNET_TESTING_DaemonContext *peers;
+ int ret = 0;
+ GNUNET_HashCode key;
+ char *value;
+ struct GNUNET_GE_Context *ectx;
+ struct GNUNET_GC_Configuration *cfg;
+ struct GNUNET_ClientServerConnection *sock;
+ int left;
+ int i;
+ int j;
+ int k;
+ int found;
+ char buf[128];
+
+ ectx = NULL;
+ cfg = GNUNET_GC_create ();
+ if (-1 == GNUNET_GC_parse_configuration (cfg, "check.conf"))
+ {
+ GNUNET_GC_free (cfg);
+ return -1;
+ }
+ peers = GNUNET_TESTING_start_daemons ("tcp",
+ "advertising dht stats",
+ "/tmp/gnunet-dht-test",
+ 2087, 10, NUM_PEERS);
+ if (peers == NULL)
+ {
+ GNUNET_GC_free (cfg);
+ return -1;
+ }
+ for (i = 0; i < NUM_PEERS; i++)
+ {
+ for (j = 0; j < i; j++)
+ {
+ if (GNUNET_OK != GNUNET_TESTING_connect_daemons (2087 + 10 * i,
+ 2087 + 10 * j))
+ {
+ GNUNET_TESTING_stop_daemons (peers);
+ fprintf (stderr, "Failed to connect the peers!\n");
+ GNUNET_GC_free (cfg);
+ return -1;
+ }
+ }
+ }
+
+ /* put loop */
+ for (i = 0; i < NUM_PEERS; i++)
+ {
+ GNUNET_snprintf (buf, 128, "localhost:%u", 2087 + i * 10);
+ GNUNET_GC_set_configuration_value_string (cfg, ectx, "NETWORK", "HOST",
+ buf);
+ /* wait for some DHT's to find each other! */
+ sock = GNUNET_client_connection_create (NULL, cfg);
+ left = 30; /* how many iterations should we wait? */
+ while (GNUNET_OK ==
+ GNUNET_STATS_get_statistics (NULL, sock, &waitForConnect, NULL))
+ {
+ printf ("Waiting for peer to DHT-connect (%u iterations left)...\n",
+ left);
+ sleep (5);
+ left--;
+ if (left == 0)
+ break;
+ }
+ GNUNET_client_connection_destroy (sock);
+ if (ok == 0)
+ {
+ GNUNET_TESTING_stop_daemons (peers);
+ fprintf (stderr, "Peers' DHTs failed to DHT-connect!\n");
+ GNUNET_GC_free (cfg);
+ return -1;
+ }
+
+ GNUNET_hash (buf, 4, &key);
+ value = GNUNET_malloc (8);
+ memset (&value[1], 'A' + i, 8);
+ CHECK (GNUNET_OK == GNUNET_DHT_put (cfg,
+ ectx,
+ &key,
+
GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
+ 8, value));
+ GNUNET_free (value);
+ }
+
+ /* get loop */
+ found = 0;
+ for (i = 0; i < NUM_PEERS; i++)
+ {
+ GNUNET_snprintf (buf, 128, "localhost:%u", 2087 + i * 10);
+ GNUNET_GC_set_configuration_value_string (cfg,
+ ectx, "NETWORK", "HOST", buf);
+ for (j = 0; j < NUM_PEERS; j++)
+ {
+ GNUNET_snprintf (buf, 128, "localhost:%u", 2087 + j * 10);
+ GNUNET_hash (buf, 4, &key);
+ fprintf (stderr, "Peer %d gets key %d", i, j);
+ for (k = 0; k < NUM_ROUNDS; k++)
+ {
+ fprintf (stderr, ".");
+ if (0 < GNUNET_DHT_get (cfg,
+ ectx,
+ GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
+ &key,
+ 15 * GNUNET_CRON_SECONDS, NULL, NULL))
+ break;
+ }
+ if (k < NUM_ROUNDS)
+ {
+ fprintf (stderr, "!\n");
+ found++;
+ }
+ else
+ {
+ fprintf (stderr, "?\n");
+ }
+ }
+ }
+ /* end of actual test code */
+ fprintf (stderr,
+ "Found %u out of %u attempts.\n", found, NUM_PEERS * NUM_PEERS);
+FAILURE:
+ GNUNET_TESTING_stop_daemons (peers);
+ GNUNET_GC_free (cfg);
+ return ret;
+}
+
+/* end of dht_multipeer_test.c */
Copied: GNUnet/src/applications/dht/tools/dht_twopeer_test.c (from rev 6839,
GNUnet/src/applications/dht/tools/dhttest2.c)
===================================================================
--- GNUnet/src/applications/dht/tools/dht_twopeer_test.c
(rev 0)
+++ GNUnet/src/applications/dht/tools/dht_twopeer_test.c 2008-05-20
02:25:27 UTC (rev 6851)
@@ -0,0 +1,235 @@
+/*
+ This file is part of GNUnet.
+ (C) 2005, 2006, 2007 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 applications/dht/tools/dht_twopeer_test.c
+ * @brief DHT testcase
+ * @author Christian Grothoff
+ */
+
+#include "platform.h"
+#include "gnunet_protocols.h"
+#include "gnunet_dht_lib.h"
+#include "gnunet_testing_lib.h"
+#include "gnunet_stats_lib.h"
+#include "gnunet_util.h"
+
+
+#define START_PEERS 1
+
+
+static int ok;
+
+static int
+waitForConnect (const char *name, unsigned long long value, void *cls)
+{
+ if ((value > 0) && (0 == strcmp (_("# dht connections"), name)))
+ {
+ ok = 1;
+ return GNUNET_SYSERR;
+ }
+ return GNUNET_OK;
+}
+
+#define CHECK(a) do { if (!(a)) { ret = 1; GNUNET_GE_BREAK(ectx, 0); goto
FAILURE; } } while(0)
+
+/**
+ * Testcase to test DHT routing (2 peers only).
+ * @return 0: ok, -1: error
+ */
+int
+main (int argc, const char **argv)
+{
+#if START_PEERS
+ struct GNUNET_TESTING_DaemonContext *peers;
+#endif
+ int ret = 0;
+ GNUNET_HashCode key;
+ char *value;
+ struct GNUNET_GE_Context *ectx;
+ struct GNUNET_GC_Configuration *cfg;
+ struct GNUNET_ClientServerConnection *sock;
+ int left;
+
+ ectx = NULL;
+ cfg = GNUNET_GC_create ();
+ if (-1 == GNUNET_GC_parse_configuration (cfg, "check.conf"))
+ {
+ GNUNET_GC_free (cfg);
+ return -1;
+ }
+#if START_PEERS
+ peers = GNUNET_TESTING_start_daemons ("tcp",
+ "advertising dht stats",
+ "/tmp/gnunet-dht-test",
+ 2087, 10000, 2);
+ if (peers == NULL)
+ {
+ GNUNET_GC_free (cfg);
+ return -1;
+ }
+#endif
+ if (GNUNET_OK != GNUNET_TESTING_connect_daemons (2087, 12087))
+ {
+ GNUNET_TESTING_stop_daemons (peers);
+ fprintf (stderr, "Failed to connect the peers!\n");
+ GNUNET_GC_free (cfg);
+ return -1;
+ }
+
+ /* wait for DHT's to find each other! */
+ sock = GNUNET_client_connection_create (NULL, cfg);
+ left = 60; /* how many iterations should we wait? */
+ while (GNUNET_OK ==
+ GNUNET_STATS_get_statistics (NULL, sock, &waitForConnect, NULL))
+ {
+ printf ("Waiting for peers to DHT-connect (%u iterations left)...\n",
+ left);
+ sleep (5);
+ left--;
+ if (left == 0)
+ break;
+ }
+ GNUNET_client_connection_destroy (sock);
+ if (ok == 0)
+ {
+ GNUNET_TESTING_stop_daemons (peers);
+ fprintf (stderr, "Peers' DHTs failed to DHT-connect!\n");
+ GNUNET_GC_free (cfg);
+ return -1;
+ }
+
+ /* switch to peer2 */
+ GNUNET_GC_set_configuration_value_string (cfg,
+ ectx,
+ "NETWORK", "HOST",
+ "localhost:12087");
+ /* verify that peer2 also sees the other DHT! */
+ ok = 0;
+ sock = GNUNET_client_connection_create (NULL, cfg);
+ left = 60; /* how many iterations should we wait? */
+ while (GNUNET_OK ==
+ GNUNET_STATS_get_statistics (NULL, sock, &waitForConnect, NULL))
+ {
+ printf ("Waiting for peers to DHT-connect (%u iterations left)...\n",
+ left);
+ sleep (5);
+ left--;
+ if (left == 0)
+ break;
+ }
+ GNUNET_client_connection_destroy (sock);
+ if (ok == 0)
+ {
+ GNUNET_TESTING_stop_daemons (peers);
+ fprintf (stderr, "Peers' DHTs failed to DHT-connect!\n");
+ GNUNET_GC_free (cfg);
+ return -1;
+ }
+
+
+ /* switch to peer1 */
+ GNUNET_GC_set_configuration_value_string (cfg,
+ ectx,
+ "NETWORK", "HOST",
+ "localhost:2087");
+
+ /* actual test code */
+ GNUNET_hash ("key2", 4, &key);
+ value = GNUNET_malloc (8);
+ memset (&value[1], 'A', 8);
+ printf ("Peer1 stores key2\n");
+ CHECK (GNUNET_OK == GNUNET_DHT_put (cfg,
+ ectx,
+ &key,
+ GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
+ 8, value));
+ printf ("Peer1 gets key2\n");
+ CHECK (1 == GNUNET_DHT_get (cfg,
+ ectx,
+ GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
+ &key, 10 * GNUNET_CRON_SECONDS, NULL, NULL));
+ /* switch to peer2 */
+ GNUNET_GC_set_configuration_value_string (cfg,
+ ectx,
+ "NETWORK", "HOST",
+ "localhost:12087");
+ GNUNET_hash ("key", 3, &key);
+ value = GNUNET_malloc (8);
+ memset (&value[1], 'B', 8);
+ printf ("Peer2 stores key.\n");
+ CHECK (GNUNET_OK == GNUNET_DHT_put (cfg,
+ ectx,
+ &key,
+ GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
+ 8, value));
+ printf ("Peer2 gets key.\n");
+ CHECK (1 == GNUNET_DHT_get (cfg,
+ ectx,
+ GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
+ &key, 10 * GNUNET_CRON_SECONDS, NULL, NULL));
+ GNUNET_hash ("key2", 4, &key);
+ fprintf (stderr, "Peer2 gets key2");
+ left = 10;
+ do
+ {
+ fprintf (stderr, ".");
+ if (1 == GNUNET_DHT_get (cfg,
+ ectx,
+ GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
+ &key, 15 * GNUNET_CRON_SECONDS, NULL, NULL))
+ break;
+ left--;
+ }
+ while (left > 0);
+ fprintf (stderr, left > 0 ? "!\n" : "?\n");
+
+ CHECK (left > 0);
+ /* switch to peer1 */
+ GNUNET_GC_set_configuration_value_string (cfg,
+ ectx,
+ "NETWORK", "HOST",
+ "localhost:2087");
+ fprintf (stderr, "Peer1 gets key");
+ left = 10;
+ do
+ {
+ fprintf (stderr, ".");
+ if (1 == GNUNET_DHT_get (cfg,
+ ectx,
+ GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
+ &key, 15 * GNUNET_CRON_SECONDS, NULL, NULL))
+ break;
+ left--;
+ }
+ while (left > 0);
+ fprintf (stderr, left > 0 ? "!\n" : "?\n");
+ CHECK (left > 0);
+ /* end of actual test code */
+
+FAILURE:
+#if START_PEERS
+ GNUNET_TESTING_stop_daemons (peers);
+#endif
+ GNUNET_GC_free (cfg);
+ return ret;
+}
+
+/* end of dht_twopeer_test.c */
Deleted: GNUnet/src/applications/dht/tools/dhttest.c
===================================================================
--- GNUnet/src/applications/dht/tools/dhttest.c 2008-05-19 18:00:50 UTC (rev
6850)
+++ GNUnet/src/applications/dht/tools/dhttest.c 2008-05-20 02:25:27 UTC (rev
6851)
@@ -1,194 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2007 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 applications/dht/tools/dhttest.c
- * @brief DHT testcase
- * @author Christian Grothoff
- */
-
-#include "platform.h"
-#include "gnunet_protocols.h"
-#include "gnunet_dht_lib.h"
-#include "gnunet_testing_lib.h"
-#include "gnunet_stats_lib.h"
-#include "gnunet_util.h"
-
-/**
- * How many peers should the testcase run? Note that
- * we create a clique topology so the cost is quadratic!
- */
-#define NUM_PEERS 8
-
-/**
- * How many times will we try the DHT-GET operation before
- * giving up for good?
- */
-#define NUM_ROUNDS 10
-
-static int ok;
-
-static int
-waitForConnect (const char *name, unsigned long long value, void *cls)
-{
- if ((value > 0) && (0 == strcmp (_("# dht connections"), name)))
- {
- ok = 1;
- return GNUNET_SYSERR;
- }
- return GNUNET_OK;
-}
-
-#define CHECK(a) do { if (!(a)) { ret = 1; GNUNET_GE_BREAK(ectx, 0); goto
FAILURE; } } while(0)
-
-/**
- * Testcase to test DHT routing (many peers).
- * @return 0: ok, -1: error
- */
-int
-main (int argc, const char **argv)
-{
- struct GNUNET_TESTING_DaemonContext *peers;
- int ret = 0;
- GNUNET_HashCode key;
- char *value;
- struct GNUNET_GE_Context *ectx;
- struct GNUNET_GC_Configuration *cfg;
- struct GNUNET_ClientServerConnection *sock;
- int left;
- int i;
- int j;
- int k;
- int found;
- char buf[128];
-
- ectx = NULL;
- cfg = GNUNET_GC_create ();
- if (-1 == GNUNET_GC_parse_configuration (cfg, "check.conf"))
- {
- GNUNET_GC_free (cfg);
- return -1;
- }
- peers = GNUNET_TESTING_start_daemons ("tcp",
- "advertising dht stats",
- "/tmp/gnunet-dht-test",
- 2087, 10, NUM_PEERS);
- if (peers == NULL)
- {
- GNUNET_GC_free (cfg);
- return -1;
- }
- for (i = 0; i < NUM_PEERS; i++)
- {
- for (j = 0; j < i; j++)
- {
- if (GNUNET_OK != GNUNET_TESTING_connect_daemons (2087 + 10 * i,
- 2087 + 10 * j))
- {
- GNUNET_TESTING_stop_daemons (peers);
- fprintf (stderr, "Failed to connect the peers!\n");
- GNUNET_GC_free (cfg);
- return -1;
- }
- }
- }
-
- /* put loop */
- for (i = 0; i < NUM_PEERS; i++)
- {
- GNUNET_snprintf (buf, 128, "localhost:%u", 2087 + i * 10);
- GNUNET_GC_set_configuration_value_string (cfg, ectx, "NETWORK", "HOST",
- buf);
- /* wait for some DHT's to find each other! */
- sock = GNUNET_client_connection_create (NULL, cfg);
- left = 30; /* how many iterations should we wait? */
- while (GNUNET_OK ==
- GNUNET_STATS_get_statistics (NULL, sock, &waitForConnect, NULL))
- {
- printf ("Waiting for peer to DHT-connect (%u iterations left)...\n",
- left);
- sleep (5);
- left--;
- if (left == 0)
- break;
- }
- GNUNET_client_connection_destroy (sock);
- if (ok == 0)
- {
- GNUNET_TESTING_stop_daemons (peers);
- fprintf (stderr, "Peers' DHTs failed to DHT-connect!\n");
- GNUNET_GC_free (cfg);
- return -1;
- }
-
- GNUNET_hash (buf, 4, &key);
- value = GNUNET_malloc (8);
- memset (&value[1], 'A' + i, 8);
- CHECK (GNUNET_OK == GNUNET_DHT_put (cfg,
- ectx,
- &key,
-
GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
- 8, value));
- GNUNET_free (value);
- }
-
- /* get loop */
- found = 0;
- for (i = 0; i < NUM_PEERS; i++)
- {
- GNUNET_snprintf (buf, 128, "localhost:%u", 2087 + i * 10);
- GNUNET_GC_set_configuration_value_string (cfg,
- ectx, "NETWORK", "HOST", buf);
- for (j = 0; j < NUM_PEERS; j++)
- {
- GNUNET_snprintf (buf, 128, "localhost:%u", 2087 + j * 10);
- GNUNET_hash (buf, 4, &key);
- fprintf (stderr, "Peer %d gets key %d", i, j);
- for (k = 0; k < NUM_ROUNDS; k++)
- {
- fprintf (stderr, ".");
- if (0 < GNUNET_DHT_get (cfg,
- ectx,
- GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
- &key,
- 15 * GNUNET_CRON_SECONDS, NULL, NULL))
- break;
- }
- if (k < NUM_ROUNDS)
- {
- fprintf (stderr, "!\n");
- found++;
- }
- else
- {
- fprintf (stderr, "?\n");
- }
- }
- }
- /* end of actual test code */
- fprintf (stderr,
- "Found %u out of %u attempts.\n", found, NUM_PEERS * NUM_PEERS);
-FAILURE:
- GNUNET_TESTING_stop_daemons (peers);
- GNUNET_GC_free (cfg);
- return ret;
-}
-
-/* end of dhttest.c */
Deleted: GNUnet/src/applications/dht/tools/dhttest2.c
===================================================================
--- GNUnet/src/applications/dht/tools/dhttest2.c 2008-05-19 18:00:50 UTC
(rev 6850)
+++ GNUnet/src/applications/dht/tools/dhttest2.c 2008-05-20 02:25:27 UTC
(rev 6851)
@@ -1,235 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2005, 2006, 2007 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 applications/dht/tools/dhttest2.c
- * @brief DHT testcase
- * @author Christian Grothoff
- */
-
-#include "platform.h"
-#include "gnunet_protocols.h"
-#include "gnunet_dht_lib.h"
-#include "gnunet_testing_lib.h"
-#include "gnunet_stats_lib.h"
-#include "gnunet_util.h"
-
-
-#define START_PEERS 1
-
-
-static int ok;
-
-static int
-waitForConnect (const char *name, unsigned long long value, void *cls)
-{
- if ((value > 0) && (0 == strcmp (_("# dht connections"), name)))
- {
- ok = 1;
- return GNUNET_SYSERR;
- }
- return GNUNET_OK;
-}
-
-#define CHECK(a) do { if (!(a)) { ret = 1; GNUNET_GE_BREAK(ectx, 0); goto
FAILURE; } } while(0)
-
-/**
- * Testcase to test DHT routing (2 peers only).
- * @return 0: ok, -1: error
- */
-int
-main (int argc, const char **argv)
-{
-#if START_PEERS
- struct GNUNET_TESTING_DaemonContext *peers;
-#endif
- int ret = 0;
- GNUNET_HashCode key;
- char *value;
- struct GNUNET_GE_Context *ectx;
- struct GNUNET_GC_Configuration *cfg;
- struct GNUNET_ClientServerConnection *sock;
- int left;
-
- ectx = NULL;
- cfg = GNUNET_GC_create ();
- if (-1 == GNUNET_GC_parse_configuration (cfg, "check.conf"))
- {
- GNUNET_GC_free (cfg);
- return -1;
- }
-#if START_PEERS
- peers = GNUNET_TESTING_start_daemons ("tcp",
- "advertising dht stats",
- "/tmp/gnunet-dht-test",
- 2087, 10000, 2);
- if (peers == NULL)
- {
- GNUNET_GC_free (cfg);
- return -1;
- }
-#endif
- if (GNUNET_OK != GNUNET_TESTING_connect_daemons (2087, 12087))
- {
- GNUNET_TESTING_stop_daemons (peers);
- fprintf (stderr, "Failed to connect the peers!\n");
- GNUNET_GC_free (cfg);
- return -1;
- }
-
- /* wait for DHT's to find each other! */
- sock = GNUNET_client_connection_create (NULL, cfg);
- left = 60; /* how many iterations should we wait? */
- while (GNUNET_OK ==
- GNUNET_STATS_get_statistics (NULL, sock, &waitForConnect, NULL))
- {
- printf ("Waiting for peers to DHT-connect (%u iterations left)...\n",
- left);
- sleep (5);
- left--;
- if (left == 0)
- break;
- }
- GNUNET_client_connection_destroy (sock);
- if (ok == 0)
- {
- GNUNET_TESTING_stop_daemons (peers);
- fprintf (stderr, "Peers' DHTs failed to DHT-connect!\n");
- GNUNET_GC_free (cfg);
- return -1;
- }
-
- /* switch to peer2 */
- GNUNET_GC_set_configuration_value_string (cfg,
- ectx,
- "NETWORK", "HOST",
- "localhost:12087");
- /* verify that peer2 also sees the other DHT! */
- ok = 0;
- sock = GNUNET_client_connection_create (NULL, cfg);
- left = 60; /* how many iterations should we wait? */
- while (GNUNET_OK ==
- GNUNET_STATS_get_statistics (NULL, sock, &waitForConnect, NULL))
- {
- printf ("Waiting for peers to DHT-connect (%u iterations left)...\n",
- left);
- sleep (5);
- left--;
- if (left == 0)
- break;
- }
- GNUNET_client_connection_destroy (sock);
- if (ok == 0)
- {
- GNUNET_TESTING_stop_daemons (peers);
- fprintf (stderr, "Peers' DHTs failed to DHT-connect!\n");
- GNUNET_GC_free (cfg);
- return -1;
- }
-
-
- /* switch to peer1 */
- GNUNET_GC_set_configuration_value_string (cfg,
- ectx,
- "NETWORK", "HOST",
- "localhost:2087");
-
- /* actual test code */
- GNUNET_hash ("key2", 4, &key);
- value = GNUNET_malloc (8);
- memset (&value[1], 'A', 8);
- printf ("Peer1 stores key2\n");
- CHECK (GNUNET_OK == GNUNET_DHT_put (cfg,
- ectx,
- &key,
- GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
- 8, value));
- printf ("Peer1 gets key2\n");
- CHECK (1 == GNUNET_DHT_get (cfg,
- ectx,
- GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
- &key, 10 * GNUNET_CRON_SECONDS, NULL, NULL));
- /* switch to peer2 */
- GNUNET_GC_set_configuration_value_string (cfg,
- ectx,
- "NETWORK", "HOST",
- "localhost:12087");
- GNUNET_hash ("key", 3, &key);
- value = GNUNET_malloc (8);
- memset (&value[1], 'B', 8);
- printf ("Peer2 stores key.\n");
- CHECK (GNUNET_OK == GNUNET_DHT_put (cfg,
- ectx,
- &key,
- GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
- 8, value));
- printf ("Peer2 gets key.\n");
- CHECK (1 == GNUNET_DHT_get (cfg,
- ectx,
- GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
- &key, 10 * GNUNET_CRON_SECONDS, NULL, NULL));
- GNUNET_hash ("key2", 4, &key);
- fprintf (stderr, "Peer2 gets key2");
- left = 10;
- do
- {
- fprintf (stderr, ".");
- if (1 == GNUNET_DHT_get (cfg,
- ectx,
- GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
- &key, 15 * GNUNET_CRON_SECONDS, NULL, NULL))
- break;
- left--;
- }
- while (left > 0);
- fprintf (stderr, left > 0 ? "!\n" : "?\n");
-
- CHECK (left > 0);
- /* switch to peer1 */
- GNUNET_GC_set_configuration_value_string (cfg,
- ectx,
- "NETWORK", "HOST",
- "localhost:2087");
- fprintf (stderr, "Peer1 gets key");
- left = 10;
- do
- {
- fprintf (stderr, ".");
- if (1 == GNUNET_DHT_get (cfg,
- ectx,
- GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
- &key, 15 * GNUNET_CRON_SECONDS, NULL, NULL))
- break;
- left--;
- }
- while (left > 0);
- fprintf (stderr, left > 0 ? "!\n" : "?\n");
- CHECK (left > 0);
- /* end of actual test code */
-
-FAILURE:
-#if START_PEERS
- GNUNET_TESTING_stop_daemons (peers);
-#endif
- GNUNET_GC_free (cfg);
- return ret;
-}
-
-/* end of dhttest2.c */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r6851 - GNUnet/src/applications/dht/tools,
gnunet <=