/*
This file is part of GNUnet.
- (C) 2010,2011 Christian Grothoff (and other contributing authors)
+ Copyright (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
#include "ats.h"
#include "test_ats_api_common.h"
-static GNUNET_SCHEDULER_TaskIdentifier die_task;
+/**
+ * Timeout task
+ */
+static struct GNUNET_SCHEDULER_Task * die_task;
+
+/**
+ * Statistics handle
+ */
+static struct GNUNET_STATISTICS_Handle *stats;
/**
* Scheduling handle
/**
* HELLO address
*/
-struct GNUNET_HELLO_Address test_hello_address;
+static struct GNUNET_HELLO_Address test_hello_address;
/**
* Session
/**
* Test ats info
*/
-struct GNUNET_ATS_Information test_ats_info[2];
+static struct GNUNET_ATS_Information test_ats_info[2];
/**
* Test ats count
*/
-uint32_t test_ats_count;
+static uint32_t test_ats_count;
+
+/**
+ * Address record we will modify with a session later.
+ */
+static struct GNUNET_ATS_AddressRecord *ar;
static void
-end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+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;
+ static int first_stat_cb = GNUNET_YES;
- 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 ((GNUNET_YES == first_stat_cb) && (1 == value))
+ {
+ GNUNET_ATS_address_add_session (ar,
+ (struct Session *) &test_session);
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &end, NULL);
+ }
+ 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");
- if (die_task != GNUNET_SCHEDULER_NO_TASK)
+
+ if (die_task != NULL)
{
GNUNET_SCHEDULER_cancel (die_task);
- die_task = GNUNET_SCHEDULER_NO_TASK;
+ die_task = NULL;
}
+
if (NULL != sched_ats)
+ {
GNUNET_ATS_scheduling_done (sched_ats);
- sched_ats = NULL;
+ 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 = NULL;
+ end ( NULL, NULL);
+ ret = GNUNET_SYSERR;
}
+
static void
-address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
+address_suggest_cb (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ 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)
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
{
- static int stage = 0;
- if (0 == stage)
- {
- 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));
- 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;
- }
- stage ++;
-
- GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id);
-
- /* Adding address with session */
- test_session = &test_hello_address;
- 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);
- return;
- }
- if (1 == stage)
- {
- 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));
- ret = 0;
- }
- else
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage 1: 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 1: Callback with incorrect ats info \n");
- ret = 1;
- }
- stage ++;
-
- GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id);
- GNUNET_SCHEDULER_add_now (&end, NULL);
- return;
- }
-
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Did not expect suggestion callback!\n");
+ GNUNET_SCHEDULER_add_now (&end_badly, NULL);
}
+
static void
-run (void *cls,
+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");
- ret = 1;
- end ();
+ 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");
- ret = GNUNET_SYSERR;
- end ();
- return;
- }
-
- GNUNET_assert (0 == strcmp (PEERID0, GNUNET_i2s_full (&p.id)));
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created peer `%s'\n",
+ memset (&p.id, '1', sizeof (p.id));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Created peer `%s'\n",
GNUNET_i2s_full(&p.id));
/* Prepare ATS Information */
test_ats_count = 2;
/* Adding address without session */
- 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 */
+ ar = 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",
- "test_ats_api.conf",
- &run, NULL))
+ ret = 0;
+ if (0 != GNUNET_TESTING_peer_run ("test-ats-api",
+ "test_ats_api.conf",
+ &run, NULL))
return 1;
return ret;
}