X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftesting%2Ftesting.c;h=5d928665e99de037972ba5df6be92c8698200228;hb=a0a00bf29253a9af1fdec7ccd9dda4d7f46a0ff8;hp=a9190242348150d3e242f85d9a0a0878f222ec7b;hpb=d5e417f094cac294282deafe46409342796263c6;p=oweals%2Fgnunet.git 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 */