X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fcore%2Ftest_core_api_reliability.c;h=061158d716bee509afdc7a9485c16f9f5c1bb93a;hb=6973ade884b8e22e7fcaa51a90d00a8caa2d2fa4;hp=ad6e6a76199182542ade88f5a3ae59b7e0e62885;hpb=147d72a99e4ed0558c98fe7c9c41062ede51a68a;p=oweals%2Fgnunet.git diff --git a/src/core/test_core_api_reliability.c b/src/core/test_core_api_reliability.c index ad6e6a761..061158d71 100644 --- a/src/core/test_core_api_reliability.c +++ b/src/core/test_core_api_reliability.c @@ -20,9 +20,6 @@ /** * @file core/test_core_api_reliability.c * @brief testcase for core_api.c focusing on reliable transmission (with TCP) - * - * FIXME: - * - make sure connect callback is invoked properly as well! */ #include "platform.h" #include "gnunet_common.h" @@ -36,10 +33,6 @@ #include "gnunet_transport_service.h" #include -#define VERBOSE GNUNET_NO - -#define START_ARM GNUNET_YES - /** * Note that this value must not significantly exceed * 'MAX_PENDING' in 'gnunet-service-transport.c', otherwise @@ -66,6 +59,8 @@ static struct GNUNET_TIME_Absolute start_time; static GNUNET_SCHEDULER_TaskIdentifier err_task; +static GNUNET_SCHEDULER_TaskIdentifier connect_task; + struct PeerContext { @@ -76,9 +71,7 @@ struct PeerContext struct GNUNET_MessageHeader *hello; struct GNUNET_TRANSPORT_GetHelloHandle *ghh; int connect_status; -#if START_ARM struct GNUNET_OS_Process *arm_proc; -#endif }; static struct PeerContext p1; @@ -90,11 +83,7 @@ static int ok; static int32_t tr_n; -#if VERBOSE -#define OKPP do { ok++; fprintf (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0) -#else -#define OKPP do { ok++; } while (0) -#endif +#define OKPP do { ok++; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0) struct TestMessage { @@ -114,9 +103,11 @@ get_size (unsigned int iter) return sizeof (struct TestMessage) + (ret % 60000); } + static void process_hello (void *cls, const struct GNUNET_MessageHeader *message); + static void terminate_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { @@ -126,14 +117,18 @@ terminate_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_TRANSPORT_get_hello_cancel (p2.ghh); GNUNET_CORE_disconnect (p1.ch); p1.ch = NULL; + GNUNET_free_non_null (p1.hello); GNUNET_CORE_disconnect (p2.ch); p2.ch = NULL; + GNUNET_free_non_null (p2.hello); + if (connect_task != GNUNET_SCHEDULER_NO_TASK) + GNUNET_SCHEDULER_cancel (connect_task); GNUNET_TRANSPORT_disconnect (p1.th); p1.th = NULL; GNUNET_TRANSPORT_disconnect (p2.th); p2.th = NULL; delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value; - fprintf (stderr, "\nThroughput was %llu kb/s\n", + FPRINTF (stderr, "\nThroughput was %llu kb/s\n", total_bytes * 1000 / 1024 / delta); GAUGER ("CORE", "Core throughput/s", total_bytes * 1000 / 1024 / delta, "kb/s"); @@ -155,6 +150,8 @@ terminate_task_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_CORE_disconnect (p2.ch); p2.ch = NULL; } + if (connect_task != GNUNET_SCHEDULER_NO_TASK) + GNUNET_SCHEDULER_cancel (connect_task); if (p1.th != NULL) { GNUNET_TRANSPORT_get_hello_cancel (p1.ghh); @@ -171,6 +168,16 @@ terminate_task_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) } +static void +try_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +{ + connect_task = + GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &try_connect, + NULL); + GNUNET_TRANSPORT_try_connect (p1.th, &p2.id, NULL, NULL); /*FIXME TRY_CONNECT change */ +} + + static size_t transmit_ready (void *cls, size_t size, void *buf) { @@ -198,10 +205,8 @@ transmit_ready (void *cls, size_t size, void *buf) cbuf = buf; do { -#if VERBOSE GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending message %u of size %u at offset %u\n", tr_n, s, ret); -#endif hdr.header.size = htons (s); hdr.header.type = htons (MTYPE); hdr.num = htonl (tr_n); @@ -225,10 +230,10 @@ transmit_ready (void *cls, size_t size, void *buf) } - static void connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer, - const struct GNUNET_TRANSPORT_ATS_Information *atsi) + const struct GNUNET_ATS_Information *atsi, + unsigned int atsi_count) { struct PeerContext *pc = cls; @@ -273,12 +278,11 @@ disconnect_notify (void *cls, const struct GNUNET_PeerIdentity *peer) static int inbound_notify (void *cls, const struct GNUNET_PeerIdentity *other, const struct GNUNET_MessageHeader *message, - const struct GNUNET_TRANSPORT_ATS_Information *atsi) + const struct GNUNET_ATS_Information *atsi, + unsigned int atsi_count) { -#if VERBOSE GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Core provides inbound data from `%4s'.\n", GNUNET_i2s (other)); -#endif return GNUNET_OK; } @@ -286,13 +290,12 @@ inbound_notify (void *cls, const struct GNUNET_PeerIdentity *other, static int outbound_notify (void *cls, const struct GNUNET_PeerIdentity *other, const struct GNUNET_MessageHeader *message, - const struct GNUNET_TRANSPORT_ATS_Information *atsi) + const struct GNUNET_ATS_Information *atsi, + unsigned int atsi_count) { -#if VERBOSE GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Core notifies about outbound data for `%4s'.\n", GNUNET_i2s (other)); -#endif return GNUNET_OK; } @@ -300,10 +303,12 @@ outbound_notify (void *cls, const struct GNUNET_PeerIdentity *other, static size_t transmit_ready (void *cls, size_t size, void *buf); + static int process_mtype (void *cls, const struct GNUNET_PeerIdentity *peer, const struct GNUNET_MessageHeader *message, - const struct GNUNET_TRANSPORT_ATS_Information *atsi) + const struct GNUNET_ATS_Information *atsi, + unsigned int atsi_count) { static int n; unsigned int s; @@ -331,13 +336,11 @@ process_mtype (void *cls, const struct GNUNET_PeerIdentity *peer, err_task = GNUNET_SCHEDULER_add_now (&terminate_task_error, NULL); return GNUNET_SYSERR; } -#if VERBOSE GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got message %u of size %u\n", ntohl (hdr->num), ntohs (message->size)); -#endif n++; if (0 == (n % (TOTAL_MSGS / 100))) - fprintf (stderr, "."); + FPRINTF (stderr, "%s", "."); if (n == TOTAL_MSGS) { GNUNET_SCHEDULER_cancel (err_task); @@ -362,11 +365,9 @@ static struct GNUNET_CORE_MessageHandler handlers[] = { }; - static void init_notify (void *cls, struct GNUNET_CORE_Handle *server, - const struct GNUNET_PeerIdentity *my_identity, - const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey) + const struct GNUNET_PeerIdentity *my_identity) { struct PeerContext *p = cls; @@ -381,8 +382,8 @@ init_notify (void *cls, struct GNUNET_CORE_Handle *server, GNUNET_assert (ok == 2); OKPP; /* connect p2 */ - GNUNET_CORE_connect (p2.cfg, 1, &p2, &init_notify, &connect_notify, - &disconnect_notify, NULL, &inbound_notify, GNUNET_YES, + GNUNET_CORE_connect (p2.cfg, &p2, &init_notify, &connect_notify, + &disconnect_notify, &inbound_notify, GNUNET_YES, &outbound_notify, GNUNET_YES, handlers); } else @@ -391,9 +392,9 @@ init_notify (void *cls, struct GNUNET_CORE_Handle *server, OKPP; GNUNET_assert (cls == &p2); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Asking core (1) to connect to peer `%4s'\n", + "Asking transport (1) to connect to peer `%4s'\n", GNUNET_i2s (&p2.id)); - GNUNET_CORE_peer_request_connect (p1.ch, &p2.id, NULL, NULL); + connect_task = GNUNET_SCHEDULER_add_now (&try_connect, NULL); } } @@ -406,8 +407,7 @@ process_hello (void *cls, const struct GNUNET_MessageHeader *message) GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received (my) `%s' from transport service\n", "HELLO"); GNUNET_assert (message != NULL); - p->hello = GNUNET_malloc (ntohs (message->size)); - memcpy (p->hello, message, ntohs (message->size)); + p->hello = GNUNET_copy_message (message); if ((p == &p1) && (p2.th != NULL)) GNUNET_TRANSPORT_offer_hello (p2.th, message, NULL, NULL); if ((p == &p2) && (p1.th != NULL)) @@ -420,24 +420,22 @@ process_hello (void *cls, const struct GNUNET_MessageHeader *message) } - static void setup_peer (struct PeerContext *p, const char *cfgname) { + char *binary; + + binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm"); p->cfg = GNUNET_CONFIGURATION_create (); -#if START_ARM p->arm_proc = - GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", + GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, binary, "gnunet-service-arm", -#if VERBOSE - "-L", "DEBUG", -#endif "-c", cfgname, NULL); -#endif GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); p->th = GNUNET_TRANSPORT_connect (p->cfg, NULL, p, NULL, NULL, NULL); GNUNET_assert (p->th != NULL); p->ghh = GNUNET_TRANSPORT_get_hello (p->th, &process_hello, p); + GNUNET_free (binary); } @@ -451,8 +449,8 @@ run (void *cls, char *const *args, const char *cfgfile, setup_peer (&p2, "test_core_api_peer2.conf"); err_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &terminate_task_error, NULL); - GNUNET_CORE_connect (p1.cfg, 1, &p1, &init_notify, &connect_notify, - &disconnect_notify, NULL, &inbound_notify, GNUNET_YES, + GNUNET_CORE_connect (p1.cfg, &p1, &init_notify, &connect_notify, + &disconnect_notify, &inbound_notify, GNUNET_YES, &outbound_notify, GNUNET_YES, handlers); } @@ -460,16 +458,14 @@ run (void *cls, char *const *args, const char *cfgfile, static void stop_arm (struct PeerContext *p) { -#if START_ARM if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); if (GNUNET_OS_process_wait (p->arm_proc) != GNUNET_OK) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); - GNUNET_OS_process_close (p->arm_proc); + GNUNET_OS_process_destroy (p->arm_proc); p->arm_proc = NULL; -#endif GNUNET_CONFIGURATION_destroy (p->cfg); } @@ -479,9 +475,6 @@ check () char *const argv[] = { "test-core-api-reliability", "-c", "test_core_api_data.conf", -#if VERBOSE - "-L", "DEBUG", -#endif NULL }; struct GNUNET_GETOPT_CommandLineOption options[] = { @@ -496,17 +489,14 @@ check () return ok; } + int main (int argc, char *argv[]) { int ret; GNUNET_log_setup ("test-core-api", -#if VERBOSE - "DEBUG", -#else "WARNING", -#endif NULL); ret = check (); GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-1");