/*
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
/**
* Timeout task
*/
-static GNUNET_SCHEDULER_TaskIdentifier die_task;
+static struct GNUNET_SCHEDULER_Task * die_task;
-static GNUNET_SCHEDULER_TaskIdentifier wait_task;
+static struct GNUNET_SCHEDULER_Task * wait_task;
/**
* Statistics handle
*/
-struct GNUNET_STATISTICS_Handle *stats;
+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;
-static void end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
-static void end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+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)
+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);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "ATS statistics: `%s' `%s' %llu\n",
+ subsystem,name, value);
if (1 < value)
{
- if (GNUNET_SCHEDULER_NO_TASK != wait_task)
+ if (NULL != wait_task)
GNUNET_SCHEDULER_cancel (wait_task);
GNUNET_SCHEDULER_add_now (&end_badly, NULL);
}
if (1 == value)
{
- if (GNUNET_SCHEDULER_NO_TASK == wait_task)
- wait_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &end, NULL);
+ if (NULL == wait_task)
+ wait_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+ &end, NULL);
}
return GNUNET_OK;
}
static void
end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutting down\n");
- wait_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Shutting down\n");
+ wait_task = NULL;
- if (die_task != GNUNET_SCHEDULER_NO_TASK)
+ if (NULL != die_task)
{
GNUNET_SCHEDULER_cancel (die_task);
- die_task = GNUNET_SCHEDULER_NO_TASK;
+ die_task = NULL;
}
-
if (NULL != sched_ats)
{
GNUNET_ATS_scheduling_done (sched_ats);
ret = 0;
}
+
static void
end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- die_task = GNUNET_SCHEDULER_NO_TASK;
+ 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)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Did not expect suggestion callback!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Did not expect suggestion callback!\n");
GNUNET_SCHEDULER_add_now (&end_badly, NULL);
- return;
+}
+
+
+static int
+dummy_stat (void *cls,
+ const char *subsystem,
+ const char *name,
+ uint64_t value,
+ int is_persistent)
+{
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Got dummy stat %s%s:%s = %llu\n",
+ is_persistent ? "!" : " ", subsystem, name, value);
+ return GNUNET_OK;
}
static void
-run (void *cls,
- const struct GNUNET_CONFIGURATION_Handle *cfg,
- struct GNUNET_TESTING_Peer *peer)
+got_initial_value (void *cls, int success)
{
- 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);
+ struct GNUNET_CONFIGURATION_Handle *cfg = cls;
+ struct GNUNET_ATS_AddressRecord *ar;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Got initial value\n");
/* 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_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",
+ 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 */
/* Adding address without session */
test_session = NULL;
- create_test_address (&test_addr, "test", test_session, "test", strlen ("test") + 1);
+ 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;
/* Adding address */
- GNUNET_ATS_address_add (sched_ats, &test_hello_address, test_session, test_ats_info, test_ats_count);
+ GNUNET_ATS_address_add (sched_ats,
+ &test_hello_address, test_session,
+ test_ats_info, test_ats_count);
/* Adding duplicate */
- GNUNET_ATS_address_add (sched_ats, &test_hello_address, test_session, test_ats_info, test_ats_count);
+ GNUNET_log_skip (1, GNUNET_NO);
+ ar = GNUNET_ATS_address_add (sched_ats,
+ &test_hello_address, test_session,
+ test_ats_info, test_ats_count);
+ GNUNET_log_skip (0, GNUNET_YES);
+ GNUNET_assert (NULL == ar);
+}
+
+
+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);
+ GNUNET_STATISTICS_get (stats, "ats", "# addresses", TIMEOUT,
+ &got_initial_value, &dummy_stat,
+ GNUNET_CONFIGURATION_dup (cfg));
+
}
projects / oweals / gnunet.git / blobdiff