GNUNET_SCHEDULER_add_now (end_badly, NULL);
}
This file is part of GNUnet.
- (C) 2010-2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2010-2013 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;
/**
* Statistics handle
*/
-struct GNUNET_STATISTICS_Handle *stats;
+static struct GNUNET_STATISTICS_Handle *stats;
/**
* Scheduling handle
*/
static struct GNUNET_ATS_SchedulingHandle *sched_ats;
+/**
+ * Connectivity handle
+ */
+static struct GNUNET_ATS_ConnectivityHandle *connect_ats;
+
/**
* Return value
*/
/**
* 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 int
stat_cb(void *cls, const char *subsystem, const char *name, uint64_t value,
int is_persistent);
+
static void
end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Done!\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;
}
+ if (NULL != connect_ats)
+ {
+ GNUNET_ATS_connectivity_done (connect_ats);
+ connect_ats = NULL;
+ }
GNUNET_STATISTICS_watch_cancel (stats, "ats", "# addresses", &stat_cb, NULL);
if (NULL != stats)
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_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_assert (NULL != address);
GNUNET_assert (NULL == session);
GNUNET_assert (ntohl(bandwidth_in.value__) > 0);
GNUNET_assert (ntohl(bandwidth_out.value__) > 0);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Received sugggestion for peer `%s'\n",
- GNUNET_i2s (&address->peer));
-
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Received sugggestion for peer `%s'\n",
+ GNUNET_i2s (peer));
GNUNET_SCHEDULER_add_now (&end, NULL);
- return;
}
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_ATS_suggest_address (sched_ats, &p.id, NULL, NULL);
+ static struct GNUNET_ATS_ConnectivitySuggestHandle *sh;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "ATS statistics: `%s' `%s' %llu\n",
+ subsystem,
+ name,
+ value);
+ if (NULL == sh)
+ sh = GNUNET_ATS_connectivity_suggest (connect_ats, &p.id);
return GNUNET_OK;
}
+
static void
-run (void *cls, const struct GNUNET_CONFIGURATION_Handle *mycfg,
- struct GNUNET_TESTING_Peer *peer)
+run (void *cls,
+ const struct GNUNET_CONFIGURATION_Handle *mycfg,
+ struct GNUNET_TESTING_Peer *peer)
{
die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
stats = GNUNET_STATISTICS_create ("ats", mycfg);
GNUNET_STATISTICS_watch (stats, "ats", "# addresses", &stat_cb, NULL);
+ connect_ats = GNUNET_ATS_connectivity_init (mycfg);
/* Connect to ATS scheduling */
sched_ats = GNUNET_ATS_scheduling_init (mycfg, &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 */
memset (&p.id, '1', sizeof (p.id));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created peer `%s'\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Created peer `%s'\n",
GNUNET_i2s_full(&p.id));
/* Prepare ATS Information */
test_hello_address.address_length = test_addr.addr_len;
/* 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);
}
char *test_filename = GNUNET_strdup (argv[0]);
char *config_file;
char *solver;
+ int delayed = GNUNET_NO;
ret = 0;
GNUNET_break (0);
return -1;
}
+
solver += strlen (src_filename) +1;
+ if (NULL != strstr (solver, "delayed_"))
+ {
+ delayed = GNUNET_YES;
+ solver += strlen ("delayed_");
+ }
+
if (0 == strcmp(solver, "proportional"))
{
- config_file = "test_ats_solver_proportional.conf";
+ if (delayed)
+ config_file = "test_ats_solver_delayed_proportional.conf";
+ else
+ config_file = "test_ats_solver_proportional.conf";
}
else if (0 == strcmp(solver, "mlp"))
{
- config_file = "test_ats_solver_mlp.conf";
+ if (delayed)
+ config_file = "test_ats_solver_delayed_mlp.conf";
+ else
+ config_file = "test_ats_solver_mlp.conf";
}
else if ((0 == strcmp(solver, "ril")))
{
- config_file = "test_ats_solver_ril.conf";
+ if (delayed)
+ config_file = "test_ats_solver_delayed_ril.conf";
+ else
+ config_file = "test_ats_solver_ril.conf";
}
else
{
GNUNET_break (0);
GNUNET_free (src_filename);
GNUNET_free (test_filename);
+ FPRINTF (stderr, "Invalid test name or configuration not found `%s'\n",src_filename);
return 1;
}
projects / oweals / gnunet.git / blobdiff