[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r29551 - gnunet/src/ats
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r29551 - gnunet/src/ats |
|
Date: |
Wed, 25 Sep 2013 16:37:14 +0200 |
Author: wachs
Date: 2013-09-25 16:37:14 +0200 (Wed, 25 Sep 2013)
New Revision: 29551
Added:
gnunet/src/ats/test_ats_api_scheduling_add_address_inbound.c
Modified:
gnunet/src/ats/Makefile.am
gnunet/src/ats/test_ats_api_scheduling_add_session.c
gnunet/src/ats/test_ats_api_scheduling_destroy_session.c
Log:
additional tests
Modified: gnunet/src/ats/Makefile.am
===================================================================
--- gnunet/src/ats/Makefile.am 2013-09-25 14:19:38 UTC (rev 29550)
+++ gnunet/src/ats/Makefile.am 2013-09-25 14:37:14 UTC (rev 29551)
@@ -66,9 +66,11 @@
test_ats_api_scheduling_init \
test_ats_api_scheduling_add_address \
test_ats_api_scheduling_add_address_duplicate \
+ test_ats_api_scheduling_add_address_inbound \
test_ats_api_scheduling_destroy_address \
- test_ats_api_scheduling_destroy_address_twice \
- test_ats_api_scheduling_add_session
+ test_ats_api_scheduling_destroy_address_twice \
+ test_ats_api_scheduling_add_session \
+ test_ats_api_scheduling_destroy_session
# test_ats_api_scheduling_min_bw
# test_ats_api_scheduling_check_min_bw_alt
# test_ats_api_scheduling_update_address
@@ -113,6 +115,15 @@
$(top_builddir)/src/ats/libgnunetats.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la
+test_ats_api_scheduling_add_address_inbound_SOURCES = \
+ test_ats_api_scheduling_add_address_inbound.c \
+ test_ats_api_common.c test_ats_api_common.h
+test_ats_api_scheduling_add_address_inbound_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la
+
test_ats_api_scheduling_add_address_duplicate_SOURCES = \
test_ats_api_scheduling_add_address_duplicate.c \
test_ats_api_common.c test_ats_api_common.h
@@ -148,11 +159,14 @@
$(top_builddir)/src/ats/libgnunetats.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la
+test_ats_api_scheduling_destroy_session_SOURCES = \
+ test_ats_api_scheduling_destroy_session.c test_ats_api_common.c
+test_ats_api_scheduling_destroy_session_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la
-
-
-
-
#if 0
test_ats_api_scheduling_min_bw_SOURCES = \
@@ -176,14 +190,7 @@
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/testing/libgnunettesting.la \
$(top_builddir)/src/ats/libgnunetats.la
-
-test_ats_api_scheduling_destroy_session_SOURCES = \
- test_ats_api_scheduling_destroy_session.c test_ats_api_common.c
-test_ats_api_scheduling_destroy_session_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/ats/libgnunetats.la
-
+
test_ats_api_scheduling_destroy_inbound_connection_SOURCES = \
test_ats_api_scheduling_destroy_inbound_connection.c test_ats_api_common.c
test_ats_api_scheduling_destroy_inbound_connection_LDADD = \
Added: gnunet/src/ats/test_ats_api_scheduling_add_address_inbound.c
===================================================================
--- gnunet/src/ats/test_ats_api_scheduling_add_address_inbound.c
(rev 0)
+++ gnunet/src/ats/test_ats_api_scheduling_add_address_inbound.c
2013-09-25 14:37:14 UTC (rev 29551)
@@ -0,0 +1,221 @@
+/*
+ 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_add_address.c
+ * @brief adding addresses with scheduling API
+ * @author Christian Grothoff
+ * @author Matthias Wachs
+ */
+#include "platform.h"
+#include "gnunet_ats_service.h"
+#include "gnunet_testing_lib.h"
+#include "ats.h"
+#include "test_ats_api_common.h"
+
+/**
+ * Timeout task
+ */
+static GNUNET_SCHEDULER_TaskIdentifier die_task;
+
+/**
+ * Statistics handle
+ */
+struct GNUNET_STATISTICS_Handle *stats;
+
+/**
+ * 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;
+
+
+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)
+{
+
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "ATS statistics: `%s' `%s' %llu\n",
+ subsystem,name, value);
+ if (1 == value)
+ {
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &end, NULL);
+ }
+ if (1 < value)
+ {
+ GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+ }
+
+ return GNUNET_OK;
+}
+
+
+static void
+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;
+ }
+
+ if (NULL != sched_ats)
+ {
+ GNUNET_ATS_scheduling_done (sched_ats);
+ sched_ats = NULL;
+ }
+
+ GNUNET_STATISTICS_watch_cancel (stats, "ats", "# addresses", &stat_cb, NULL);
+ if (NULL != stats)
+ {
+ GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
+ stats = NULL;
+ }
+
+ free_test_address (&test_addr);
+
+ ret = 0;
+}
+
+static void
+end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ die_task = GNUNET_SCHEDULER_NO_TASK;
+ end ( NULL, NULL);
+ ret = GNUNET_SYSERR;
+}
+
+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)
+{
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Did not expect suggestion
callback!\n");
+ GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+ return;
+}
+
+
+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);
+ if (sched_ats == NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not connect to ATS
scheduling!\n");
+ GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+ return;
+ }
+
+ /* Set up peer */
+ if (GNUNET_SYSERR == GNUNET_CRYPTO_hash_from_string(PEERID0,
&p.id.hashPubKey))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not setup peer!\n");
+ GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+ return;
+ }
+ GNUNET_assert (0 == strcmp (PEERID0, 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 */
+ create_test_address (&test_addr, "test-plugin", NULL, NULL, 0);
+ test_hello_address.peer = p.id;
+ test_hello_address.transport_name = test_addr.plugin;
+ test_hello_address.address = NULL;
+ test_hello_address.address_length = 0;
+
+ /* Adding address */
+ GNUNET_ATS_address_add (sched_ats, &test_hello_address, NULL, test_ats_info,
test_ats_count);
+ GNUNET_ATS_address_add (sched_ats, &test_hello_address, NULL, test_ats_info,
test_ats_count);
+
+}
+
+
+int
+main (int argc, char *argv[])
+{
+ ret = 0;
+ if (0 != GNUNET_TESTING_peer_run ("test-ats-api",
+ "test_ats_api.conf",
+ &run, NULL))
+ return 1;
+ return ret;
+}
+
+/* end of file test_ats_api_scheduling_add_address.c */
Modified: gnunet/src/ats/test_ats_api_scheduling_add_session.c
===================================================================
--- gnunet/src/ats/test_ats_api_scheduling_add_session.c 2013-09-25
14:19:38 UTC (rev 29550)
+++ gnunet/src/ats/test_ats_api_scheduling_add_session.c 2013-09-25
14:37:14 UTC (rev 29551)
@@ -28,6 +28,7 @@
#include "gnunet_testing_lib.h"
#include "ats.h"
#include "test_ats_api_common.h"
+
/**
* Timeout task
*/
Modified: gnunet/src/ats/test_ats_api_scheduling_destroy_session.c
===================================================================
--- gnunet/src/ats/test_ats_api_scheduling_destroy_session.c 2013-09-25
14:19:38 UTC (rev 29550)
+++ gnunet/src/ats/test_ats_api_scheduling_destroy_session.c 2013-09-25
14:37:14 UTC (rev 29551)
@@ -33,13 +33,16 @@
#include "ats.h"
#include "test_ats_api_common.h"
+/**
+ * Timeout task
+ */
static GNUNET_SCHEDULER_TaskIdentifier die_task;
-static GNUNET_SCHEDULER_TaskIdentifier wait_task;
+/**
+ * Statistics handle
+ */
+struct GNUNET_STATISTICS_Handle *stats;
-#define SUGGESTION_WAIT_TIMEOUT GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 5)
-
-
/**
* Scheduling handle
*/
@@ -70,38 +73,84 @@
*/
static void *test_session;
+/**
+ * Test ats info
+ */
+struct GNUNET_ATS_Information test_ats_info[2];
-static void
-end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+/**
+ * Test ats count
+ */
+uint32_t test_ats_count;
+
+
+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 (wait_task != GNUNET_SCHEDULER_NO_TASK)
+ static int first_stat_cb = GNUNET_YES;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "ATS statistics: `%s' `%s' %llu\n",
+ subsystem,name, value);
+ if ((GNUNET_YES == first_stat_cb) && (1 == value))
{
- GNUNET_SCHEDULER_cancel (wait_task);
- wait_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_ATS_address_add (sched_ats, &test_hello_address, (struct Session *)
&test_session, test_ats_info, test_ats_count);
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &end, NULL);
}
- if (sched_ats != NULL)
- GNUNET_ATS_scheduling_done (sched_ats);
- free_test_address (&test_addr);
- ret = GNUNET_SYSERR;
+ if ((GNUNET_NO == first_stat_cb) && (1 == value))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "ATS updated existing address\n");
+ }
+ if (value > 1)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "ATS did not update existing address,
but added 2nd address!\n");
+ GNUNET_SCHEDULER_add_now (&end_badly, 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");
- wait_task = GNUNET_SCHEDULER_NO_TASK;
+
if (die_task != GNUNET_SCHEDULER_NO_TASK)
{
GNUNET_SCHEDULER_cancel (die_task);
die_task = GNUNET_SCHEDULER_NO_TASK;
}
+
+ if (NULL != sched_ats)
+ {
+ GNUNET_ATS_scheduling_done (sched_ats);
+ sched_ats = NULL;
+ }
+
+ GNUNET_STATISTICS_watch_cancel (stats, "ats", "# addresses", &stat_cb, NULL);
+ if (NULL != stats)
+ {
+ GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
+ stats = NULL;
+ }
+
free_test_address (&test_addr);
- GNUNET_ATS_scheduling_done (sched_ats);
- sched_ats = NULL;
+
+ ret = 0;
}
+static void
+end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ die_task = GNUNET_SCHEDULER_NO_TASK;
+ end ( NULL, NULL);
+ ret = GNUNET_SYSERR;
+}
static void
address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
@@ -111,72 +160,9 @@
const struct GNUNET_ATS_Information *atsi,
uint32_t ats_count)
{
- static int stage = 0;
-
- if (0 == stage)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage 0: Received suggestion for
peer `%s'\n",
- GNUNET_i2s(&address->peer));
-
- GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id);
- 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));
- }
- else
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage 0: Callback with invalid
address `%s'\n",
- GNUNET_i2s (&address->peer));
- GNUNET_SCHEDULER_add_now (&end, NULL);
- ret = 1;
- return;
- }
- stage ++;
- ret = 0;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Destroying address for `%s'\n",
- GNUNET_i2s (&address->peer));
- /* Destroying session for address */
- test_session = NULL;
- GNUNET_ATS_address_destroyed (sched_ats, &test_hello_address,
test_addr.session);
- /* Request address */
- GNUNET_ATS_suggest_address (sched_ats, &p.id);
- return;
- }
- else if (1 == stage)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage 1: Received suggestion for
peer `%s'\n",
- GNUNET_i2s(&address->peer));
-
-
- GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id);
- if (GNUNET_OK == compare_addresses (address, session, &test_hello_address,
test_session))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage 1: Callback with correct
address `%s'\n",
- GNUNET_i2s (&address->peer));
- }
- else
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage 1: Callback with invalid
address `%s'\n",
- GNUNET_i2s (&address->peer));
- GNUNET_SCHEDULER_add_now (&end, NULL);
- ret = 1;
- return;
- }
- stage ++;
- ret = 0;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Destroying address for `%s'\n",
- GNUNET_i2s (&address->peer));
- /* Destroying complete address */
- GNUNET_ATS_address_destroyed (sched_ats, &test_hello_address, session);
- /* Request address */
- GNUNET_ATS_suggest_address (sched_ats, &p.id);
- wait_task = GNUNET_SCHEDULER_add_delayed (SUGGESTION_WAIT_TIMEOUT, &end,
NULL);
- return;
- }
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage 1: Unexpected address
suggestion\n");
- ret = 1;
-
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Did not expect suggestion
callback!\n");
+ GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+ return;
}
@@ -186,14 +172,16 @@
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);
if (sched_ats == NULL)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not connect to ATS
scheduling!\n");
- ret = 1;
- end ();
+ GNUNET_SCHEDULER_add_now (&end_badly, NULL);
return;
}
@@ -201,35 +189,41 @@
if (GNUNET_SYSERR == GNUNET_CRYPTO_hash_from_string(PEERID0,
&p.id.hashPubKey))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not setup peer!\n");
- ret = GNUNET_SYSERR;
- end ();
+ GNUNET_SCHEDULER_add_now (&end_badly, NULL);
return;
}
+ GNUNET_assert (0 == strcmp (PEERID0, GNUNET_i2s_full (&p.id)));
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created peer `%s'\n",
GNUNET_i2s_full(&p.id));
- /* Adding address with session */
- create_test_address (&test_addr, "test", &test_addr, "test", strlen ("test")
+ 1);
- test_session = &test_addr;
+ /* 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 */
+ 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_addr.session,
NULL, 0);
- /* Request address */
- GNUNET_ATS_suggest_address (sched_ats, &p.id);
+ /* Adding address */
+ GNUNET_ATS_address_add (sched_ats, &test_hello_address, NULL, test_ats_info,
test_ats_count);
}
int
main (int argc, char *argv[])
{
- if (0 != GNUNET_TESTING_peer_run ("test_ats_api_scheduling_add_address",
+ ret = 0;
+ if (0 != GNUNET_TESTING_peer_run ("test-ats-api",
"test_ats_api.conf",
&run, NULL))
return 1;
return ret;
}
-
/* end of file test_ats_api_scheduling_destroy_session.c */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r29551 - gnunet/src/ats,
gnunet <=