X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpeerinfo%2Fperf_peerinfo_api.c;h=840c85c1bb97db9a439c0b69d5bff53bb87a49d6;hb=f2d31fb82a314dcf6819dd494ff4a11e4f871c4e;hp=c4e6dcc1299e5d6a2404eccfe8decbfe02865fbe;hpb=2e7eb2ae0d5d41e957eefe77435a603773bbb08a;p=oweals%2Fgnunet.git diff --git a/src/peerinfo/perf_peerinfo_api.c b/src/peerinfo/perf_peerinfo_api.c old mode 100755 new mode 100644 index c4e6dcc12..840c85c1b --- a/src/peerinfo/perf_peerinfo_api.c +++ b/src/peerinfo/perf_peerinfo_api.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - (C) 2004, 2009, 2010 Christian Grothoff (and other contributing authors) + Copyright (C) 2004, 2009, 2010, 2017 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,32 +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 peerinfo/test_peerinfo_hammer.c - * @brief testcase for peerinfo_api.c, hopefully hammer the peerinfo service + * @file peerinfo/perf_peerinfo_api.c + * @brief testcase for peerinfo_api.c, hopefully hammer the peerinfo service, + * this performance test adds up to 5000 peers with one address each and checks + * over how many peers it can iterate before receiving a timeout after 5 seconds * @author Nathan Evans */ #include "platform.h" #include "gnunet_hello_lib.h" -#include "gnunet_getopt_lib.h" -#include "gnunet_os_lib.h" +#include "gnunet_util_lib.h" +#include "gnunet_testing_lib.h" #include "gnunet_peerinfo_service.h" -#include "gnunet_program_lib.h" -#include "gnunet_time_lib.h" #include "peerinfo.h" #include -#define START_SERVICE 1 - #define NUM_REQUESTS 5000 -static const struct GNUNET_CONFIGURATION_Handle *cfg; - static struct GNUNET_PEERINFO_IteratorContext *ic[NUM_REQUESTS]; static struct GNUNET_PEERINFO_Handle *h; @@ -48,31 +44,52 @@ static unsigned int numpeers; static struct GNUNET_PeerIdentity pid; +static struct GNUNET_SCHEDULER_Task *tt; -static int -check_it (void *cls, - const struct GNUNET_HELLO_Address *address, struct GNUNET_TIME_Absolute expiration) + +static void +do_shutdown (void *cls) { -#if DEBUG - if (addrlen > 0) + if (NULL != tt) { - fprintf (stderr, "name: %s, addr: %s\n", tname, (const char *) addr); + GNUNET_SCHEDULER_cancel (tt); + tt = NULL; } -#endif + for (unsigned int i = 0; i < NUM_REQUESTS; i++) + if (NULL != ic[i]) + GNUNET_PEERINFO_iterate_cancel (ic[i]); + GNUNET_PEERINFO_disconnect (h); + h = NULL; +} + + +static void +do_timeout (void *cls) +{ + tt = NULL; + GNUNET_SCHEDULER_shutdown (); +} + + +static int +check_it (void *cls, + const struct GNUNET_HELLO_Address *address, + struct GNUNET_TIME_Absolute expiration) +{ return GNUNET_OK; } -static size_t +static ssize_t address_generator (void *cls, size_t max, void *buf) { size_t *agc = cls; - size_t ret; + ssize_t ret; char *caddress; struct GNUNET_HELLO_Address address; if (*agc == 0) - return 0; + return GNUNET_SYSERR; /* Done */ GNUNET_asprintf (&caddress, "Address%d", *agc); address.peer = pid; @@ -80,7 +97,7 @@ address_generator (void *cls, size_t max, void *buf) address.address = caddress; address.transport_name = "peerinfotest"; ret = - GNUNET_HELLO_add_address (&address, + GNUNET_HELLO_add_address (&address, GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_HOURS), buf, max); GNUNET_free (caddress); @@ -92,126 +109,83 @@ address_generator (void *cls, size_t max, void *buf) static void add_peer (size_t i) { - struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pkey; struct GNUNET_HELLO_Message *h2; - memset (&pkey, i, sizeof (pkey)); - GNUNET_CRYPTO_hash (&pkey, sizeof (pkey), &pid.hashPubKey); - h2 = GNUNET_HELLO_create (&pkey, &address_generator, &i); - GNUNET_PEERINFO_add_peer (h, h2); + memset (&pid, i, sizeof (pid)); + h2 = GNUNET_HELLO_create (&pid.public_key, + &address_generator, + &i, + GNUNET_NO); + GNUNET_PEERINFO_add_peer (h, h2, NULL, NULL); GNUNET_free (h2); } static void -process (void *cls, const struct GNUNET_PeerIdentity *peer, - const struct GNUNET_HELLO_Message *hello, const char *err_msg) +process (void *cls, + const struct GNUNET_PeerIdentity *peer, + const struct GNUNET_HELLO_Message *hello, + const char *err_msg) { - if (peer == NULL) - { -#if DEBUG - fprintf (stderr, "Process received NULL response\n"); -#endif - } - else - { -#if DEBUG - fprintf (stderr, "Processed a peer\n"); -#endif - numpeers++; - if (0 && (hello != NULL)) - GNUNET_HELLO_iterate_addresses (hello, GNUNET_NO, &check_it, NULL); + struct GNUNET_PEERINFO_IteratorContext **icp = cls; + if (NULL == peer) + { + *icp = NULL; + return; } + numpeers++; + if (0 && (NULL != hello) ) + GNUNET_HELLO_iterate_addresses (hello, + GNUNET_NO, + &check_it, + NULL); } static void -run (void *cls, char *const *args, const char *cfgfile, - const struct GNUNET_CONFIGURATION_Handle *c) +run (void *cls, + const struct GNUNET_CONFIGURATION_Handle *cfg, + struct GNUNET_TESTING_Peer *peer) { - size_t i; - - cfg = c; h = GNUNET_PEERINFO_connect (cfg); GNUNET_assert (h != NULL); - for (i = 0; i < NUM_REQUESTS; i++) + for (unsigned int i = 0; i < NUM_REQUESTS; i++) { add_peer (i); - ic[i] = - GNUNET_PEERINFO_iterate (h, NULL, - GNUNET_TIME_relative_multiply - (GNUNET_TIME_UNIT_SECONDS, 30), &process, cls); + ic[i] = GNUNET_PEERINFO_iterate (h, + GNUNET_YES, + NULL, + &process, + &ic[i]); } -} - -static int -check () -{ - int ok = 0; - - char *const argv[] = { "perf-peerinfo-api", - "-c", - "test_peerinfo_api_data.conf", -#if DEBUG_PEERINFO - "-L", "DEBUG", -#else - "-L", "ERROR", -#endif - NULL - }; -#if START_SERVICE - struct GNUNET_OS_Process *proc; - - struct GNUNET_GETOPT_CommandLineOption options[] = { - GNUNET_GETOPT_OPTION_END - }; - proc = - GNUNET_OS_start_process (NULL, NULL, "gnunet-service-peerinfo", - "gnunet-service-peerinfo", -#if DEBUG_PEERINFO - "-L", "DEBUG", -#else - "-L", "ERROR", -#endif - "-c", "test_peerinfo_api_data.conf", NULL); -#endif - GNUNET_assert (NULL != proc); - GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, - "perf-peerinfo-api", "nohelp", options, &run, &ok); - fprintf (stderr, "Received %u/%u calls before timeout\n", numpeers, - NUM_REQUESTS * NUM_REQUESTS / 2); - GAUGER ("PEERINFO", "Peerinfo lookups", numpeers / 30, "peers/s"); -#if START_SERVICE - if (0 != GNUNET_OS_process_kill (proc, SIGTERM)) - { - GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); - ok = 1; - } - GNUNET_OS_process_wait (proc); - GNUNET_OS_process_close (proc); - proc = NULL; - -#endif - return ok; + tt = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, + 5), + &do_timeout, + NULL); + GNUNET_SCHEDULER_add_shutdown (&do_shutdown, + NULL); } int -main (int argc, char *argv[]) +main (int argc, + char *argv[]) { - int ret = 0; - - GNUNET_log_setup ("perf_peerinfo_api", -#if DEBUG_PEERINFO - "DEBUG", -#else - "ERROR", -#endif - NULL); - ret = check (); - GNUNET_DISK_directory_remove ("/tmp/test-gnunet-peerinfo"); - return ret; + if (0 != GNUNET_TESTING_service_run ("perf-gnunet-peerinfo", + "peerinfo", + "test_peerinfo_api_data.conf", + &run, NULL)) + return 1; + FPRINTF (stderr, + "Received %u/%u calls before timeout\n", + numpeers, + NUM_REQUESTS * NUM_REQUESTS / 2); + GAUGER ("PEERINFO", + "Peerinfo lookups", + numpeers / 5, + "peers/s"); + return 0; } /* end of perf_peerinfo_api.c */