[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r25298 - gnunet/src/ats
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r25298 - gnunet/src/ats |
|
Date: |
Thu, 6 Dec 2012 16:16:49 +0100 |
Author: wachs
Date: 2012-12-06 16:16:49 +0100 (Thu, 06 Dec 2012)
New Revision: 25298
Added:
gnunet/src/ats/test_ats_api_scheduling_block_and_reset.c
Removed:
gnunet/src/ats/test_ats_api_reset_backoff.c
Modified:
gnunet/src/ats/Makefile.am
Log:
tests
Modified: gnunet/src/ats/Makefile.am
===================================================================
--- gnunet/src/ats/Makefile.am 2012-12-06 14:00:56 UTC (rev 25297)
+++ gnunet/src/ats/Makefile.am 2012-12-06 15:16:49 UTC (rev 25298)
@@ -62,9 +62,9 @@
test_ats_api_scheduling_add_address \
test_ats_api_scheduling_update_address \
test_ats_api_scheduling_destroy_address \
- test_ats_api_scheduling_destroy_session
-# test_ats_api_scheduling \
-# test_ats_api_reset_backoff \
+ test_ats_api_scheduling_destroy_session \
+ test_ats_api_scheduling_block_and_reset
+# test_ats_api_scheduling \
# test_ats_api_performance \
# $(GN_MLP_TEST) \
# $(GN_MLP_TEST_AVG) \
@@ -110,6 +110,13 @@
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/testing/libgnunettesting.la \
$(top_builddir)/src/ats/libgnunetats.la
+
+test_ats_api_scheduling_block_and_reset_SOURCES = \
+ test_ats_api_scheduling_block_and_reset.c
+test_ats_api_scheduling_block_and_reset_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/ats/libgnunetats.la
if HAVE_LIBGLPK
#test_ats_mlp_SOURCES = \
@@ -145,13 +152,6 @@
# $(top_builddir)/src/testing/libgnunettesting.la \
# $(top_builddir)/src/ats/libgnunetats.la
-#test_ats_api_reset_backoff_SOURCES = \
-# test_ats_api_reset_backoff.c
-#test_ats_api_reset_backoff_LDADD = \
-# $(top_builddir)/src/util/libgnunetutil.la \
-# $(top_builddir)/src/testing/libgnunettesting.la \
-# $(top_builddir)/src/ats/libgnunetats.la
-
#test_ats_api_scheduling_destroy_address_SOURCES = \
# test_ats_api_scheduling_destroy_address.c
#test_ats_api_scheduling_destroy_address_LDADD = \
@@ -160,7 +160,6 @@
# $(top_builddir)/src/ats/libgnunetats.la
-
#test_ats_api_scheduling_get_type_SOURCES = \
# test_ats_api_scheduling_get_type.c
#test_ats_api_scheduling_get_type_LDADD = \
Deleted: gnunet/src/ats/test_ats_api_reset_backoff.c
===================================================================
--- gnunet/src/ats/test_ats_api_reset_backoff.c 2012-12-06 14:00:56 UTC (rev
25297)
+++ gnunet/src/ats/test_ats_api_reset_backoff.c 2012-12-06 15:16:49 UTC (rev
25298)
@@ -1,269 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2010,2011 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- 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.
-*/
-/**
- * @file ats/test_ats_api_reset_backoff.c
- * @brief test case for block reset api
- * @author Christian Grothoff
- * @author Matthias Wachs
- */
-#include "platform.h"
-#include "gnunet_ats_service.h"
-#include "gnunet_testing_lib-new.h"
-#include "ats.h"
-
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
-#define ATS_TIMEOUT GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_MILLISECONDS, 90)
-
-static GNUNET_SCHEDULER_TaskIdentifier die_task;
-
-static GNUNET_SCHEDULER_TaskIdentifier suggest_timeout_task;
-
-static struct GNUNET_ATS_SchedulingHandle *ats;
-
-static int ret;
-
-
-struct Address
-{
- char *plugin;
- size_t plugin_len;
-
- void *addr;
- size_t addr_len;
-
- struct GNUNET_ATS_Information *ats;
- int ats_count;
-
- void *session;
-};
-
-struct PeerContext
-{
- struct GNUNET_PeerIdentity id;
-
- struct Address *addr;
-};
-
-struct GNUNET_HELLO_Address hello_addr;
-
-struct Address address;
-
-struct PeerContext peer;
-
-struct GNUNET_ATS_Information atsi[2];
-
-
-static void
-end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- die_task = GNUNET_SCHEDULER_NO_TASK;
- if (suggest_timeout_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (suggest_timeout_task);
- suggest_timeout_task = GNUNET_SCHEDULER_NO_TASK;
- }
- if (ats != NULL)
- {
- GNUNET_ATS_scheduling_done (ats);
- ats = NULL;
- }
- ret = GNUNET_SYSERR;
-}
-
-
-static void
-end ()
-{
- 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;
- }
-
- if (suggest_timeout_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (suggest_timeout_task);
- suggest_timeout_task = GNUNET_SCHEDULER_NO_TASK;
- }
- GNUNET_ATS_scheduling_done (ats);
- ret = 0;
-}
-
-
-static void
-suggest_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- suggest_timeout_task = GNUNET_SCHEDULER_NO_TASK;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Requesting address for peer timed
out\n");
- if (die_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (die_task);
- die_task = GNUNET_SCHEDULER_NO_TASK;
- }
- die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
-}
-
-
-static void
-address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *a,
- struct Session *session,
- struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
- struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
- const struct GNUNET_ATS_Information *atsi,
- uint32_t ats_count)
-{
- static int suggestions;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS suggests address `%s'\n",
- GNUNET_i2s (&a->peer));
-
- if (0 != memcmp (&a->peer, &peer.id,
- sizeof (struct GNUNET_PeerIdentity)))
- {
- GNUNET_break (0);
- if (die_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (die_task);
- die_task = GNUNET_SCHEDULER_NO_TASK;
- }
- GNUNET_SCHEDULER_add_now (&end_badly, NULL);
- return;
- }
-
- if (0 != strcmp (a->transport_name, address.plugin))
- {
- GNUNET_break (0);
- if (die_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (die_task);
- die_task = GNUNET_SCHEDULER_NO_TASK;
- }
- GNUNET_SCHEDULER_add_now (&end_badly, NULL);
- return;
- }
-
- if (a->address_length != address.addr_len)
- {
- GNUNET_break (0);
- if (die_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (die_task);
- die_task = GNUNET_SCHEDULER_NO_TASK;
- }
- GNUNET_SCHEDULER_add_now (&end_badly, NULL);
- return;
- }
-
- if (0 != memcmp (a->address, address.addr,
- a->address_length))
- {
- GNUNET_break (0);
- if (die_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (die_task);
- die_task = GNUNET_SCHEDULER_NO_TASK;
- }
- GNUNET_SCHEDULER_add_now (&end_badly, NULL);
- return;
- }
-
- if (session != address.session)
- {
- GNUNET_break (0);
- if (die_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (die_task);
- die_task = GNUNET_SCHEDULER_NO_TASK;
- }
- GNUNET_SCHEDULER_add_now (&end_badly, NULL);
- return;
- }
-
- suggestions ++;
-
- if (2 == suggestions)
- {
- GNUNET_SCHEDULER_add_now(&end, NULL);
- return;
- }
-
- if (suggest_timeout_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (suggest_timeout_task);
- suggest_timeout_task = GNUNET_SCHEDULER_NO_TASK;
- }
- suggest_timeout_task = GNUNET_SCHEDULER_add_delayed(ATS_TIMEOUT,
&suggest_timeout, NULL);
-}
-
-
-static void
-run (void *cls,
- const struct GNUNET_CONFIGURATION_Handle *cfg,
- struct GNUNET_TESTING_Peer *peerx)
-{
- ret = GNUNET_SYSERR;
- die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
- ats = GNUNET_ATS_scheduling_init (cfg, &address_suggest_cb, NULL);
- if (ats == NULL)
- {
- ret = GNUNET_SYSERR;
- end ();
- return;
- }
-
- /* set up peer */
- GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK,
- &peer.id.hashPubKey);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created peer `%s'\n", GNUNET_i2s
(&peer.id));
-
- address.plugin = "test";
- address.session = NULL;
- address.addr = GNUNET_strdup ("test");
- address.addr_len = 4;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Adding address\n");
-
- hello_addr.peer = peer.id;
- hello_addr.transport_name = address.plugin;
- hello_addr.address = address.addr;
- hello_addr.address_length = address.addr_len;
- GNUNET_ATS_address_add (ats, &hello_addr, address.session, NULL, 0);
- GNUNET_ATS_address_update (ats, &hello_addr, address.session, NULL, 0);
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Requesting address for peer `%s'\n",
- GNUNET_i2s (&peer.id));
- /* Increase block timout far beyond ATS_TIMEOUT */
- GNUNET_ATS_suggest_address (ats, &peer.id);
- GNUNET_ATS_reset_backoff(ats, &peer.id);
- GNUNET_ATS_suggest_address (ats, &peer.id);
-}
-
-
-int
-main (int argc, char *argv[])
-{
- if (0 != GNUNET_TESTING_peer_run ("test_ats_api_reset_backoff",
- "test_ats_api.conf",
- &run, NULL))
- return 1;
- return ret;
-}
-/* end of file test_ats_api_reset_backoff.c */
Copied: gnunet/src/ats/test_ats_api_scheduling_block_and_reset.c (from rev
25288, gnunet/src/ats/test_ats_api_reset_backoff.c)
===================================================================
--- gnunet/src/ats/test_ats_api_scheduling_block_and_reset.c
(rev 0)
+++ gnunet/src/ats/test_ats_api_scheduling_block_and_reset.c 2012-12-06
15:16:49 UTC (rev 25298)
@@ -0,0 +1,430 @@
+/*
+ This file is part of GNUnet.
+ (C) 2010,2011 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ 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.
+*/
+/**
+ * @file ats/test_ats_api_scheduling_reset_backoff.c
+ * @brief test case for blocking suggests and blocking reset API
+ * measure duration of initial suggest, measure blocking duration,
+ * reset block, measure suggest, compare time
+ * @author Christian Grothoff
+ * @author Matthias Wachs
+ */
+#include "platform.h"
+#include "gnunet_ats_service.h"
+#include "gnunet_testing_lib-new.h"
+#include "ats.h"
+#include "test_ats_api_common.h"
+
+#define WAIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 10)
+
+static GNUNET_SCHEDULER_TaskIdentifier die_task;
+
+static GNUNET_SCHEDULER_TaskIdentifier wait_task;
+
+/**
+ * Scheduling handle
+ */
+static struct GNUNET_ATS_SchedulingHandle *sched_ats;
+
+/**
+ * Return value
+ */
+static int ret;
+
+/**
+ * Test address
+ */
+static struct Test_Address test_addr;
+
+/**
+ * Test peer
+ */
+static struct PeerContext p;
+
+/**
+ * HELLO address
+ */
+struct GNUNET_HELLO_Address test_hello_address;
+
+/**
+ * Session
+ */
+static void *test_session;
+
+/**
+ * Test ats info
+ */
+struct GNUNET_ATS_Information test_ats_info[2];
+
+/**
+ * Test ats count
+ */
+uint32_t test_ats_count;
+
+
+struct GNUNET_TIME_Absolute initial_start;
+
+struct GNUNET_TIME_Relative initial_duration;
+
+/**
+ * Blocking start
+ */
+struct GNUNET_TIME_Absolute block_start;
+
+struct GNUNET_TIME_Relative block_duration;
+
+struct GNUNET_TIME_Absolute reset_block_start;
+
+struct GNUNET_TIME_Relative reset_block_duration;
+
+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_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ die_task = GNUNET_SCHEDULER_NO_TASK;
+ if (wait_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (wait_task);
+ wait_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ if (sched_ats != NULL)
+ GNUNET_ATS_scheduling_done (sched_ats);
+ free_test_address (&test_addr);
+ ret = GNUNET_SYSERR;
+}
+
+
+static void
+end ()
+{
+ 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;
+ }
+ if (wait_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (wait_task);
+ wait_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)))
+ {
+ 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;
+ }
+ 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_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid
address'\n");
+ return GNUNET_SYSERR;
+ }
+ 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;
+}
+
+
+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)
+{
+ 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;
+}
+
+static void
+request_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ wait_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_ATS_suggest_address (sched_ats, &p.id);
+ wait_task = GNUNET_SCHEDULER_add_delayed (WAIT, &request_task, NULL);
+}
+
+static void
+address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
+ struct Session *session,
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
+ const struct GNUNET_ATS_Information *atsi,
+ uint32_t ats_count)
+{
+ static int stage = 0;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stage %u\n", stage);
+ if (2 == stage)
+ {
+ /* Suggestion after resetting block interval */
+ reset_block_duration =
GNUNET_TIME_absolute_get_difference(reset_block_start,
GNUNET_TIME_absolute_get());
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Address suggestion after resetting
blocking took about %llu ms!\n",
+ (long long unsigned int) reset_block_duration.rel_value);
+ if ((block_duration.rel_value <= (initial_duration.rel_value * 3)) ||
+ (initial_duration.rel_value <= (block_duration.rel_value * 3)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Address suggestion after resetting blocking (%llu ms)
took about the same as initial suggestion (%llu ms)\n",
+ (long long unsigned int) reset_block_duration.rel_value,
+ (long long unsigned int) initial_duration.rel_value);
+ ret = 0;
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Address suggestion after
resetting blocking (%llu ms) has too big difference to initial suggestion (%llu
ms)\n",
+ (long long unsigned int) reset_block_duration.rel_value,
+ (long long unsigned int) initial_duration.rel_value);
+ ret = 1;
+ GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id);
+ GNUNET_SCHEDULER_add_now (&end, NULL);
+ return;
+ }
+
+ if (((initial_duration.rel_value * 3) <= block_duration.rel_value ) &&
+ ((reset_block_duration.rel_value * 3) <= block_duration.rel_value))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Address suggestion after
resetting blocking (%llu ms) and initial suggestion (%llu ms) much faster than
with blocking (%llu ms)\n",
+ (long long unsigned int) reset_block_duration.rel_value,
+ (long long unsigned int) initial_duration.rel_value,
+ (long long unsigned int) block_duration.rel_value);
+ ret = 0;
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Address suggestion after
resetting blocking (%llu ms) and initial suggestion (%llu ms) not faster than
with blocking (%llu ms)\n",
+ (long long unsigned int) reset_block_duration.rel_value,
+ (long long unsigned int) initial_duration.rel_value,
+ (long long unsigned int) block_duration.rel_value);
+ ret = 1;
+ }
+
+
+ GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id);
+ GNUNET_SCHEDULER_add_now (&end, NULL);
+
+ }
+ if (1 == stage)
+ {
+ /* Suggestion after block*/
+ block_duration = GNUNET_TIME_absolute_get_difference(block_start,
GNUNET_TIME_absolute_get());
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Address suggestion was blocked for
about %llu ms!\n",
+ (long long unsigned int) block_duration.rel_value);
+
+ 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));
+ GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id);
+ GNUNET_SCHEDULER_add_now (&end, NULL);
+ 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");
+ GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id);
+ GNUNET_SCHEDULER_add_now (&end, NULL);
+ ret = 1;
+ }
+ stage ++;
+
+ /* Reset block interval */
+ GNUNET_ATS_reset_backoff (sched_ats, &address->peer);
+ reset_block_start = GNUNET_TIME_absolute_get();
+ GNUNET_ATS_suggest_address (sched_ats, &p.id);
+ }
+ if (0 == stage)
+ {
+ /* Initial suggestion */
+ 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));
+ GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id);
+ GNUNET_SCHEDULER_add_now (&end, NULL);
+ 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");
+ GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id);
+ GNUNET_SCHEDULER_add_now (&end, NULL);
+ ret = 1;
+ }
+ stage ++;
+ initial_duration = GNUNET_TIME_absolute_get_difference(initial_start,
GNUNET_TIME_absolute_get());
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Initial suggestion took about %llu
ms\n",
+ (long long unsigned int) block_duration.rel_value);
+
+ block_start = GNUNET_TIME_absolute_get();
+ wait_task = GNUNET_SCHEDULER_add_delayed (WAIT, &request_task, 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);
+
+ /* Connect to ATS scheduling */
+ sched_ats = GNUNET_ATS_scheduling_init (cfg, &address_suggest_cb, NULL);
+ if (sched_ats == NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not connect to ATS
scheduling!\n");
+ ret = 1;
+ end ();
+ return;
+ }
+
+ /* Set up peer */
+ if (GNUNET_SYSERR == GNUNET_CRYPTO_hash_from_string(PEERID,
&p.id.hashPubKey))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not setup peer!\n");
+ ret = GNUNET_SYSERR;
+ end ();
+ return;
+ }
+ GNUNET_assert (0 == strcmp (PEERID, GNUNET_i2s_full (&p.id)));
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created peer `%s'\n",
+ GNUNET_i2s_full(&p.id));
+
+ /* Prepare ATS Information */
+ test_ats_info[0].type = htonl (GNUNET_ATS_NETWORK_TYPE);
+ test_ats_info[0].value = htonl(GNUNET_ATS_NET_WAN);
+ test_ats_info[1].type = htonl (GNUNET_ATS_QUALITY_NET_DISTANCE);
+ test_ats_info[1].value = htonl(1);
+ test_ats_count = 2;
+
+ /* Adding address without session */
+ test_session = &test_addr;
+ 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);
+
+ initial_start = GNUNET_TIME_absolute_get();
+ GNUNET_ATS_suggest_address (sched_ats, &p.id);
+}
+
+
+int
+main (int argc, char *argv[])
+{
+ if (0 != GNUNET_TESTING_peer_run ("test_ats_api_scheduling_add_address",
+ "test_ats_api.conf",
+ &run, NULL))
+ return 1;
+ return ret;
+}
+/* end of file test_ats_api_scheduling_reset_backoff.c */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r25298 - gnunet/src/ats,
gnunet <=