X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Finclude%2Fgnunet_testing_lib.h;h=e09068444e30ee68700229d51323142e282edea2;hb=17047b7bcbe3f1756028058a9887416c6afab5d8;hp=6b3333188551dc4bbb49c78821f867ff5749afaa;hpb=36291b73fab94a984ae4f7314f983e18492238be;p=oweals%2Fgnunet.git diff --git a/src/include/gnunet_testing_lib.h b/src/include/gnunet_testing_lib.h index 6b3333188..e09068444 100644 --- a/src/include/gnunet_testing_lib.h +++ b/src/include/gnunet_testing_lib.h @@ -1,6 +1,6 @@ /* This file is part of GNUnet - (C) 2008, 2009, 2012 Christian Grothoff (and other contributing authors) + Copyright (C) 2008, 2009, 2012 GNUnet e.V. GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -14,20 +14,28 @@ 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. + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /** - * @file include/gnunet_testing_lib.h - * @brief convenience API for writing testcases for GNUnet; - * can start/stop one or more peers on a system; - * testing is responsible for managing private keys, - * ports and paths; it is a low-level library that - * does not support higher-level functions such as - * P2P connection, topology management or distributed - * testbed maintenance (those are in gnunet_testbed_service.h) * @author Christian Grothoff + * + * @file + * Convenience API for writing testcases for GNUnet + * + * @defgroup testing Testing library + * Library for writing testcases for GNUnet. + * + * It can start/stop one or more peers on a system; testing is responsible for + * managing private keys, ports and paths; it is a low-level library that does + * not support higher-level functions such as P2P connection, topology + * management or distributed testbed maintenance (those are provided by the + * [Testbed service](@ref testbed)) + * + * @see [Documentation](https://gnunet.org/writing_testcases) + * + * @{ */ #ifndef GNUNET_TESTING_LIB_H @@ -46,12 +54,16 @@ extern "C" #endif /** - * Size of each hostkey in the hostkey file (in BYTES). This is the - * maximum length of the S-expressions generated by libgcrypt for the - * curves (rounded up to the next full KB to make IO nicer); it is NOT - * the number of bits in the key. + * Size of each hostkey in the hostkey file (in BYTES). + */ +#define GNUNET_TESTING_HOSTKEYFILESIZE sizeof (struct GNUNET_CRYPTO_EddsaPrivateKey) + +/** + * The environmental variable, if set, that dictates where testing should place + * generated peer configurations */ -#define GNUNET_TESTING_HOSTKEYFILESIZE 1024 +#define GNUNET_TESTING_PREFIX "GNUNET_TESTING_PREFIX" + /** * Handle for a system on which GNUnet peers are executed; @@ -66,6 +78,29 @@ struct GNUNET_TESTING_System; struct GNUNET_TESTING_Peer; +/** + * Specification of a service that is to be shared among peers + */ +struct GNUNET_TESTING_SharedService +{ + /** + * The name of the service. + */ + const char *service; + + /** + * The configuration template for the service. Cannot be NULL + */ + const struct GNUNET_CONFIGURATION_Handle *cfg; + + /** + * The number of peers which share an instance of the service. 0 for sharing + * among all peers + */ + unsigned int share; +}; + + /** * Create a system handle. There must only be one system handle per operating * system. Uses a default range for allowed ports. Ports are still tested for @@ -73,19 +108,25 @@ struct GNUNET_TESTING_Peer; * * @param testdir only the directory name without any path. This is used for all * service homes; the directory will be created in a temporary location - * depending on the underlying OS + * depending on the underlying OS. This variable will be + * overridden with the value of the environmental variable + * GNUNET_TESTING_PREFIX, if it exists. * @param trusted_ip the ip address which will be set as TRUSTED HOST in all * service configurations generated to allow control connections from * this ip. This can either be a single ip address or a network address * in CIDR notation. * @param hostname the hostname of the system we are using for testing; NULL for * localhost + * @param shared_services NULL terminated array describing services that are to + * be shared among peers * @return handle to this system, NULL on error */ struct GNUNET_TESTING_System * GNUNET_TESTING_system_create (const char *testdir, const char *trusted_ip, - const char *hostname); + const char *hostname, + const struct GNUNET_TESTING_SharedService * + shared_services); /** @@ -97,13 +138,17 @@ GNUNET_TESTING_system_create (const char *testdir, * * @param testdir only the directory name without any path. This is used for * all service homes; the directory will be created in a temporary - * location depending on the underlying OS + * location depending on the underlying OS. This variable will be + * overridden with the value of the environmental variable + * GNUNET_TESTING_PREFIX, if it exists. * @param trusted_ip the ip address which will be set as TRUSTED HOST in all * service configurations generated to allow control connections from * this ip. This can either be a single ip address or a network address * in CIDR notation. * @param hostname the hostname of the system we are using for testing; NULL for * localhost + * @param shared_services NULL terminated array describing services that are to + * be shared among peers * @param lowport lowest port number this system is allowed to allocate (inclusive) * @param highport highest port number this system is allowed to allocate (exclusive) * @return handle to this system, NULL on error @@ -112,6 +157,7 @@ struct GNUNET_TESTING_System * GNUNET_TESTING_system_create_with_portrange (const char *testdir, const char *trusted_ip, const char *hostname, + const struct GNUNET_TESTING_SharedService *shared_services, uint16_t lowport, uint16_t highport); @@ -133,34 +179,32 @@ GNUNET_TESTING_system_destroy (struct GNUNET_TESTING_System *system, * faster peer startup. This function can be used to * access the n-th key of those pre-created hostkeys; note * that these keys are ONLY useful for testing and not - * secure as the private keys are part of the public + * secure as the private keys are part of the public * GNUnet source code. * * This is primarily a helper function used internally - * by 'GNUNET_TESTING_peer_configure'. + * by #GNUNET_TESTING_peer_configure(). * * @param system the testing system handle * @param key_number desired pre-created hostkey to obtain * @param id set to the peer's identity (hash of the public - * key; if NULL, GNUNET_SYSERR is returned immediately + * key; if NULL, #GNUNET_SYSERR is returned immediately * @return NULL on error (not enough keys) */ -struct GNUNET_CRYPTO_EccPrivateKey * +struct GNUNET_CRYPTO_EddsaPrivateKey * GNUNET_TESTING_hostkey_get (const struct GNUNET_TESTING_System *system, uint32_t key_number, struct GNUNET_PeerIdentity *id); /** - * Reserve a TCP or UDP port for a peer. + * Reserve a port for a peer. * * @param system system to use for reservation tracking - * @param is_tcp GNUNET_YES for TCP ports, GNUNET_NO for UDP * @return 0 if no free port was available */ -uint16_t -GNUNET_TESTING_reserve_port (struct GNUNET_TESTING_System *system, - int is_tcp); +uint16_t +GNUNET_TESTING_reserve_port (struct GNUNET_TESTING_System *system); /** @@ -168,12 +212,10 @@ GNUNET_TESTING_reserve_port (struct GNUNET_TESTING_System *system, * (used during GNUNET_TESTING_peer_destroy). * * @param system system to use for reservation tracking - * @param is_tcp GNUNET_YES for TCP ports, GNUNET_NO for UDP * @param port reserved port to release */ void GNUNET_TESTING_release_port (struct GNUNET_TESTING_System *system, - int is_tcp, uint16_t port); @@ -183,14 +225,15 @@ GNUNET_TESTING_release_port (struct GNUNET_TESTING_System *system, * system. The default configuration will be available in PATHS section under * the option DEFAULTCONFIG after the call. SERVICE_HOME is also set in PATHS * section to the temporary directory specific to this configuration. If we run - * out of "*port" numbers, return SYSERR. + * out of "*port" numbers, return #GNUNET_SYSERR. * * This is primarily a helper function used internally - * by 'GNUNET_TESTING_peer_configure'. + * by #GNUNET_TESTING_peer_configure(). * * @param system system to use to coordinate resource usage * @param cfg template configuration to update - * @return GNUNET_OK on success, GNUNET_SYSERR on error - the configuration will + * @return #GNUNET_OK on success, + * #GNUNET_SYSERR on error - the configuration will * be incomplete and should not be used there upon */ int @@ -201,14 +244,14 @@ GNUNET_TESTING_configuration_create (struct GNUNET_TESTING_System *system, /** * Configure a GNUnet peer. GNUnet must be installed on the local - * system and available in the PATH. + * system and available in the PATH. * * @param system system to use to coordinate resource usage * @param cfg configuration to use; will be UPDATED (to reflect needed * changes in port numbers and paths) * @param key_number number of the hostkey to use for the peer * @param id identifier for the daemon, will be set, can be NULL - * @param emsg set to freshly allocated error message (set to NULL on success), + * @param emsg set to freshly allocated error message (set to NULL on success), * can be NULL * @return handle to the peer, NULL on error */ @@ -232,20 +275,24 @@ GNUNET_TESTING_peer_get_identity (struct GNUNET_TESTING_Peer *peer, /** - * Start the peer. + * Start the peer. * * @param peer peer to start - * @return GNUNET_OK on success, GNUNET_SYSERR on error (i.e. peer already running) + * @return #GNUNET_OK on success, + * #GNUNET_SYSERR on error (i.e. peer already running) */ int GNUNET_TESTING_peer_start (struct GNUNET_TESTING_Peer *peer); /** - * Stop the peer. + * Stop the peer. This call is blocking as it kills the peer's main ARM process + * by sending a SIGTERM and waits on it. For asynchronous shutdown of peer, see + * GNUNET_TESTING_peer_stop_async(). * * @param peer peer to stop - * @return GNUNET_OK on success, GNUNET_SYSERR on error (i.e. peer not running) + * @return #GNUNET_OK on success, + * #GNUNET_SYSERR on error (i.e. peer not running) */ int GNUNET_TESTING_peer_stop (struct GNUNET_TESTING_Peer *peer); @@ -266,7 +313,7 @@ GNUNET_TESTING_peer_destroy (struct GNUNET_TESTING_Peer *peer); * Sends SIGTERM to the peer's main process * * @param peer the handle to the peer - * @return GNUNET_OK if successful; GNUNET_SYSERR if the main process is NULL + * @return #GNUNET_OK if successful; #GNUNET_SYSERR if the main process is NULL * or upon any error while sending SIGTERM */ int @@ -277,7 +324,7 @@ GNUNET_TESTING_peer_kill (struct GNUNET_TESTING_Peer *peer); * Waits for a peer to terminate. The peer's main process will also be destroyed. * * @param peer the handle to the peer - * @return GNUNET_OK if successful; GNUNET_SYSERR if the main process is NULL + * @return #GNUNET_OK if successful; #GNUNET_SYSERR if the main process is NULL * or upon any error while waiting */ int @@ -287,130 +334,59 @@ GNUNET_TESTING_peer_wait (struct GNUNET_TESTING_Peer *peer); /** * Callback to inform whether the peer is running or stopped. * - * @param cls the closure from GNUNET_TESTING_peer_configure2() + * @param cls the closure given to GNUNET_TESTING_peer_stop_async() * @param peer the respective peer whose status is being reported - * @param success GNUNET_YES if the peer is running; GNUNET_NO if the peer is - * not running; GNUNET_SYSERR upon error communicating with the peer's - * ARM service + * @param success #GNUNET_YES if the peer is stopped; #GNUNET_SYSERR upon any + * error */ -typedef void (*GNUNET_TESTING_PeerStatusCallback) (void *cls, - struct GNUNET_TESTING_Peer * - peer, - int success); - - -/** - * Wrapper over GNUNET_TESTING_peer_configure() to set the - * GNUNET_TESTING_PeerStatusCallback() for using functions - * GNUNET_TESTING_peer_start2() and GNUNET_TESTING_peer_stop2() - * - * @param system system to use to coordinate resource usage - * @param cfg configuration to use; will be UPDATED (to reflect needed - * changes in port numbers and paths) - * @param key_number number of the hostkey to use for the peer - * @param id identifier for the daemon, will be set, can be NULL - * @param emsg set to freshly allocated error message (set to NULL on success), - * can be NULL - * @param status_cb the status callback to call upon peer start and stop - * @return handle to the peer, NULL on error - */ -struct GNUNET_TESTING_Peer * -GNUNET_TESTING_peer_configure2 (struct GNUNET_TESTING_System *system, - struct GNUNET_CONFIGURATION_Handle *cfg, - uint32_t key_number, - struct GNUNET_PeerIdentity *id, - char **emsg, - GNUNET_TESTING_PeerStatusCallback status_cb, - void *cls); - - -/** - * Start a peer asynchronously using ARM API. Peer's startup is signaled - * through the GNUNET_TESTING_PeerStatusCallback() given to - * GNUNET_TESTING_peer_configure2(). To use this function the peer must be - * configured earlier using GNUNET_TESTING_peer_configure2(); - * - * @param peer the peer to start - * @param timeout how long to wait before giving up to start the peer - * @return GNUNET_OK upon successfully giving the request to the ARM API (this - * does not mean that the peer is successfully started); GNUNET_SYSERR - * upon any error. - */ -int -GNUNET_TESTING_peer_start2 (struct GNUNET_TESTING_Peer *peer, - struct GNUNET_TIME_Relative timeout); +typedef void +(*GNUNET_TESTING_PeerStopCallback) (void *cls, + struct GNUNET_TESTING_Peer *peer, + int success); /** * Stop a peer asynchronously using ARM API. Peer's shutdown is signaled - * through the GNUNET_TESTING_PeerStatusCallback() given to - * GNUNET_TESTING_peer_configure2(). To use this function the peer must be - * configured earlier using GNUNET_TESTING_peer_configure2(); + * through the GNUNET_TESTING_PeerStopCallback(). * * @param peer the peer to stop - * @param timeout how long to wait before giving up to stop the peer - * @return GNUNET_OK upon successfully giving the request to the ARM API (this - * does not mean that the peer is successfully stopped); GNUNET_SYSERR + * @param cb the callback to signal peer shutdown + * @param cb_cls closure for the @a cb + * @return #GNUNET_OK upon successfully giving the request to the ARM API (this + * does not mean that the peer is successfully stopped); #GNUNET_SYSERR * upon any error. */ int -GNUNET_TESTING_peer_stop2 (struct GNUNET_TESTING_Peer *peer, - struct GNUNET_TIME_Relative timeout); +GNUNET_TESTING_peer_stop_async (struct GNUNET_TESTING_Peer *peer, + GNUNET_TESTING_PeerStopCallback cb, + void *cb_cls); /** - * Start a service at a peer using its ARM service. To use this function the - * peer must be configured earlier using GNUNET_TESTING_peer_configure2(); + * Cancel a previous asynchronous peer stop request. + * GNUNET_TESTING_peer_stop_async() should have been called before on the given + * peer. It is an error to call this function if the peer stop callback was + * already called * - * @param peer the peer whose service has to be started - * @param service_name name of the service to start - * @param timeout how long should the ARM API try to send the request to start - * the service - * @param cont the callback to call with result and status from ARM API - * @param cont_cls the closure for the above callback - * @return GNUNET_OK upon successfully queuing the service start request; - * GNUNET_SYSERR upon error + * @param peer the peer on which GNUNET_TESTING_peer_stop_async() was called + * before. */ -int -GNUNET_TESTING_peer_service_start (struct GNUNET_TESTING_Peer *peer, - const char *service_name, - struct GNUNET_TIME_Relative timeout, - GNUNET_ARM_ResultCallback cont, - void *cont_cls); - - -/** - * Stop a service at a peer using its ARM service. To use this function the - * peer must be configured earlier using GNUNET_TESTING_peer_configure2(); - * - * @param peer the peer whose service has to be stopped - * @param service_name name of the service to stop - * @param timeout how long should the ARM API try to send the request to stop - * the service - * @param cont the callback to call with result and status from ARM API - * @param cont_cls the closure for the above callback - * @return GNUNET_OK upon successfully queuing the service stop request; - * GNUNET_SYSERR upon error - */ -int -GNUNET_TESTING_peer_service_stop (struct GNUNET_TESTING_Peer *peer, - const char *service_name, - struct GNUNET_TIME_Relative timeout, - GNUNET_ARM_ResultCallback cont, - void *cont_cls); +void +GNUNET_TESTING_peer_stop_async_cancel (struct GNUNET_TESTING_Peer *peer); /** * Signature of the 'main' function for a (single-peer) testcase that - * is run using 'GNUNET_TESTING_peer_run'. - * + * is run using #GNUNET_TESTING_peer_run(). + * * @param cls closure * @param cfg configuration of the peer that was started * @param peer identity of the peer that was created */ -typedef void (*GNUNET_TESTING_TestMain)(void *cls, - const struct GNUNET_CONFIGURATION_Handle *cfg, - struct GNUNET_TESTING_Peer *peer); +typedef void +(*GNUNET_TESTING_TestMain) (void *cls, + const struct GNUNET_CONFIGURATION_Handle *cfg, + struct GNUNET_TESTING_Peer *peer); /** @@ -454,7 +430,7 @@ GNUNET_TESTING_peer_run (const char *testdir, * @param cfgfilename name of the configuration file to use; * use NULL to only run with defaults * @param tm main function of the testcase - * @param tm_cls closure for 'tm' + * @param tm_cls closure for @a tm * @return 0 on success, 1 on error */ int @@ -469,14 +445,14 @@ GNUNET_TESTING_service_run (const char *testdir, * Sometimes we use the binary name to determine which specific * test to run. In those cases, the string after the last "_" * in 'argv[0]' specifies a string that determines the configuration - * file or plugin to use. + * file or plugin to use. * * This function returns the respective substring, taking care * of issues such as binaries ending in '.exe' on W32. * * @param argv0 the name of the binary * @return string between the last '_' and the '.exe' (or the end of the string), - * NULL if argv0 has no '_' + * NULL if argv0 has no '_' */ char * GNUNET_TESTING_get_testname_from_underscore (const char *argv0); @@ -490,3 +466,5 @@ GNUNET_TESTING_get_testname_from_underscore (const char *argv0); #endif #endif + +/** @} */ /* end of group */