[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r13928 - in branches/gnunet/mantis_0001616: . contrib src/a
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r13928 - in branches/gnunet/mantis_0001616: . contrib src/arm src/block src/dht src/dv src/fs src/hostlist src/statistics src/testing src/transport src/util |
|
Date: |
Sat, 18 Dec 2010 19:09:06 +0100 |
Author: durner
Date: 2010-12-18 19:09:06 +0100 (Sat, 18 Dec 2010)
New Revision: 13928
Added:
branches/gnunet/mantis_0001616/src/testing/test_testing_large_topology.c
Modified:
branches/gnunet/mantis_0001616/
branches/gnunet/mantis_0001616/contrib/defaults.conf
branches/gnunet/mantis_0001616/src/arm/Makefile.am
branches/gnunet/mantis_0001616/src/block/Makefile.am
branches/gnunet/mantis_0001616/src/dht/Makefile.am
branches/gnunet/mantis_0001616/src/dv/Makefile.am
branches/gnunet/mantis_0001616/src/fs/Makefile.am
branches/gnunet/mantis_0001616/src/fs/fs.h
branches/gnunet/mantis_0001616/src/fs/fs_download.c
branches/gnunet/mantis_0001616/src/fs/test_fs_download.c
branches/gnunet/mantis_0001616/src/fs/test_fs_download_indexed.c
branches/gnunet/mantis_0001616/src/hostlist/hostlist-client.c
branches/gnunet/mantis_0001616/src/statistics/Makefile.am
branches/gnunet/mantis_0001616/src/transport/Makefile.am
branches/gnunet/mantis_0001616/src/util/Makefile.am
Log:
update from head
Property changes on: branches/gnunet/mantis_0001616
___________________________________________________________________
Modified: svn:mergeinfo
- /gnunet:13878-13918
+ /gnunet:13878-13927
Modified: branches/gnunet/mantis_0001616/contrib/defaults.conf
===================================================================
--- branches/gnunet/mantis_0001616/contrib/defaults.conf 2010-12-18
12:28:19 UTC (rev 13927)
+++ branches/gnunet/mantis_0001616/contrib/defaults.conf 2010-12-18
18:09:06 UTC (rev 13928)
@@ -39,9 +39,6 @@
ENABLE_ICMP_CLIENT = YES
ENABLE_ICMP_SERVER = YES
-# Are we allowed to try UPnP/PMP?
-ENABLE_UPNP = YES
-
# IP address of the interface connected to the NAT box; IPv4 dotted-decimal
ONLY;
# normal interface IP address for non-NATed peers;
# likely auto-detected (via interface list) if not specified (!)
Modified: branches/gnunet/mantis_0001616/src/arm/Makefile.am
===================================================================
--- branches/gnunet/mantis_0001616/src/arm/Makefile.am 2010-12-18 12:28:19 UTC
(rev 13927)
+++ branches/gnunet/mantis_0001616/src/arm/Makefile.am 2010-12-18 18:09:06 UTC
(rev 13928)
@@ -32,6 +32,8 @@
$(top_builddir)/src/arm/libgnunetarm.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
+gnunet_arm_DEPENDENCIES = \
+ libgnunetarm.la
gnunet_service_arm_SOURCES = \
gnunet-service-arm.c gnunet-service-arm.h \
@@ -39,6 +41,8 @@
gnunet_service_arm_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
+gnunet_service_arm_DEPENDENCIES = \
+ libgnunetarm.la
mockup_service_SOURCES = \
Modified: branches/gnunet/mantis_0001616/src/block/Makefile.am
===================================================================
--- branches/gnunet/mantis_0001616/src/block/Makefile.am 2010-12-18
12:28:19 UTC (rev 13927)
+++ branches/gnunet/mantis_0001616/src/block/Makefile.am 2010-12-18
18:09:06 UTC (rev 13928)
@@ -27,7 +27,10 @@
$(top_builddir)/src/util/libgnunetutil.la
libgnunet_plugin_block_dht_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
+libgnunet_plugin_block_dht_la_DEPENDENCIES = \
+ libgnunetblock.la
+
libgnunet_plugin_block_fs_la_SOURCES = \
plugin_block_fs.c
libgnunet_plugin_block_fs_la_LIBADD = \
@@ -35,6 +38,9 @@
$(top_builddir)/src/util/libgnunetutil.la
libgnunet_plugin_block_fs_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
+libgnunet_plugin_block_fs_la_DEPENDENCIES = \
+ libgnunetblock.la
+
libgnunet_plugin_block_dns_la_SOURCES = \
plugin_block_dns.c
@@ -57,12 +63,16 @@
$(top_builddir)/src/util/libgnunetutil.la
libgnunet_plugin_block_test_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
+libgnunet_plugin_block_test_la_DEPENDENCIES = \
+ libgnunetblock.la
libgnunetblock_la_SOURCES = \
block.c
libgnunetblock_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la
+libgnunetblock_la_DEPENDENCIES = \
+ $(top_builddir)/src/util/libgnunetutil.la
check_PROGRAMS = \
test_block
Modified: branches/gnunet/mantis_0001616/src/dht/Makefile.am
===================================================================
--- branches/gnunet/mantis_0001616/src/dht/Makefile.am 2010-12-18 12:28:19 UTC
(rev 13927)
+++ branches/gnunet/mantis_0001616/src/dht/Makefile.am 2010-12-18 18:09:06 UTC
(rev 13928)
@@ -102,6 +102,8 @@
$(top_builddir)/src/datacache/libgnunetdatacache.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/dht/libgnunetdhtlog.la -lm
+gnunet_service_dht_DEPENDENCIES = \
+ libgnunetdhtlog.la
gnunet_dht_get_SOURCES = \
gnunet-dht-get.c
@@ -109,6 +111,8 @@
$(top_builddir)/src/dht/libgnunetdht.la \
$(top_builddir)/src/core/libgnunetcore.la \
$(top_builddir)/src/util/libgnunetutil.la
+gnunet_dht_get_DEPENDENCIES = \
+ libgnunetdht.la
gnunet_dht_get_peer_SOURCES = \
gnunet-dht-get-peer.c
@@ -117,6 +121,8 @@
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/core/libgnunetcore.la \
$(top_builddir)/src/util/libgnunetutil.la
+gnunet_dht_get_peer_DEPENDENCIES = \
+ libgnunetdht.la
gnunet_dht_put_SOURCES = \
gnunet-dht-put.c
@@ -124,6 +130,8 @@
$(top_builddir)/src/dht/libgnunetdht.la \
$(top_builddir)/src/core/libgnunetcore.la \
$(top_builddir)/src/util/libgnunetutil.la
+gnunet_dht_put_DEPENDENCIES = \
+ libgnunetdht.la
gnunet_dht_driver_SOURCES = \
gnunet-dht-driver.c
@@ -134,7 +142,11 @@
$(top_builddir)/src/testing/libgnunettesting.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/dht/libgnunetdhtlog.la
+gnunet_dht_driver_DEPENDENCIES = \
+ libgnunetdht.la \
+ libgnunetdhtlog.la
+
check_PROGRAMS = $(STUD_TESTS) \
test_dht_api \
test_dht_twopeer \
@@ -155,6 +167,8 @@
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/dht/libgnunetdht.la
+test_dht_api_DEPENDENCIES = \
+ libgnunetdht.la
test_dht_multipeer_SOURCES = \
test_dht_multipeer.c
@@ -162,6 +176,8 @@
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/testing/libgnunettesting.la \
$(top_builddir)/src/dht/libgnunetdht.la
+test_dht_multipeer_DEPENDENCIES = \
+ libgnunetdht.la
#test_hash_operations_SOURCES = \
# test_hash_operations.c
@@ -176,6 +192,8 @@
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/testing/libgnunettesting.la \
$(top_builddir)/src/dht/libgnunetdht.la
+test_dht_twopeer_DEPENDENCIES = \
+ libgnunetdht.la
test_dht_twopeer_put_get_SOURCES = \
test_dht_twopeer_put_get.c
Modified: branches/gnunet/mantis_0001616/src/dv/Makefile.am
===================================================================
--- branches/gnunet/mantis_0001616/src/dv/Makefile.am 2010-12-18 12:28:19 UTC
(rev 13927)
+++ branches/gnunet/mantis_0001616/src/dv/Makefile.am 2010-12-18 18:09:06 UTC
(rev 13928)
@@ -38,6 +38,8 @@
$(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
+gnunet_service_dv_DEPENDENCIES = \
+ libgnunetdv.la
libgnunet_plugin_transport_dv_la_SOURCES = \
plugin_transport_dv.c
@@ -48,8 +50,9 @@
$(top_builddir)/src/util/libgnunetutil.la
libgnunet_plugin_transport_dv_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
+libgnunet_plugin_transport_dv_la_DEPENDENCIES = \
+ libgnunetdv.la
-
check_PROGRAMS = \
test_transport_api_dv
# test_dv_topology
Modified: branches/gnunet/mantis_0001616/src/fs/Makefile.am
===================================================================
--- branches/gnunet/mantis_0001616/src/fs/Makefile.am 2010-12-18 12:28:19 UTC
(rev 13927)
+++ branches/gnunet/mantis_0001616/src/fs/Makefile.am 2010-12-18 18:09:06 UTC
(rev 13928)
@@ -61,6 +61,8 @@
$(top_builddir)/src/fs/libgnunetfs.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
+gnunet_directory_DEPENDENCIES = \
+ libgnunetfs.la
gnunet_download_SOURCES = \
gnunet-download.c
@@ -68,6 +70,8 @@
$(top_builddir)/src/fs/libgnunetfs.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
+gnunet_download_DEPENDENCIES = \
+ libgnunetfs.la
gnunet_publish_SOURCES = \
gnunet-publish.c
@@ -75,6 +79,8 @@
$(top_builddir)/src/fs/libgnunetfs.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
+gnunet_publish_DEPENDENCIES = \
+ libgnunetfs.la
gnunet_pseudonym_SOURCES = \
gnunet-pseudonym.c
@@ -83,6 +89,8 @@
$(top_builddir)/src/util/libgnunetutil.la \
-lextractor \
$(GN_LIBINTL)
+gnunet_pseudonym_DEPENDENCIES = \
+ libgnunetfs.la
gnunet_search_SOURCES = \
gnunet-search.c
@@ -90,6 +98,8 @@
$(top_builddir)/src/fs/libgnunetfs.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
+gnunet_search_DEPENDENCIES = \
+ libgnunetfs.la
gnunet_service_fs_SOURCES = \
gnunet-service-fs.c \
@@ -103,6 +113,8 @@
$(top_builddir)/src/core/libgnunetcore.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
+gnunet_service_fs_DEPENDENCIES = \
+ libgnunetfs.la
gnunet_unindex_SOURCES = \
gnunet-unindex.c
@@ -110,6 +122,8 @@
$(top_builddir)/src/fs/libgnunetfs.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
+gnunet_unindex_DEPENDENCIES = \
+ libgnunetfs.la
Modified: branches/gnunet/mantis_0001616/src/fs/fs.h
===================================================================
--- branches/gnunet/mantis_0001616/src/fs/fs.h 2010-12-18 12:28:19 UTC (rev
13927)
+++ branches/gnunet/mantis_0001616/src/fs/fs.h 2010-12-18 18:09:06 UTC (rev
13928)
@@ -1683,6 +1683,12 @@
/**
+ * Closure for 'reconstruct_cont' and 'reconstruct_cb'.
+ */
+struct ReconstructContext;
+
+
+/**
* Context for controlling a download.
*/
struct GNUNET_FS_DownloadContext
@@ -1726,6 +1732,11 @@
struct GNUNET_FS_DownloadContext *child_tail;
/**
+ * State for block reconstruction.
+ */
+ struct ReconstructContext *rcc;
+
+ /**
* Previous download belonging to the same parent.
*/
struct GNUNET_FS_DownloadContext *prev;
Modified: branches/gnunet/mantis_0001616/src/fs/fs_download.c
===================================================================
--- branches/gnunet/mantis_0001616/src/fs/fs_download.c 2010-12-18 12:28:19 UTC
(rev 13927)
+++ branches/gnunet/mantis_0001616/src/fs/fs_download.c 2010-12-18 18:09:06 UTC
(rev 13928)
@@ -446,6 +446,11 @@
struct DownloadRequest *sm;
/**
+ * Helper task.
+ */
+ GNUNET_SCHEDULER_TaskIdentifier task;
+
+ /**
* Offset of block we are trying to reconstruct.
*/
uint64_t offset;
@@ -472,8 +477,11 @@
struct ReconstructContext *rcc = cls;
if (rcc->te != NULL)
- GNUNET_FS_tree_encoder_finish (rcc->te, NULL, NULL);
+ {
+ GNUNET_FS_tree_encoder_finish (rcc->te, NULL, NULL);
+ }
rcc->dc->reconstruct_failed = GNUNET_YES;
+ rcc->dc->rcc = NULL;
if (rcc->fh != NULL)
GNUNET_break (GNUNET_OK == GNUNET_DISK_file_close (rcc->fh));
if ( (rcc->dc->th == NULL) &&
@@ -508,6 +516,8 @@
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct ReconstructContext *rcc = cls;
+
+ rcc->task = GNUNET_SCHEDULER_NO_TASK;
GNUNET_FS_tree_encoder_next (rcc->te);
}
@@ -582,9 +592,8 @@
GNUNET_free (rcc);
return;
}
- GNUNET_SCHEDULER_add_continuation (&get_next_block,
- rcc,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ rcc->task = GNUNET_SCHEDULER_add_now (&get_next_block,
+ rcc);
}
@@ -744,6 +753,7 @@
rcc->chk = *chk;
rcc->offset = off;
rcc->depth = depth;
+ dc->rcc = rcc;
if ( (depth < dc->treedepth) &&
(dc->reconstruct_failed == GNUNET_NO) &&
(fh != NULL) )
@@ -1874,6 +1884,11 @@
: &dc->uri->data.loc.fi.chk,
0,
1 /* 0 == CHK, 1 == top */);
+ GNUNET_FS_download_sync_ (dc);
+ GNUNET_FS_download_start_downloading_ (dc);
+ pi.status = GNUNET_FS_STATUS_DOWNLOAD_START;
+ pi.value.download.specifics.start.meta = dc->meta;
+ GNUNET_FS_download_make_status_ (&pi, dc);
}
@@ -1889,11 +1904,6 @@
struct GNUNET_FS_DownloadContext *dc = cls;
struct GNUNET_FS_ProgressInfo pi;
- if (dc->start_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (dc->start_task);
- dc->start_task = GNUNET_SCHEDULER_NO_TASK;
- }
if (dc->top != NULL)
GNUNET_FS_end_top (dc->h, dc->top);
while (NULL != dc->child_head)
@@ -1912,10 +1922,26 @@
GNUNET_CONTAINER_DLL_remove (dc->parent->child_head,
dc->parent->child_tail,
dc);
- pi.status = GNUNET_FS_STATUS_DOWNLOAD_SUSPEND;
- GNUNET_FS_download_make_status_ (&pi, dc);
if (GNUNET_SCHEDULER_NO_TASK != dc->task)
GNUNET_SCHEDULER_cancel (dc->task);
+ if (dc->start_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (dc->start_task);
+ dc->start_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ else
+ {
+ pi.status = GNUNET_FS_STATUS_DOWNLOAD_SUSPEND;
+ GNUNET_FS_download_make_status_ (&pi, dc);
+ }
+ if (dc->rcc != NULL)
+ {
+ if (dc->rcc->task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel (dc->rcc->task);
+ if (dc->rcc->te != NULL)
+ GNUNET_FS_tree_encoder_finish (dc->rcc->te, NULL, NULL);
+ dc->rcc = NULL;
+ }
GNUNET_CONTAINER_multihashmap_iterate (dc->active,
&free_entry,
NULL);
@@ -1972,7 +1998,6 @@
void *cctx,
struct GNUNET_FS_DownloadContext *parent)
{
- struct GNUNET_FS_ProgressInfo pi;
struct GNUNET_FS_DownloadContext *dc;
GNUNET_assert (GNUNET_FS_uri_test_chk (uri) ||
@@ -2041,12 +2066,7 @@
&GNUNET_FS_download_signal_suspend_,
dc);
}
- pi.status = GNUNET_FS_STATUS_DOWNLOAD_START;
- pi.value.download.specifics.start.meta = meta;
- GNUNET_FS_download_make_status_ (&pi, dc);
dc->start_task = GNUNET_SCHEDULER_add_now (&GNUNET_FS_download_start_task_,
dc);
- GNUNET_FS_download_sync_ (dc);
- GNUNET_FS_download_start_downloading_ (dc);
return dc;
}
@@ -2096,7 +2116,6 @@
enum GNUNET_FS_DownloadOptions options,
void *cctx)
{
- struct GNUNET_FS_ProgressInfo pi;
struct GNUNET_FS_DownloadContext *dc;
if ( (sr == NULL) ||
@@ -2164,12 +2183,7 @@
"Download tree has depth %u\n",
dc->treedepth);
#endif
- pi.status = GNUNET_FS_STATUS_DOWNLOAD_START;
- pi.value.download.specifics.start.meta = dc->meta;
- GNUNET_FS_download_make_status_ (&pi, dc);
dc->start_task = GNUNET_SCHEDULER_add_now (&GNUNET_FS_download_start_task_,
dc);
- GNUNET_FS_download_sync_ (dc);
- GNUNET_FS_download_start_downloading_ (dc);
return dc;
}
@@ -2222,6 +2236,14 @@
GNUNET_FS_dequeue_ (dc->job_queue);
dc->job_queue = NULL;
}
+ if (dc->rcc != NULL)
+ {
+ if (dc->rcc->task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel (dc->rcc->task);
+ if (dc->rcc->te != NULL)
+ GNUNET_FS_tree_encoder_finish (dc->rcc->te, NULL, NULL);
+ dc->rcc = NULL;
+ }
have_children = (NULL != dc->child_head) ? GNUNET_YES : GNUNET_NO;
while (NULL != dc->child_head)
GNUNET_FS_download_stop (dc->child_head,
Modified: branches/gnunet/mantis_0001616/src/fs/test_fs_download.c
===================================================================
--- branches/gnunet/mantis_0001616/src/fs/test_fs_download.c 2010-12-18
12:28:19 UTC (rev 13927)
+++ branches/gnunet/mantis_0001616/src/fs/test_fs_download.c 2010-12-18
18:09:06 UTC (rev 13928)
@@ -213,7 +213,6 @@
NULL);
break;
case GNUNET_FS_STATUS_DOWNLOAD_START:
- GNUNET_assert (download == NULL);
GNUNET_assert (0 == strcmp ("download", event->value.download.cctx));
GNUNET_assert (NULL == event->value.download.pctx);
GNUNET_assert (NULL != event->value.download.uri);
Modified: branches/gnunet/mantis_0001616/src/fs/test_fs_download_indexed.c
===================================================================
--- branches/gnunet/mantis_0001616/src/fs/test_fs_download_indexed.c
2010-12-18 12:28:19 UTC (rev 13927)
+++ branches/gnunet/mantis_0001616/src/fs/test_fs_download_indexed.c
2010-12-18 18:09:06 UTC (rev 13928)
@@ -215,7 +215,6 @@
NULL);
break;
case GNUNET_FS_STATUS_DOWNLOAD_START:
- GNUNET_assert (download == NULL);
GNUNET_assert (0 == strcmp ("download", event->value.download.cctx));
GNUNET_assert (NULL == event->value.download.pctx);
GNUNET_assert (NULL != event->value.download.uri);
Modified: branches/gnunet/mantis_0001616/src/hostlist/hostlist-client.c
===================================================================
--- branches/gnunet/mantis_0001616/src/hostlist/hostlist-client.c
2010-12-18 12:28:19 UTC (rev 13927)
+++ branches/gnunet/mantis_0001616/src/hostlist/hostlist-client.c
2010-12-18 18:09:06 UTC (rev 13928)
@@ -1417,8 +1417,8 @@
"HOSTLISTFILE", "HOSTLIST");
return;
}
- if (GNUNET_SYSERR != GNUNET_DISK_directory_create_for_file (filename))
- {
+ if (GNUNET_SYSERR == GNUNET_DISK_directory_create_for_file (filename))
+ return;
wh = GNUNET_BIO_write_open (filename);
if ( NULL == wh)
{
@@ -1432,7 +1432,6 @@
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("Writing %u hostlist URIs to `%s'\n" ),
linked_list_size, filename);
- }
/* add code to write hostlists to file using bio */
ok = GNUNET_YES;
counter = 0;
Modified: branches/gnunet/mantis_0001616/src/statistics/Makefile.am
===================================================================
--- branches/gnunet/mantis_0001616/src/statistics/Makefile.am 2010-12-18
12:28:19 UTC (rev 13927)
+++ branches/gnunet/mantis_0001616/src/statistics/Makefile.am 2010-12-18
18:09:06 UTC (rev 13928)
@@ -32,6 +32,8 @@
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
+gnunet_statistics_DEPENDENCIES = \
+ libgnunetstatistics.la
gnunet_service_statistics_SOURCES = \
gnunet-service-statistics.c
@@ -39,8 +41,9 @@
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
+gnunet_service_statistics_DEPENDENCIES = \
+ libgnunetstatistics.la
-
check_PROGRAMS = \
test_statistics_api \
test_statistics_api_loop
Copied:
branches/gnunet/mantis_0001616/src/testing/test_testing_large_topology.c (from
rev 13927, gnunet/src/testing/test_testing_large_topology.c)
===================================================================
--- branches/gnunet/mantis_0001616/src/testing/test_testing_large_topology.c
(rev 0)
+++ branches/gnunet/mantis_0001616/src/testing/test_testing_large_topology.c
2010-12-18 18:09:06 UTC (rev 13928)
@@ -0,0 +1,1189 @@
+/*
+ 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 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 testing/test_testing_topology.c
+ * @brief base testcase for testing all the topologies provided
+ */
+#include "platform.h"
+#include "gnunet_testing_lib.h"
+#include "gnunet_core_service.h"
+#include "gnunet_os_lib.h"
+
+#define VERBOSE GNUNET_YES
+
+#define DELAY_FOR_LOGGING GNUNET_NO
+
+#define SECONDS_PER_PEER_START 120
+
+#define DEFAULT_NUM_PEERS 4
+
+#define MAX_OUTSTANDING_CONNECTIONS 100
+
+static float fail_percentage = 0.05;
+
+static int ok;
+
+static unsigned long long num_peers;
+
+static unsigned int topology_connections;
+
+static unsigned int total_connections;
+
+static unsigned int failed_connections;
+
+static unsigned int total_server_connections;
+
+static unsigned int total_messages_received;
+
+static unsigned int expected_messages;
+
+static unsigned int expected_connections;
+
+static unsigned long long peers_left;
+
+static struct GNUNET_TESTING_PeerGroup *pg;
+
+const struct GNUNET_CONFIGURATION_Handle *main_cfg;
+
+GNUNET_SCHEDULER_TaskIdentifier die_task;
+
+static char *dotOutFileName;
+
+static struct GNUNET_TIME_Relative settle_time;
+
+static FILE *dotOutFile;
+
+static char *topology_string;
+
+static char *blacklist_transports;
+
+static int transmit_ready_scheduled;
+
+static int transmit_ready_failed;
+
+static int transmit_ready_called;
+
+struct GNUNET_TIME_Relative test_timeout;
+
+struct GNUNET_TIME_Relative timeout;
+
+static unsigned int modnum;
+
+static unsigned int dotnum;
+
+static enum GNUNET_TESTING_Topology topology;
+
+static enum GNUNET_TESTING_Topology blacklist_topology =
GNUNET_TESTING_TOPOLOGY_NONE; /* Don't do any blacklisting */
+
+static enum GNUNET_TESTING_Topology connection_topology =
GNUNET_TESTING_TOPOLOGY_NONE; /* NONE actually means connect all allowed peers
*/
+
+static enum GNUNET_TESTING_TopologyOption connect_topology_option =
+ GNUNET_TESTING_TOPOLOGY_OPTION_ALL;
+
+static double connect_topology_option_modifier = 0.0;
+
+static char *test_directory;
+
+#define MTYPE 12345
+
+struct GNUNET_TestMessage
+{
+ /**
+ * Header of the message
+ */
+ struct GNUNET_MessageHeader header;
+
+ /**
+ * Unique identifier for this message.
+ */
+ uint32_t uid;
+};
+
+struct TestMessageContext
+{
+ /* This is a linked list */
+ struct TestMessageContext *next;
+
+ /* Handle to the sending peer core */
+ struct GNUNET_CORE_Handle *peer1handle;
+
+ /* Handle to the receiving peer core */
+ struct GNUNET_CORE_Handle *peer2handle;
+
+ /* Handle to the sending peer daemon */
+ struct GNUNET_TESTING_Daemon *peer1;
+
+ /* Handle to the receiving peer daemon */
+ struct GNUNET_TESTING_Daemon *peer2;
+
+ /* Identifier for this message, so we don't disconnect other peers! */
+ uint32_t uid;
+
+ /* Has peer1 been notified already of a connection to peer2? */
+ int peer1notified;
+
+ /* Has the core of peer2 been connected already? */
+ int peer2connected;
+
+ /* Task for disconnecting cores, allow task to be cancelled on shutdown */
+ GNUNET_SCHEDULER_TaskIdentifier disconnect_task;
+
+};
+
+static struct TestMessageContext *test_messages;
+
+/**
+ * Check whether peers successfully shut down.
+ */
+void
+shutdown_callback (void *cls, const char *emsg)
+{
+ if (emsg != NULL)
+ {
+#if VERBOSE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown of peers failed!\n");
+#endif
+ if (ok == 0)
+ ok = 666;
+ }
+ else
+ {
+#if VERBOSE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "All peers successfully shut down!\n");
+#endif
+ }
+}
+
+#if DELAY_FOR_LOGGING
+static void
+gather_log_data ()
+{
+ char *peer_number;
+ char *connect_number;
+ struct GNUNET_OS_Process *mem_process;
+ GNUNET_asprintf (&peer_number, "%llu", num_peers);
+ GNUNET_asprintf (&connect_number, "%llu", expected_connections);
+ mem_process = GNUNET_OS_start_process (NULL, NULL, "./memsize.pl",
+ "memsize.pl", "totals.txt",
+ peer_number, connect_number, NULL);
+ GNUNET_OS_process_wait (mem_process);
+ GNUNET_OS_process_close (mem_process);
+ mem_process = NULL;
+}
+
+#endif
+
+static void
+finish_testing ()
+{
+ GNUNET_assert (pg != NULL);
+ struct TestMessageContext *pos;
+ struct TestMessageContext *free_pos;
+#if VERBOSE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Called finish testing, stopping daemons.\n");
+#endif
+
+ pos = test_messages;
+ while (pos != NULL)
+ {
+ if (pos->peer1handle != NULL)
+ {
+ GNUNET_CORE_disconnect (pos->peer1handle);
+ pos->peer1handle = NULL;
+ }
+ if (pos->peer2handle != NULL)
+ {
+ GNUNET_CORE_disconnect (pos->peer2handle);
+ pos->peer2handle = NULL;
+ }
+ free_pos = pos;
+ pos = pos->next;
+ if (free_pos->disconnect_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (free_pos->disconnect_task);
+ }
+ GNUNET_free (free_pos);
+ }
+#if VERBOSE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Transmit_ready's scheduled %d, failed %d, transmit_ready's
called %d\n",
+ transmit_ready_scheduled, transmit_ready_failed,
+ transmit_ready_called);
+#endif
+
+#if VERBOSE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Calling daemons_stop\n");
+#endif
+ GNUNET_TESTING_daemons_stop (pg, timeout, &shutdown_callback, NULL);
+
+ if (dotOutFile != NULL)
+ {
+ fprintf (dotOutFile, "}");
+ fclose (dotOutFile);
+ }
+
+ ok = 0;
+}
+
+
+static void
+disconnect_cores (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct TestMessageContext *pos = cls;
+
+ /* Disconnect from the respective cores */
+#if VERBOSE > 1
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Disconnecting from peer 1 `%4s'\n",
+ GNUNET_i2s (&pos->peer1->id));
+#endif
+ if (pos->peer1handle != NULL)
+ GNUNET_CORE_disconnect (pos->peer1handle);
+#if VERBOSE > 1
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Disconnecting from peer 2 `%4s'\n",
+ GNUNET_i2s (&pos->peer2->id));
+#endif
+ if (pos->peer2handle != NULL)
+ GNUNET_CORE_disconnect (pos->peer2handle);
+ /* Set handles to NULL so test case can be ended properly */
+ pos->peer1handle = NULL;
+ pos->peer2handle = NULL;
+ pos->disconnect_task = GNUNET_SCHEDULER_NO_TASK;
+ /* Decrement total connections so new can be established */
+ total_server_connections -= 2;
+}
+
+
+static void
+topology_cb (void *cls,
+ const struct GNUNET_PeerIdentity *first,
+ const struct GNUNET_PeerIdentity *second, const char *emsg)
+{
+ FILE *outfile = cls;
+ if (first != NULL)
+ {
+ if (outfile != NULL)
+ {
+ fprintf (outfile, "\t\"%s\" -- ", GNUNET_i2s (first));
+ fprintf (outfile, "\"%s\";\n", GNUNET_i2s (second));
+ }
+ topology_connections++;
+ }
+ else
+ {
+ fprintf (stderr,
+ "Finished iterating over topology, %d total connections!\n",
+ topology_connections);
+ if (outfile != NULL)
+ {
+ fprintf (outfile, "}\n");
+ fclose (outfile);
+ GNUNET_SCHEDULER_add_now (&finish_testing, NULL);
+ }
+ }
+}
+
+static int
+process_mtype (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_MessageHeader *message,
+ const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+{
+ char *dotOutFileNameFinished;
+ FILE *dotOutFileFinished;
+ struct TestMessageContext *pos = cls;
+ struct GNUNET_TestMessage *msg = (struct GNUNET_TestMessage *) message;
+ if (pos->uid != ntohl (msg->uid))
+ return GNUNET_OK;
+
+#if VERBOSE
+ if ((total_messages_received) % modnum == 0)
+ {
+ if (total_messages_received == 0)
+ fprintf (stdout, "0%%");
+ else
+ fprintf (stdout, "%d%%",
+ (int) (((float) total_messages_received /
+ expected_messages) * 100));
+
+ }
+ else if (total_messages_received % dotnum == 0)
+ {
+ fprintf (stdout, ".");
+ }
+ fflush (stdout);
+#endif
+
+ total_messages_received++;
+
+#if VERBOSE > 1
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received message from `%4s', type %d.\n", GNUNET_i2s (peer),
+ ntohs (message->type));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Total messages received %d, expected %d.\n",
+ total_messages_received, expected_messages);
+#endif
+
+ if (total_messages_received == expected_messages)
+ {
+#if VERBOSE
+ fprintf (stdout, "100%%]\n");
+#endif
+ GNUNET_SCHEDULER_cancel (die_task);
+ GNUNET_asprintf (&dotOutFileNameFinished, "%s.dot", "final_topology");
+ dotOutFileFinished = fopen (dotOutFileNameFinished, "w");
+ GNUNET_free (dotOutFileNameFinished);
+ if (dotOutFileFinished != NULL)
+ {
+ fprintf (dotOutFileFinished, "strict graph G {\n");
+ }
+ topology_connections = 0;
+ GNUNET_TESTING_get_topology (pg, &topology_cb, dotOutFileFinished);
+ //GNUNET_SCHEDULER_add_now (&finish_testing, NULL);
+ }
+ else
+ {
+ pos->disconnect_task =
+ GNUNET_SCHEDULER_add_now (&disconnect_cores, pos);
+ }
+
+ return GNUNET_OK;
+}
+
+static void
+end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ char *msg = cls;
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "End badly was called (%s)... stopping daemons.\n", msg);
+ struct TestMessageContext *pos;
+ struct TestMessageContext *free_pos;
+
+ pos = test_messages;
+ while (pos != NULL)
+ {
+ if (pos->peer1handle != NULL)
+ {
+ GNUNET_CORE_disconnect (pos->peer1handle);
+ pos->peer1handle = NULL;
+ }
+ if (pos->peer2handle != NULL)
+ {
+ GNUNET_CORE_disconnect (pos->peer2handle);
+ pos->peer2handle = NULL;
+ }
+ free_pos = pos;
+ pos = pos->next;
+ GNUNET_free (free_pos);
+ }
+
+#if VERBOSE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Transmit_ready's scheduled %d, failed %d, transmit_ready's
called %d\n",
+ transmit_ready_scheduled, transmit_ready_failed,
+ transmit_ready_called);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Total messages received %d, expected %d.\n",
+ total_messages_received, expected_messages);
+#endif
+
+ if (pg != NULL)
+ {
+ GNUNET_TESTING_daemons_stop (pg, timeout, &shutdown_callback, NULL);
+ ok = 7331; /* Opposite of leet */
+ }
+ else
+ ok = 401; /* Never got peers started */
+
+ if (dotOutFile != NULL)
+ {
+ fprintf (dotOutFile, "}");
+ fclose (dotOutFile);
+ }
+}
+
+static size_t
+transmit_ready (void *cls, size_t size, void *buf)
+{
+ struct GNUNET_TestMessage *m;
+ struct TestMessageContext *pos = cls;
+
+ GNUNET_assert (buf != NULL);
+ m = (struct GNUNET_TestMessage *) buf;
+ m->header.type = htons (MTYPE);
+ m->header.size = htons (sizeof (struct GNUNET_TestMessage));
+ m->uid = htonl (pos->uid);
+ transmit_ready_called++;
+#if VERBOSE > 1
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "transmit ready for peer %s\ntransmit_ready's scheduled %d,
transmit_ready's called %d\n",
+ GNUNET_i2s (&pos->peer1->id), transmit_ready_scheduled,
+ transmit_ready_called);
+#endif
+ return sizeof (struct GNUNET_TestMessage);
+}
+
+
+static struct GNUNET_CORE_MessageHandler no_handlers[] = {
+ {NULL, 0, 0}
+};
+
+static struct GNUNET_CORE_MessageHandler handlers[] = {
+ {&process_mtype, MTYPE, sizeof (struct GNUNET_TestMessage)},
+ {NULL, 0, 0}
+};
+
+static void
+init_notify_peer2 (void *cls,
+ struct GNUNET_CORE_Handle *server,
+ const struct GNUNET_PeerIdentity *my_identity,
+ const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded
+ *publicKey)
+{
+ struct TestMessageContext *pos = cls;
+
+ total_server_connections++;
+
+ pos->peer2connected = GNUNET_YES;
+ if (pos->peer1notified == GNUNET_YES) /* Peer 1 has been notified of
connection to peer 2 */
+ {
+#if VERBOSE > 1
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Scheduling message send to peer `%s' from peer `%s'
(init_notify_peer2)\n",
+ GNUNET_i2s (my_identity),
GNUNET_h2s(&pos->peer1->id.hashPubKey));
+#endif
+ if (NULL == GNUNET_CORE_notify_transmit_ready (pos->peer1handle,
+ 0,
+ timeout,
+ &pos->peer2->id,
+ sizeof (struct
+
GNUNET_TestMessage),
+ &transmit_ready, pos))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "RECEIVED NULL when asking core (1) for transmission to
peer `%4s'\n",
+ GNUNET_i2s (&pos->peer2->id));
+ transmit_ready_failed++;
+ }
+ else
+ {
+ transmit_ready_scheduled++;
+ }
+ }
+}
+
+/**
+ * Method called whenever a given peer connects.
+ *
+ * @param cls closure
+ * @param peer peer identity this notification is about
+ * @param atsi performance data for the connection
+ */
+static void connect_notify_peers (void *cls,
+ const struct
+ GNUNET_PeerIdentity *peer,
+ const struct
GNUNET_TRANSPORT_ATS_Information *atsi)
+{
+ struct TestMessageContext *pos = cls;
+
+ if (0 == memcmp(peer, &pos->peer2->id, sizeof(struct GNUNET_PeerIdentity)))
+ {
+ pos->peer1notified = GNUNET_YES;
+#if VERBOSE > 1
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Peer `%s' notified of connection to peer `%s'\n",
+ GNUNET_i2s (&pos->peer1->id), GNUNET_h2s(&peer->hashPubKey));
+#endif
+ }
+ else
+ return;
+
+ if (pos->peer2connected == GNUNET_YES) /* Already connected and notified of
connection, send message! */
+ {
+#if VERBOSE > 1
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Scheduling message send to peer `%s' from peer `%s'
(init_notify_peer2)\n",
+ GNUNET_i2s (&pos->peer2->id),
GNUNET_h2s(&pos->peer1->id.hashPubKey));
+#endif
+ if (NULL == GNUNET_CORE_notify_transmit_ready (pos->peer1handle,
+ 0,
+ timeout,
+ &pos->peer2->id,
+ sizeof (struct
+
GNUNET_TestMessage),
+ &transmit_ready, pos))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "RECEIVED NULL when asking core (1) for transmission to
peer `%4s'\n",
+ GNUNET_i2s (&pos->peer2->id));
+ transmit_ready_failed++;
+ }
+ else
+ {
+ transmit_ready_scheduled++;
+ }
+ }
+}
+
+static void
+init_notify_peer1 (void *cls,
+ struct GNUNET_CORE_Handle *server,
+ const struct GNUNET_PeerIdentity *my_identity,
+ const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded
+ *publicKey)
+{
+ struct TestMessageContext *pos = cls;
+ total_server_connections++;
+
+#if VERBOSE > 1
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Core connection to `%4s' established, setting up handles\n",
+ GNUNET_i2s (my_identity));
+#endif
+
+ /*
+ * Connect to the receiving peer
+ */
+ pos->peer2handle = GNUNET_CORE_connect (pos->peer2->cfg,
+ 1,
+ pos,
+ &init_notify_peer2,
+ NULL,
+ NULL,
+ NULL, NULL,
+ GNUNET_YES, NULL, GNUNET_YES,
+ handlers);
+
+}
+
+
+static void
+send_test_messages (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct TestMessageContext *pos = cls;
+
+ if ((pos == test_messages) && (settle_time.rel_value > 0))
+ {
+ topology_connections = 0;
+ GNUNET_TESTING_get_topology (pg, &topology_cb, NULL);
+ }
+ if ((tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN) || (cls == NULL))
+ return;
+
+ if (die_task == GNUNET_SCHEDULER_NO_TASK)
+ {
+ die_task = GNUNET_SCHEDULER_add_delayed (test_timeout,
+ &end_badly,
+ "from send test messages
(timeout)");
+ }
+
+ if (total_server_connections >= MAX_OUTSTANDING_CONNECTIONS)
+ {
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS, 1),
+ &send_test_messages, pos);
+ return; /* Otherwise we'll double schedule messages
here! */
+ }
+
+ /*
+ * Connect to the sending peer
+ */
+ pos->peer1handle = GNUNET_CORE_connect (pos->peer1->cfg,
+ 1,
+ pos,
+ &init_notify_peer1,
+ &connect_notify_peers, NULL,
+ NULL,
+ NULL,
+ GNUNET_NO, NULL, GNUNET_NO,
+ no_handlers);
+
+ GNUNET_assert (pos->peer1handle != NULL);
+
+ if (total_server_connections < MAX_OUTSTANDING_CONNECTIONS)
+ {
+ GNUNET_SCHEDULER_add_now (&send_test_messages, pos->next);
+ }
+ else
+ {
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS, 1),
+ &send_test_messages, pos->next);
+ }
+}
+
+
+void
+topology_callback (void *cls,
+ const struct GNUNET_PeerIdentity *first,
+ const struct GNUNET_PeerIdentity *second,
+ uint32_t distance,
+ 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 TestMessageContext *temp_context;
+ if (emsg == NULL)
+ {
+#if VERBOSE
+ if ((total_connections) % modnum == 0)
+ {
+ if (total_connections == 0)
+ fprintf (stdout, "0%%");
+ else
+ fprintf (stdout, "%d%%",
+ (int) (((float) total_connections /
+ expected_connections) * 100));
+
+ }
+ else if (total_connections % dotnum == 0)
+ {
+ fprintf (stdout, ".");
+ }
+ fflush (stdout);
+#endif
+ total_connections++;
+#if VERBOSE > 1
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "connected peer %s to peer %s\n",
+ first_daemon->shortname, second_daemon->shortname);
+#endif
+ temp_context = GNUNET_malloc (sizeof (struct TestMessageContext));
+ temp_context->peer1 = first_daemon;
+ temp_context->peer2 = second_daemon;
+ temp_context->next = test_messages;
+ temp_context->uid = total_connections;
+ temp_context->disconnect_task = GNUNET_SCHEDULER_NO_TASK;
+ test_messages = temp_context;
+
+ expected_messages++;
+ if (dotOutFile != NULL)
+ fprintf (dotOutFile, "\tn%s -- n%s;\n", first_daemon->shortname,
+ second_daemon->shortname);
+ }
+#if VERBOSE
+ else
+ {
+ failed_connections++;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Failed to connect peer %s to peer %s with error :\n%s\n",
+ first_daemon->shortname, second_daemon->shortname, emsg);
+ }
+#endif
+
+ if (total_connections == expected_connections)
+ {
+#if VERBOSE
+ fprintf (stdout, "100%%]\n");
+#endif
+#if VERBOSE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Created %d total connections, which is our target number!
Calling send messages.\n",
+ total_connections);
+#endif
+ modnum = expected_messages / 4;
+ dotnum = (expected_messages / 50) + 1;
+ GNUNET_SCHEDULER_cancel (die_task);
+ die_task = GNUNET_SCHEDULER_NO_TASK;
+#if DELAY_FOR_LOGGING
+ fprintf (stdout, "Sending test messages in 10 seconds.\n");
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS, 10),
+ &send_test_messages, test_messages);
+ gather_log_data ();
+#else
+ if (settle_time.rel_value > 0)
+ {
+ GNUNET_TESTING_get_topology (pg, &topology_cb, NULL);
+ }
+ GNUNET_SCHEDULER_add_delayed (settle_time, &send_test_messages,
+ test_messages);
+#endif
+#if VERBOSE
+ fprintf (stdout, "Test message progress: [");
+#endif
+
+ }
+ else if (total_connections + failed_connections == expected_connections)
+ {
+ if (failed_connections <
+ (unsigned int) (fail_percentage * total_connections))
+ {
+ GNUNET_SCHEDULER_cancel (die_task);
+ die_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_SCHEDULER_add_now (&send_test_messages, test_messages);
+ }
+ else
+ {
+ GNUNET_SCHEDULER_cancel (die_task);
+ die_task =
+ GNUNET_SCHEDULER_add_now (&end_badly,
+ "from topology_callback (too many failed
connections)");
+ }
+ }
+ else
+ {
+#if VERBOSE > 1
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Have %d total connections, %d failed connections, Want %d
(at least %d)\n",
+ total_connections, failed_connections, expected_connections,
+ expected_connections -
+ (unsigned int) (fail_percentage * expected_connections));
+#endif
+ }
+}
+
+static void
+topology_creation_finished (void *cls, const char *emsg)
+{
+#if VERBOSE
+ if (emsg == NULL)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "All topology connections created successfully!\n");
+#endif
+}
+
+static void
+connect_topology ()
+{
+ expected_connections = -1;
+ if ((pg != NULL) && (peers_left == 0))
+ {
+ expected_connections =
+ GNUNET_TESTING_connect_topology (pg, connection_topology,
+ connect_topology_option,
+ connect_topology_option_modifier,
+ &topology_creation_finished, NULL);
+#if VERBOSE > 1
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Have %d expected connections\n", expected_connections);
+#endif
+ }
+
+ GNUNET_SCHEDULER_cancel (die_task);
+ if (expected_connections == GNUNET_SYSERR)
+ {
+ die_task =
+ GNUNET_SCHEDULER_add_now (&end_badly,
+ "from connect topology (bad return)");
+ }
+
+ die_task = GNUNET_SCHEDULER_add_delayed (test_timeout,
+ &end_badly,
+ "from connect topology (timeout)");
+ modnum = expected_connections / 4;
+ dotnum = (expected_connections / 50) + 1;
+#if VERBOSE
+ fprintf (stdout, "Peer connection progress: [");
+#endif
+}
+
+static void
+create_topology ()
+{
+ peers_left = num_peers; /* Reset counter */
+ if (GNUNET_TESTING_create_topology
+ (pg, topology, blacklist_topology,
+ blacklist_transports) != GNUNET_SYSERR)
+ {
+#if VERBOSE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Topology set up, now starting peers!\n");
+ fprintf (stdout, "Daemon start progress [");
+#endif
+ GNUNET_TESTING_daemons_continue_startup (pg);
+ }
+ else
+ {
+ GNUNET_SCHEDULER_cancel (die_task);
+ die_task =
+ GNUNET_SCHEDULER_add_now (&end_badly,
+ "from create topology (bad return)");
+ }
+ GNUNET_SCHEDULER_cancel (die_task);
+ die_task = GNUNET_SCHEDULER_add_delayed (test_timeout,
+ &end_badly,
+ "from continue startup (timeout)");
+}
+
+
+static void
+peers_started_callback (void *cls,
+ const struct GNUNET_PeerIdentity *id,
+ const struct GNUNET_CONFIGURATION_Handle *cfg,
+ struct GNUNET_TESTING_Daemon *d, const char *emsg)
+{
+ if (emsg != NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Failed to start daemon with error: `%s'\n", emsg);
+ return;
+ }
+ GNUNET_assert (id != NULL);
+#if VERBOSE > 1
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Started daemon %llu out of %llu\n",
+ (num_peers - peers_left) + 1, num_peers);
+#endif
+#if VERBOSE
+ if ((num_peers - peers_left) % modnum == 0)
+ {
+ if (num_peers - peers_left == 0)
+ fprintf (stdout, "0%%");
+ else
+ fprintf (stdout, "%d%%",
+ (int) (((float) (num_peers - peers_left) /
+ num_peers) * 100));
+
+ }
+ else if ((num_peers - peers_left) % dotnum == 0)
+ {
+ fprintf (stdout, ".");
+ }
+ fflush (stdout);
+#endif
+ peers_left--;
+ if (peers_left == 0)
+ {
+#if VERBOSE
+ fprintf (stdout, "100%%]\n");
+#endif
+#if VERBOSE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "All %d daemons started, now connecting peers!\n",
+ num_peers);
+#endif
+ GNUNET_SCHEDULER_cancel (die_task);
+ /* Set up task in case topology creation doesn't finish
+ * within a reasonable amount of time */
+ die_task = GNUNET_SCHEDULER_add_delayed (timeout,
+ &end_badly,
+ "from peers_started_callback");
+#if DELAY_FOR_LOGGING
+ fprintf (stdout, "Connecting topology in 10 seconds\n");
+ gather_log_data ();
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS, 10),
+ &connect_topology, NULL);
+#else
+ connect_topology ();
+#endif
+ ok = 0;
+ }
+}
+
+/**
+ * Callback indicating that the hostkey was created for a peer.
+ *
+ * @param cls NULL
+ * @param id the peer identity
+ * @param d the daemon handle (pretty useless at this point, remove?)
+ * @param emsg non-null on failure
+ */
+void
+hostkey_callback (void *cls,
+ const struct GNUNET_PeerIdentity *id,
+ struct GNUNET_TESTING_Daemon *d, const char *emsg)
+{
+ if (emsg != NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Hostkey callback received error: %s\n", emsg);
+ }
+
+#if VERBOSE > 1
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Hostkey (%d/%d) created for peer `%s'\n",
+ num_peers - peers_left, num_peers, GNUNET_i2s (id));
+#endif
+
+#if VERBOSE
+ if ((num_peers - peers_left) % modnum == 0)
+ {
+ if (num_peers - peers_left == 0)
+ fprintf (stdout, "0%%");
+ else
+ fprintf (stdout, "%d%%",
+ (int) (((float) (num_peers - peers_left) /
+ num_peers) * 100));
+
+ }
+ else if ((num_peers - peers_left) % dotnum == 0)
+ {
+ fprintf (stdout, ".");
+ }
+ fflush (stdout);
+#endif
+ peers_left--;
+ if (peers_left == 0)
+ {
+#if VERBOSE
+ fprintf (stdout, "100%%]\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "All %d hostkeys created, now creating topology!\n",
+ num_peers);
+#endif
+ GNUNET_SCHEDULER_cancel (die_task);
+ /* Set up task in case topology creation doesn't finish
+ * within a reasonable amount of time */
+ die_task = GNUNET_SCHEDULER_add_delayed (test_timeout,
+ &end_badly,
+ "from create_topology");
+ GNUNET_SCHEDULER_add_now (&create_topology, NULL);
+ ok = 0;
+ }
+}
+
+static void
+run (void *cls,
+ char *const *args,
+ const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+ char *topology_str;
+ char *connect_topology_str;
+ char *blacklist_topology_str;
+ char *connect_topology_option_str;
+ char *connect_topology_option_modifier_string;
+ unsigned long long temp_settle;
+ ok = 1;
+
+ dotOutFile = fopen (dotOutFileName, "w");
+ if (dotOutFile != NULL)
+ {
+ fprintf (dotOutFile, "strict graph G {\n");
+ }
+
+#if VERBOSE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Starting daemons based on config file %s\n", cfgfile);
+#endif
+
+ if (GNUNET_YES !=
+ GNUNET_CONFIGURATION_get_value_string (cfg, "paths", "servicehome",
+ &test_directory))
+ {
+ ok = 404;
+ return;
+ }
+
+ if ((GNUNET_YES ==
+ GNUNET_CONFIGURATION_get_value_string (cfg, "testing", "topology",
+ &topology_str))
+ && (GNUNET_NO == GNUNET_TESTING_topology_get (&topology, topology_str)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Invalid topology `%s' given for section %s option %s\n",
+ topology_str, "TESTING", "TOPOLOGY");
+ topology = GNUNET_TESTING_TOPOLOGY_CLIQUE; /* Defaults to NONE,
so set better default here */
+ }
+
+ if ((GNUNET_YES ==
+ GNUNET_CONFIGURATION_get_value_string (cfg, "testing",
+ "connect_topology",
+ &connect_topology_str))
+ && (GNUNET_NO ==
+ GNUNET_TESTING_topology_get (&connection_topology,
+ connect_topology_str)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Invalid connect topology `%s' given for section %s option
%s\n",
+ connect_topology_str, "TESTING", "CONNECT_TOPOLOGY");
+ }
+ GNUNET_free_non_null (connect_topology_str);
+ if ((GNUNET_YES ==
+ GNUNET_CONFIGURATION_get_value_string (cfg, "testing",
+ "connect_topology_option",
+ &connect_topology_option_str))
+ && (GNUNET_NO ==
+ GNUNET_TESTING_topology_option_get (&connect_topology_option,
+ connect_topology_option_str)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Invalid connect topology option `%s' given for section %s
option %s\n",
+ connect_topology_option_str, "TESTING",
+ "CONNECT_TOPOLOGY_OPTION");
+ connect_topology_option = GNUNET_TESTING_TOPOLOGY_OPTION_ALL; /*
Defaults to NONE, set to ALL */
+ }
+ GNUNET_free_non_null (connect_topology_option_str);
+ if (GNUNET_YES ==
+ GNUNET_CONFIGURATION_get_value_string (cfg, "testing",
+
"connect_topology_option_modifier",
+
&connect_topology_option_modifier_string))
+ {
+ if (sscanf
+ (connect_topology_option_modifier_string, "%lf",
+ &connect_topology_option_modifier) != 1)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _
+ ("Invalid value `%s' for option `%s' in section `%s':
expected float\n"),
+ connect_topology_option_modifier_string,
+ "connect_topology_option_modifier", "TESTING");
+ }
+ GNUNET_free (connect_topology_option_modifier_string);
+ }
+
+ if (GNUNET_YES !=
+ GNUNET_CONFIGURATION_get_value_string (cfg, "testing",
+ "blacklist_transports",
+ &blacklist_transports))
+ blacklist_transports = NULL;
+
+ if ((GNUNET_YES ==
+ GNUNET_CONFIGURATION_get_value_string (cfg, "testing",
+ "blacklist_topology",
+ &blacklist_topology_str))
+ && (GNUNET_NO ==
+ GNUNET_TESTING_topology_get (&blacklist_topology,
+ blacklist_topology_str)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Invalid topology `%s' given for section %s option %s\n",
+ topology_str, "TESTING", "BLACKLIST_TOPOLOGY");
+ }
+ GNUNET_free_non_null (topology_str);
+ GNUNET_free_non_null (blacklist_topology_str);
+
+ if (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "settle_time",
+ &temp_settle))
+ settle_time =
+ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, temp_settle);
+
+ if (GNUNET_SYSERR ==
+ GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "num_peers",
+ &num_peers))
+ num_peers = DEFAULT_NUM_PEERS;
+
+ main_cfg = cfg;
+
+ peers_left = num_peers;
+
+ /**
+ * How long until we fail the whole testcase?
+ */
+ test_timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, SECONDS_PER_PEER_START), num_peers * 2);
+
+ /**
+ * How long until we give up on starting the peers?
+ */
+ timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, SECONDS_PER_PEER_START), num_peers);
+
+ modnum = num_peers / 4;
+ dotnum = (num_peers / 50) + 1;
+#if VERBOSE
+ fprintf (stdout, "Hostkey generation progress: [");
+#endif
+ /* Set up a task to end testing if peer start fails */
+ die_task =
+ GNUNET_SCHEDULER_add_delayed (timeout,
+ &end_badly,
+ "didn't generate all hostkeys within a
reasonable amount of time!!!");
+
+ GNUNET_assert (num_peers > 0 && num_peers < (unsigned int) -1);
+ pg = GNUNET_TESTING_daemons_start (cfg,
+ peers_left,
+ timeout,
+ &hostkey_callback, NULL,
+ &peers_started_callback, NULL,
+ &topology_callback, NULL, NULL);
+
+}
+
+static int
+check ()
+{
+ char *binary_name;
+ char *config_file_name;
+ GNUNET_asprintf (&binary_name, "test-testing-topology-%s", topology_string);
+ GNUNET_asprintf (&config_file_name, "test_testing_data_topology_%s.conf",
+ topology_string);
+ int ret;
+ char *const argv[] = { binary_name,
+ "-c",
+ config_file_name,
+#if VERBOSE
+ "-L", "DEBUG",
+#endif
+ NULL
+ };
+ struct GNUNET_GETOPT_CommandLineOption options[] = {
+ GNUNET_GETOPT_OPTION_END
+ };
+ ret = GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
+ argv, binary_name, "nohelp", options, &run, &ok);
+ if (ret != GNUNET_OK)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "`test-testing-topology-%s': Failed with error code %d\n",
+ topology_string, ret);
+ }
+ GNUNET_free (binary_name);
+ GNUNET_free (config_file_name);
+ return ok;
+}
+
+int
+main (int argc, char *argv[])
+{
+ int ret;
+ char *binary_start_pos;
+ char *our_binary_name;
+
+ binary_start_pos = rindex (argv[0], '/');
+ GNUNET_assert (binary_start_pos != NULL);
+ topology_string = strstr (binary_start_pos, "_topology");
+ GNUNET_assert (topology_string != NULL);
+ topology_string++;
+ topology_string = strstr (topology_string, "_");
+ GNUNET_assert (topology_string != NULL);
+ topology_string++;
+
+ GNUNET_asprintf (&our_binary_name, "test-testing-large-topology_%s",
+ topology_string);
+ GNUNET_asprintf (&dotOutFileName, "large_topology_%s.dot", topology_string);
+
+ GNUNET_log_setup (our_binary_name,
+#if VERBOSE
+ "DEBUG",
+#else
+ "WARNING",
+#endif
+ NULL);
+ ret = check ();
+
+ /**
+ * Need to remove base directory, subdirectories taken care
+ * of by the testing framework.
+ */
+ if (GNUNET_DISK_directory_remove (test_directory) != GNUNET_OK)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Failed to remove testing directory %s\n", test_directory);
+ }
+ GNUNET_free (our_binary_name);
+ return ret;
+}
+
+/* end of test_testing_topology.c */
Modified: branches/gnunet/mantis_0001616/src/transport/Makefile.am
===================================================================
--- branches/gnunet/mantis_0001616/src/transport/Makefile.am 2010-12-18
12:28:19 UTC (rev 13927)
+++ branches/gnunet/mantis_0001616/src/transport/Makefile.am 2010-12-18
18:09:06 UTC (rev 13928)
@@ -91,6 +91,8 @@
$(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
+gnunet_transport_DEPENDENCIES = \
+ libgnunettransport.la
gnunet_service_transport_SOURCES = \
gnunet-service-transport.c plugin_transport.h
@@ -100,6 +102,8 @@
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
+gnunet_service_transport_DEPENDENCIES = \
+ libgnunettransport.la
plugin_LTLIBRARIES = \
Modified: branches/gnunet/mantis_0001616/src/util/Makefile.am
===================================================================
--- branches/gnunet/mantis_0001616/src/util/Makefile.am 2010-12-18 12:28:19 UTC
(rev 13927)
+++ branches/gnunet/mantis_0001616/src/util/Makefile.am 2010-12-18 18:09:06 UTC
(rev 13928)
@@ -90,15 +90,18 @@
gnunet_service_resolver_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
+gnunet_service_resolver_DEPENDENCIES = \
+ libgnunetutil.la
+
-
gnunet_resolver_SOURCES = \
gnunet-resolver.c
gnunet_resolver_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
+gnunet_resolver_DEPENDENCIES = \
+ libgnunetutil.la
-
plugin_LTLIBRARIES = \
libgnunet_plugin_test.la
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r13928 - in branches/gnunet/mantis_0001616: . contrib src/arm src/block src/dht src/dv src/fs src/hostlist src/statistics src/testing src/transport src/util,
gnunet <=