From: Christian Grothoff Date: Thu, 18 Jun 2009 02:24:56 +0000 (+0000) Subject: fix X-Git-Tag: initial-import-from-subversion-38251~23738 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0b6c058aa9ede0cbd012d6aaf4969de53244fad2;p=oweals%2Fgnunet.git fix --- diff --git a/src/include/gnunet_testing_lib.h b/src/include/gnunet_testing_lib.h index f0e7d34a0..459e43314 100644 --- a/src/include/gnunet_testing_lib.h +++ b/src/include/gnunet_testing_lib.h @@ -128,6 +128,41 @@ void GNUNET_TESTING_daemons_connect (struct GNUNET_TESTING_Daemon *d1, +/** + * Start count gnunetd processes with the same set of + * transports and applications. The port numbers will + * be computed by adding delta each time (zero + * times for the first peer). + * + * @param total number of daemons to start + * @param service_home_prefix path to use as the prefix for the home of the services + * @param transports which transports should all peers use + * @param applications which applications should be used? + * @param timeout how long is this allowed to take? + * @param cb function to call on each daemon that was started + * @param cb_cls closure for cb + * @param cbe function to call at the end + * @param cbe_cls closure for cbe + * @param hostname where to run the peers; can be NULL (to run + * everything on localhost). + * @param va Additional hosts can be specified using a NULL-terminated list of + * varargs, hosts will then be used round-robin from that + * list; va only contains anything if hostname != NULL. + */ +void +GNUNET_TESTING_daemons_start_Va (struct GNUNET_SCHEDULER_Handle *sched, + struct GNUNET_CONFIGURATION_Handle *cfg, + unsigned int total, + const char *service_home_prefix, + const char *transports, + const char *applications, + GNUNET_TESTING_NotifyDaemonRunning cb, + void *cb_cls, + GNUNET_TESTING_NotifyCompletion cbe, + void *cbe_cls, + const char *hostname, + va_list va); + /** * Start count gnunetd processes with the same set of * transports and applications. The port numbers will @@ -254,40 +289,6 @@ GNUNET_TESTING_testbed_start (struct GNUNET_SCHEDULER_Handle *sched, ...); -/** - * Start count GNUnet daemons with a particular - * topology. - * - * @param size number of peers the testbed should have - * @param topology desired topology (enforced via F2F) - * @param service_home_prefix path to use as the prefix for the home of the services - * @param transports which transports should all peers use - * @param applications which applications should be used? - * @param timeout how long is this allowed to take? - * @param cb function to call on each daemon that was started - * @param cb_cls closure for cb - * @param cte function to call at the end - * @param cte_cls closure for cbe - * @param hostname where to run the peers; can be NULL (to run - * everything on localhost). - * @param va Additional hosts can be specified using a NULL-terminated list of - * varargs, hosts will then be used round-robin from that - * list; va only contains anything if hostname != NULL. - */ -void -GNUNET_TESTING_testbed_start_va (struct GNUNET_SCHEDULER_Handle *sched, - struct GNUNET_CONFIGURATION_Handle *cfg, - unsigned int size, - enum GNUNET_TESTING_Topology topology, - const char *service_home_prefix, - const char *transports, - const char *applications, - GNUNET_TESTING_NotifyDaemonRunning cb, - void *cb_cls, - GNUNET_TESTING_NotifyTestbedRunning cte, - void *cte_cls, - const char *hostname, - va_list ap); /** diff --git a/src/testing/testing.c b/src/testing/testing.c index a91902423..5d928665e 100644 --- a/src/testing/testing.c +++ b/src/testing/testing.c @@ -99,19 +99,20 @@ void GNUNET_TESTING_daemons_connect (struct GNUNET_TESTING_Daemon *d1, /** - * Start count GNUnet daemons with a particular - * topology. + * Start count gnunetd processes with the same set of + * transports and applications. The port numbers will + * be computed by adding delta each time (zero + * times for the first peer). * - * @param size number of peers the testbed should have - * @param topology desired topology (enforced via F2F) + * @param total number of daemons to start * @param service_home_prefix path to use as the prefix for the home of the services * @param transports which transports should all peers use * @param applications which applications should be used? * @param timeout how long is this allowed to take? * @param cb function to call on each daemon that was started * @param cb_cls closure for cb - * @param cte function to call at the end - * @param cte_cls closure for cbe + * @param cbe function to call at the end + * @param cbe_cls closure for cbe * @param hostname where to run the peers; can be NULL (to run * everything on localhost). * @param va Additional hosts can be specified using a NULL-terminated list of @@ -119,19 +120,18 @@ void GNUNET_TESTING_daemons_connect (struct GNUNET_TESTING_Daemon *d1, * list; va only contains anything if hostname != NULL. */ void -GNUNET_TESTING_testbed_start_va (struct GNUNET_SCHEDULER_Handle *sched, +GNUNET_TESTING_daemons_start_va (struct GNUNET_SCHEDULER_Handle *sched, struct GNUNET_CONFIGURATION_Handle *cfg, - unsigned int size, - enum GNUNET_TESTING_Topology topology, + unsigned int total, const char *service_home_prefix, const char *transports, const char *applications, GNUNET_TESTING_NotifyDaemonRunning cb, void *cb_cls, - GNUNET_TESTING_NotifyTestbedRunning cte, - void *cte_cls, + GNUNET_TESTING_NotifyCompletion cbe, + void *cbe_cls, const char *hostname, - va_list ap) + va_list va) { } @@ -182,12 +182,4 @@ GNUNET_TESTING_daemons_start (struct GNUNET_SCHEDULER_Handle *sched, va_end (va); } - -#if 0 /* keep Emacsens' auto-indent happy */ -{ -#endif -#ifdef __cplusplus -} -#endif - -#endif +/* end of testing.c */ diff --git a/src/testing/testing_testbed.c b/src/testing/testing_testbed.c index 4bf89e5c1..c80a3dcd6 100644 --- a/src/testing/testing_testbed.c +++ b/src/testing/testing_testbed.c @@ -122,13 +122,3 @@ GNUNET_TESTING_testbed_churn (struct GNUNET_TESTING_Testbed *tb, void *cb_cls) { } - - -#if 0 /* keep Emacsens' auto-indent happy */ -{ -#endif -#ifdef __cplusplus -} -#endif - -#endif