X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fats%2Ftest_ats_api_scheduling_add_address.c;h=21bf14102b998983229baf3c6ab4366c8f216372;hb=46a1afa089ec0cd8086f37afdb4ef5afe21b6330;hp=771ebd8cf4826c2470387293aae0541a08a0bc69;hpb=d9a76929fee0ba3d159b754a5d04afbb4a712a9c;p=oweals%2Fgnunet.git diff --git a/src/ats/test_ats_api_scheduling_add_address.c b/src/ats/test_ats_api_scheduling_add_address.c index 771ebd8cf..21bf14102 100644 --- a/src/ats/test_ats_api_scheduling_add_address.c +++ b/src/ats/test_ats_api_scheduling_add_address.c @@ -19,18 +19,20 @@ */ /** * @file ats/test_ats_api_scheduling_add_address.c - * @brief test adding addresses in automatic transport selection scheduling API + * @brief adding addresses with scheduling API * @author Christian Grothoff * @author Matthias Wachs */ #include "platform.h" #include "gnunet_ats_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "ats.h" #include "test_ats_api_common.h" static GNUNET_SCHEDULER_TaskIdentifier die_task; +struct GNUNET_STATISTICS_Handle *stats; + /** * Scheduling handle */ @@ -72,128 +74,59 @@ struct GNUNET_ATS_Information test_ats_info[2]; uint32_t test_ats_count; -static void -create_test_address (struct Test_Address *dest, char * plugin, void *session, void *addr, size_t addrlen) -{ - dest->plugin = GNUNET_strdup (plugin); - dest->session = session; - dest->addr = GNUNET_malloc (addrlen); - memcpy (dest->addr, addr, addrlen); - dest->addr_len = addrlen; -} - -static void -free_test_address (struct Test_Address *dest) -{ - GNUNET_free (dest->plugin); - GNUNET_free (dest->addr); -} - +static void end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc); -static void -end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +static int +stat_cb(void *cls, const char *subsystem, + const char *name, uint64_t value, + int is_persistent) { - die_task = GNUNET_SCHEDULER_NO_TASK; - if (sched_ats != NULL) - GNUNET_ATS_scheduling_done (sched_ats); - free_test_address (&test_addr); - ret = GNUNET_SYSERR; + GNUNET_log (GNUNET_ERROR_TYPE_INFO, "ATS statistics: `%s' `%s' %llu\n", + subsystem,name, value); + if (1 == value) + { + GNUNET_SCHEDULER_add_now (&end, NULL); + } + return GNUNET_OK; } static void -end () +end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutting down\n"); + if (die_task != GNUNET_SCHEDULER_NO_TASK) { GNUNET_SCHEDULER_cancel (die_task); die_task = GNUNET_SCHEDULER_NO_TASK; } - GNUNET_ATS_scheduling_done (sched_ats); - sched_ats = NULL; - free_test_address (&test_addr); -} -static int -compare_addresses (const struct GNUNET_HELLO_Address *address1, void *session1, - const struct GNUNET_HELLO_Address *address2, void *session2) -{ - if (0 != memcmp (&address1->peer, &address2->peer, sizeof (struct GNUNET_PeerIdentity))) + if (NULL != sched_ats) { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid peer id'\n"); - return GNUNET_SYSERR; - } - if (0 != strcmp (address1->transport_name, address2->transport_name)) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid plugin'\n"); - return GNUNET_SYSERR; + GNUNET_ATS_scheduling_done (sched_ats); + sched_ats = NULL; } - if (address1->address_length != address2->address_length) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid address length'\n"); - return GNUNET_SYSERR; - } - else if (0 != memcmp (address1->address, address2->address, address2->address_length)) + GNUNET_STATISTICS_watch_cancel (stats, "ats", "# addresses", &stat_cb, NULL); + if (NULL != stats) { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid address'\n"); - return GNUNET_SYSERR; + GNUNET_STATISTICS_destroy (stats, GNUNET_NO); + stats = NULL; } - if (session1 != session2) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid session1 %p vs session2 %p'\n", - session1, session2); - return GNUNET_SYSERR; - } - return GNUNET_OK; -} + free_test_address (&test_addr); + ret = 0; +} -static int -compare_ats (const struct GNUNET_ATS_Information *ats_is, uint32_t ats_count_is, - const struct GNUNET_ATS_Information *ats_should, uint32_t ats_count_should) +static void +end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - unsigned int c_o; - unsigned int c_i; - char *prop[] = GNUNET_ATS_PropertyStrings; - uint32_t type1; - uint32_t type2; - uint32_t val1; - uint32_t val2; - int res = GNUNET_OK; - - for (c_o = 0; c_o < ats_count_is; c_o++) - { - for (c_i = 0; c_i < ats_count_should; c_i++) - { - type1 = ntohl(ats_is[c_o].type); - type2 = ntohl(ats_should[c_i].type); - if (type1 == type2) - { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS type `%s'\n", - prop[type1]); - val1 = ntohl(ats_is[c_o].value); - val2 = ntohl(ats_should[c_i].value); - if (val1 != val2) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "ATS value `%s' not equal: %u != %u\n", - prop[type1], - val1, val2); - res = GNUNET_SYSERR; - } - else - { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS value `%s' equal: %u == %u\n", - prop[type1], - val1, val2); - } - } - } - } - return res; + die_task = GNUNET_SCHEDULER_NO_TASK; + end ( NULL, NULL); + ret = GNUNET_SYSERR; } static void @@ -204,36 +137,19 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address, const struct GNUNET_ATS_Information *atsi, uint32_t ats_count) { - if (GNUNET_OK == compare_addresses (address, session, &test_hello_address, test_session)) - { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage 0: Callback with correct address `%s'\n", - GNUNET_i2s (&address->peer)); - ret = 0; - } - else - { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage 0: Callback with invalid address `%s'\n", - GNUNET_i2s (&address->peer)); - ret = 1; - } - - if (GNUNET_OK != compare_ats(atsi, ats_count, test_ats_info, test_ats_count)) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage 0: Callback with incorrect ats info \n"); - ret = 1; - } - GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id); - GNUNET_SCHEDULER_add_now (&end, NULL); } + static void run (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg, struct GNUNET_TESTING_Peer *peer) { - die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL); + stats = GNUNET_STATISTICS_create ("ats", cfg); + GNUNET_STATISTICS_watch (stats, "ats", "# addresses", &stat_cb, NULL); + /* Connect to ATS scheduling */ sched_ats = GNUNET_ATS_scheduling_init (cfg, &address_suggest_cb, NULL); @@ -241,7 +157,7 @@ run (void *cls, { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not connect to ATS scheduling!\n"); ret = 1; - end (); + GNUNET_SCHEDULER_add_now (&end, NULL); return; } @@ -250,10 +166,9 @@ run (void *cls, { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not setup peer!\n"); ret = GNUNET_SYSERR; - end (); + GNUNET_SCHEDULER_add_now (&end, NULL); return; } - GNUNET_assert (0 == strcmp (PEERID0, GNUNET_i2s_full (&p.id))); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created peer `%s'\n", @@ -267,21 +182,22 @@ run (void *cls, test_ats_count = 2; /* Adding address without session */ - test_session = &test_addr; + test_session = NULL; create_test_address (&test_addr, "test", test_session, "test", strlen ("test") + 1); test_hello_address.peer = p.id; test_hello_address.transport_name = test_addr.plugin; test_hello_address.address = test_addr.addr; test_hello_address.address_length = test_addr.addr_len; - GNUNET_ATS_address_add (sched_ats, &test_hello_address, test_session, test_ats_info, test_ats_count); - GNUNET_ATS_suggest_address (sched_ats, &p.id); + /* Adding address */ + GNUNET_ATS_address_add (sched_ats, &test_hello_address, test_session, test_ats_info, test_ats_count); } int main (int argc, char *argv[]) { + ret = 0; if (0 != GNUNET_TESTING_peer_run ("test_ats_api_scheduling_add_address", "test_ats_api.conf", &run, NULL))