X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fcore%2Ftest_core_quota_compliance.c;h=d951113fc908c14dd4a99ea4e72cd4f9bb126286;hb=5b79d2a877b71d5e718328784fd69725efa1d38d;hp=a54cf4e0b1bc560e5c5c63aa6ea37593e8da33fc;hpb=b12b0876dddf1db8da7042d1024c8b469831e96e;p=oweals%2Fgnunet.git diff --git a/src/core/test_core_quota_compliance.c b/src/core/test_core_quota_compliance.c index a54cf4e0b..d951113fc 100644 --- a/src/core/test_core_quota_compliance.c +++ b/src/core/test_core_quota_compliance.c @@ -20,9 +20,6 @@ /** * @file core/test_core_quota_compliance.c * @brief testcase for core_api.c focusing quota compliance on core level - * - * FIXME: - * - make sure connect callback is invoked properly as well! */ #include "platform.h" #include "gnunet_common.h" @@ -34,8 +31,9 @@ #include "gnunet_program_lib.h" #include "gnunet_scheduler_lib.h" #include "gnunet_transport_service.h" +#include "gnunet_statistics_service.h" -#define VERBOSE GNUNET_YES +#define VERBOSE GNUNET_NO #define DEBUG_TRANSMISSION GNUNET_NO #define SYMMETRIC 0 @@ -54,7 +52,7 @@ /** * How long until we give up on transmitting the message? */ -#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30) +#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 180) /** * What delay do we request from the core service for transmission? @@ -64,7 +62,7 @@ #define FAST_TIMEOUT GNUNET_TIME_relative_divide (GNUNET_CONSTANTS_MAX_CORK_DELAY, 2) #define MTYPE 12345 -#define MSIZE 1024 +#define MESSAGESIZE 1024 #define MEASUREMENT_LENGTH GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5) static unsigned long long total_bytes_sent; @@ -84,6 +82,7 @@ struct PeerContext struct GNUNET_PeerIdentity id; struct GNUNET_TRANSPORT_Handle *th; struct GNUNET_MessageHeader *hello; + struct GNUNET_STATISTICS_Handle *stats; int connect_status; #if START_ARM struct GNUNET_OS_Process *arm_proc; @@ -120,10 +119,14 @@ struct TestMessage static void terminate_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - GNUNET_CORE_disconnect (p1.ch); + struct GNUNET_CORE_Handle *ch; + + ch = p1.ch; p1.ch = NULL; - GNUNET_CORE_disconnect (p2.ch); + GNUNET_CORE_disconnect (ch); + ch = p2.ch; p2.ch = NULL; + GNUNET_CORE_disconnect (ch); GNUNET_TRANSPORT_disconnect (p1.th); p1.th = NULL; GNUNET_TRANSPORT_disconnect (p2.th); @@ -134,8 +137,9 @@ terminate_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) static void terminate_task_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Testcase timout, exit!\n"); - GNUNET_break (0); + if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Testcase failed!\n"); + //GNUNET_break (0); if (measure_task != GNUNET_SCHEDULER_NO_TASK) GNUNET_SCHEDULER_cancel(measure_task); @@ -151,6 +155,37 @@ terminate_task_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) ok = 42; } + +/** + * Callback function to process statistic values. + * + * @param cls closure + * @param subsystem name of subsystem that created the statistic + * @param name the name of the datum + * @param value the current value + * @param is_persistent GNUNET_YES if the value is persistent, GNUNET_NO if not + * @return GNUNET_OK to continue, GNUNET_SYSERR to abort iteration + */ +static int +print_stat (void *cls, + const char *subsystem, + const char *name, + uint64_t value, + int is_persistent) +{ + if (cls==&p1) + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Peer1 %50s = %12llu\n", + name, + (unsigned long long) value); + if (cls==&p2) + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Peer2 %50s = %12llu\n", + name, + (unsigned long long) value); + return GNUNET_OK; +} + static void measurement_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { @@ -184,34 +219,87 @@ measurement_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) else quota_delta = max_quota_out / 10; - if ((throughput_out < (max_quota_out/1024)) && (throughput_out < (max_quota_in/1024))) - { - ok = 0; - } + if ((throughput_out > (max_quota_out+quota_delta)/1024) || (throughput_in > (max_quota_in+quota_delta)/1024)) + ok = 1; else + ok = 0; + + GNUNET_STATISTICS_get (p1.stats, + "core", + "# discarded CORE_SEND requests", + GNUNET_TIME_UNIT_FOREVER_REL, + NULL, + &print_stat, &p1); + + GNUNET_STATISTICS_get (p1.stats, + "core", + "# discarded CORE_SEND request bytes", + GNUNET_TIME_UNIT_FOREVER_REL, + NULL, + &print_stat, &p1); + GNUNET_STATISTICS_get (p1.stats, + "core", + "# discarded lower priority CORE_SEND requests", + GNUNET_TIME_UNIT_FOREVER_REL, + NULL, + &print_stat, NULL); + GNUNET_STATISTICS_get (p1.stats, + "core", + "# discarded lower priority CORE_SEND request bytes", + GNUNET_TIME_UNIT_FOREVER_REL, + NULL, + &print_stat, &p1); + GNUNET_STATISTICS_get (p2.stats, + "core", + "# discarded CORE_SEND requests", + GNUNET_TIME_UNIT_FOREVER_REL, + NULL, + &print_stat, &p2); + + GNUNET_STATISTICS_get (p2.stats, + "core", + "# discarded CORE_SEND request bytes", + GNUNET_TIME_UNIT_FOREVER_REL, + NULL, + &print_stat, &p2); + GNUNET_STATISTICS_get (p2.stats, + "core", + "# discarded lower priority CORE_SEND requests", + GNUNET_TIME_UNIT_FOREVER_REL, + NULL, + &print_stat, &p2); + GNUNET_STATISTICS_get (p2.stats, + "core", + "# discarded lower priority CORE_SEND request bytes", + GNUNET_TIME_UNIT_FOREVER_REL, + NULL, + &print_stat, &p2); + + enum GNUNET_ErrorType kind = GNUNET_ERROR_TYPE_DEBUG; + if (ok==1) { - ok = 1; + kind = GNUNET_ERROR_TYPE_ERROR; } switch (test) { case SYMMETRIC: - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Core quota compliance test with symmetric quotas\n"); + GNUNET_log (kind,"Core quota compliance test with symmetric quotas: %s\n", (ok==0)?"PASSED":"FAILED"); break; case ASYMMETRIC_SEND_LIMITED: - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Core quota compliance test with limited sender quota\n",throughput_in,total_bytes_recv, delta/1000); + GNUNET_log (kind,"Core quota compliance test with limited sender quota: %s\n", (ok==0)?"PASSED":"FAILED"); break; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Core quota compliance test with limited receiver quota\n",throughput_in,total_bytes_recv, delta/1000); case ASYMMETRIC_RECV_LIMITED: + GNUNET_log (kind,"Core quota compliance test with limited receiver quota: %s\n", (ok==0)?"PASSED":"FAILED"); break; }; - - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Peer 1 send rate: %llu kB/s (%llu Bytes in %u sec.)\n",throughput_out,total_bytes_sent, delta/1000); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Peer 2 receive rate: %llu kB/s (%llu Bytes in %u sec.)\n",throughput_in,total_bytes_recv, delta/1000); - - + GNUNET_log (kind,"Peer 1 send rate: %llu kB/s (%llu Bytes in %u sec.)\n",throughput_out,total_bytes_sent, delta/1000); + GNUNET_log (kind,"Peer 1 send quota: %llu kB/s\n",current_quota_p1_out / 1024); + GNUNET_log (kind,"Peer 2 receive rate: %llu kB/s (%llu Bytes in %u sec.)\n",throughput_in,total_bytes_recv, delta/1000); + GNUNET_log (kind,"Peer 2 receive quota: %llu kB/s\n",current_quota_p2_in / 1024); +/* GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Max. inbound quota allowed: %llu kB/s\n",max_quota_in /1024); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Max. outbound quota allowed: %llu kB/s\n",max_quota_out/1024); - +*/ GNUNET_SCHEDULER_cancel (err_task); GNUNET_SCHEDULER_add_now (&terminate_task, NULL); @@ -227,19 +315,20 @@ transmit_ready (void *cls, size_t size, void *buf) GNUNET_assert (size <= GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE); if (buf == NULL) { - if (p1.ch != NULL) + if ( (p1.ch != NULL) && + (p1.connect_status == 1) ) GNUNET_break (NULL != GNUNET_CORE_notify_transmit_ready (p1.ch, 0, FAST_TIMEOUT, &p2.id, - MSIZE, + MESSAGESIZE, &transmit_ready, &p1)); return 0; } GNUNET_assert (tr_n < TOTAL_MSGS); ret = 0; - GNUNET_assert (size >= MSIZE); + GNUNET_assert (size >= MESSAGESIZE); GNUNET_assert (buf != NULL); cbuf = buf; do @@ -248,21 +337,21 @@ transmit_ready (void *cls, size_t size, void *buf) GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending message %u of size %u at offset %u\n", tr_n, - MSIZE, + MESSAGESIZE, ret); #endif - hdr.header.size = htons (MSIZE); + hdr.header.size = htons (MESSAGESIZE); hdr.header.type = htons (MTYPE); hdr.num = htonl (tr_n); memcpy (&cbuf[ret], &hdr, sizeof (struct TestMessage)); ret += sizeof (struct TestMessage); - memset (&cbuf[ret], tr_n, MSIZE - sizeof (struct TestMessage)); - ret += MSIZE - sizeof (struct TestMessage); + memset (&cbuf[ret], tr_n, MESSAGESIZE - sizeof (struct TestMessage)); + ret += MESSAGESIZE - sizeof (struct TestMessage); tr_n++; if (0 == GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 16)) break; /* sometimes pack buffer full, sometimes not */ } - while (size - ret >= MSIZE); + while (size - ret >= MESSAGESIZE); GNUNET_SCHEDULER_cancel (err_task); err_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &terminate_task_error, @@ -281,6 +370,10 @@ connect_notify (void *cls, { struct PeerContext *pc = cls; + if (0 == memcmp (&pc->id, + peer, + sizeof (struct GNUNET_PeerIdentity))) + return; GNUNET_assert (pc->connect_status == 0); pc->connect_status = 1; if (pc == &p1) @@ -293,6 +386,7 @@ connect_notify (void *cls, "Asking core (1) for transmission to peer `%4s'\n", GNUNET_i2s (&p2.id)); #endif + if (err_task != GNUNET_SCHEDULER_NO_TASK) GNUNET_SCHEDULER_cancel (err_task); err_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &terminate_task_error, NULL); @@ -304,7 +398,7 @@ connect_notify (void *cls, 0, TIMEOUT, &p2.id, - MSIZE, + MESSAGESIZE, &transmit_ready, &p1)); } } @@ -315,6 +409,11 @@ disconnect_notify (void *cls, const struct GNUNET_PeerIdentity *peer) { struct PeerContext *pc = cls; + + if (0 == memcmp (&pc->id, + peer, + sizeof (struct GNUNET_PeerIdentity))) + return; pc->connect_status = 0; #if DEBUG_TRANSMISSION GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, @@ -368,11 +467,11 @@ process_mtype (void *cls, hdr = (const struct TestMessage*) message; if (MTYPE != ntohs (message->type)) return GNUNET_SYSERR; - if (ntohs (message->size) != MSIZE) + if (ntohs (message->size) != MESSAGESIZE) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Expected message %u of size %u, got %u bytes of message %u\n", - n, MSIZE, + n, MESSAGESIZE, ntohs (message->size), ntohl (hdr->num)); GNUNET_SCHEDULER_cancel (err_task); @@ -383,7 +482,7 @@ process_mtype (void *cls, { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Expected message %u of size %u, got %u bytes of message %u\n", - n, MSIZE, + n, MESSAGESIZE, ntohs (message->size), ntohl (hdr->num)); GNUNET_SCHEDULER_cancel (err_task); @@ -399,22 +498,16 @@ process_mtype (void *cls, n++; if (0 == (n % 10)) fprintf (stderr, "."); - if (n == TOTAL_MSGS) - { - GNUNET_SCHEDULER_cancel (err_task); - GNUNET_SCHEDULER_add_now (&terminate_task, NULL); - } - else - { - if (running == GNUNET_YES) + + + if (running == GNUNET_YES) GNUNET_break (NULL != GNUNET_CORE_notify_transmit_ready (p1.ch, 0, FAST_TIMEOUT, &p2.id, - MSIZE, + MESSAGESIZE, &transmit_ready, &p1)); - } return GNUNET_OK; } @@ -515,6 +608,8 @@ setup_peer (struct PeerContext *p, const char *cfgname) "-c", cfgname, NULL); #endif GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); + p->stats = GNUNET_STATISTICS_create ("core",p->cfg); + GNUNET_assert (p->stats!=NULL); p->th = GNUNET_TRANSPORT_connect (p->cfg, NULL, p, NULL, NULL, NULL); GNUNET_assert (p->th != NULL); GNUNET_TRANSPORT_get_hello (p->th, &process_hello, p); @@ -529,6 +624,9 @@ run (void *cls, { GNUNET_assert (ok == 1); OKPP; + err_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, + &terminate_task_error, + NULL); if (test == SYMMETRIC) { setup_peer (&p1, "test_core_quota_peer1.conf"); @@ -536,8 +634,8 @@ run (void *cls, } else if (test == ASYMMETRIC_SEND_LIMITED) { - setup_peer (&p1, "test_core_quota_asymmetric_send_limited_peer1.conf"); - setup_peer (&p2, "test_core_quota_asymmetric_send_limited_peer2.conf"); + setup_peer (&p1, "test_core_quota_asymmetric_send_limit_peer1.conf"); + setup_peer (&p2, "test_core_quota_asymmetric_send_limit_peer2.conf"); } else if (test == ASYMMETRIC_RECV_LIMITED) { @@ -633,6 +731,22 @@ main (int argc, char *argv[]) test = ASYMMETRIC_RECV_LIMITED; } GNUNET_assert (test != -1); + if (test == SYMMETRIC) + { + GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-sym-peer-1/"); + GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-sym-peer-2/"); + } + else if (test == ASYMMETRIC_SEND_LIMITED) + { + GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-send-lim-peer-1/"); + GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-send-lim-peer-2/"); + } + else if (test == ASYMMETRIC_RECV_LIMITED) + { + GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-recv-lim-peer-1/"); + GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-recv-lim-peer-2/"); + } + GNUNET_log_setup ("test-core-quota-compliance", #if VERBOSE "DEBUG", @@ -640,11 +754,24 @@ main (int argc, char *argv[]) "WARNING", #endif NULL); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "argv[0] %s",argv[0]); ret = check (); - GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-1"); - GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-2"); + if (test == SYMMETRIC) + { + GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-sym-peer-1/"); + GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-sym-peer-2/"); + } + else if (test == ASYMMETRIC_SEND_LIMITED) + { + GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-send-lim-peer-1/"); + GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-send-lim-peer-2/"); + } + else if (test == ASYMMETRIC_RECV_LIMITED) + { + GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-recv-lim-peer-1/"); + GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-recv-lim-peer-2/"); + } + + return ret; }