*/
/**
* @file ats/test_ats_api_scheduling_add_address.c
- * @brief test for ats simplistic solver preference aging:
+ * @brief test for ats proportional solver preference aging:
* Add 2 addresses and set high preference for one. Expect higher bw for this
* address, wait. Preferences should age and so bw assigned should decrease.
* @author Christian Grothoff
end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
die_task = GNUNET_SCHEDULER_NO_TASK;
-
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Error! Shutting down\n");
if (sched_ats != NULL)
+ {
GNUNET_ATS_scheduling_done (sched_ats);
+ sched_ats = NULL;
+ }
if (perf_ats != NULL)
+ {
GNUNET_ATS_performance_done (perf_ats);
+ perf_ats = NULL;
+ }
free_test_address (&test_addr[0]);
ret = GNUNET_SYSERR;
}
GNUNET_ATS_suggest_address_cancel (sched_ats, &p[0].id);
GNUNET_ATS_suggest_address_cancel (sched_ats, &p[1].id);
- GNUNET_ATS_scheduling_done (sched_ats);
+ if (NULL != sched_ats)
+ GNUNET_ATS_scheduling_done (sched_ats);
+ if (NULL != perf_ats)
GNUNET_ATS_performance_done (perf_ats);
sched_ats = NULL;
perf_ats = NULL;
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,
static int sug_p0 = GNUNET_NO;
static int sug_p1 = GNUNET_NO;
+ static uint32_t p0_last_bandwidth_out;
+ static uint32_t p0_last_bandwidth_in;
+
+ static uint32_t p1_last_bandwidth_out;
+ static uint32_t p1_last_bandwidth_in;
+
+ uint32_t cur_bandwidth_out = ntohl (bandwidth_out.value__);
+ uint32_t cur_bandwidth_in = ntohl (bandwidth_in.value__);
+
if (0 == stage)
{
- /* Callback for initial suggestion */
- if (0 == memcmp (&address->peer, &p[0].id, sizeof (p[0].id)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage %u: Callback for peer `%s': (in/out) %llu/%llu\n",
- stage,
- GNUNET_i2s (&address->peer),
- ntohl (bandwidth_in.value__),
- ntohl (bandwidth_out.value__));
- sug_p0 = GNUNET_YES;
- }
- if (0 == memcmp (&address->peer, &p[1].id, sizeof (p[1].id)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage %u: Callback for peer `%s': (in/out) %llu/%llu\n",
- stage,
- GNUNET_i2s (&address->peer),
- ntohl (bandwidth_in.value__),
- ntohl (bandwidth_out.value__));
- sug_p1 = GNUNET_YES;
- }
- if ((GNUNET_YES == sug_p0) && (GNUNET_YES == sug_p1))
- {
- /* Changing preference for peer 0 */
- stage ++;
- GNUNET_ATS_change_preference (perf_ats, &p[0].id, GNUNET_ATS_PREFERENCE_BANDWIDTH,(double) 1000, GNUNET_ATS_PREFERENCE_END);
- sug_p0 = GNUNET_NO;
- sug_p1 = GNUNET_NO;
- return;
- }
-
+ /* Callback for initial suggestion */
+ if (0 == memcmp (&address->peer, &p[0].id, sizeof (p[0].id)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Stage %u: Callback for peer 0 `%s': (in/out) %u/%u\n",
+ stage,
+ GNUNET_i2s (&address->peer),
+ (unsigned int) ntohl (bandwidth_in.value__),
+ (unsigned int) ntohl (bandwidth_out.value__));
+ sug_p0 = GNUNET_YES;
+ p0_last_bandwidth_out = ntohl(bandwidth_out.value__);
+ p0_last_bandwidth_in = ntohl(bandwidth_in.value__);
+ }
+ if (0 == memcmp (&address->peer, &p[1].id, sizeof (p[1].id)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Stage %u: Callback for peer 1 `%s': (in/out) %u/%u\n",
+ stage,
+ GNUNET_i2s (&address->peer),
+ (unsigned int) ntohl (bandwidth_in.value__),
+ (unsigned int) ntohl (bandwidth_out.value__));
+ sug_p1 = GNUNET_YES;
+ p1_last_bandwidth_out = ntohl(bandwidth_out.value__);
+ p1_last_bandwidth_in = ntohl(bandwidth_in.value__);
+ }
+ if ((GNUNET_YES == sug_p0) && (GNUNET_YES == sug_p1))
+ {
+ /* Changing preference for peer 0 */
+ stage ++;
+ GNUNET_ATS_performance_change_preference (perf_ats, &p[0].id, GNUNET_ATS_PREFERENCE_BANDWIDTH,(double) 1000, GNUNET_ATS_PREFERENCE_END);
+ sug_p0 = GNUNET_NO;
+ sug_p1 = GNUNET_NO;
+ return;
+ }
}
if (1 == stage)
{
- /* Callback due to preference change */
- if (0 == memcmp (&address->peer, &p[0].id, sizeof (p[0].id)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage %u: Callback for peer `%s': (in/out) %llu/%llu\n",
- stage,
- GNUNET_i2s (&address->peer),
- ntohl (bandwidth_in.value__),
- ntohl (bandwidth_out.value__));
- sug_p0 = GNUNET_YES;
- }
- if (0 == memcmp (&address->peer, &p[1].id, sizeof (p[1].id)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage %u: Callback for peer `%s': (in/out) %llu/%llu\n",
- stage,
- GNUNET_i2s (&address->peer),
- ntohl (bandwidth_in.value__),
- ntohl (bandwidth_out.value__));
- sug_p1 = GNUNET_YES;
- }
- if ((GNUNET_YES == sug_p0) && (GNUNET_YES == sug_p1))
- {
- /* Changing preference for peer 0 */
- stage ++;
- sug_p0 = GNUNET_NO;
- sug_p1 = GNUNET_NO;
- return;
- }
+ /* Callback due to preference change */
+ if (0 == memcmp (&address->peer, &p[0].id, sizeof (p[0].id)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Stage %u: Callback for peer 0 `%s': (in/out) %u/%u\n",
+ stage,
+ GNUNET_i2s (&address->peer),
+ (unsigned int) ntohl (bandwidth_in.value__),
+ (unsigned int) ntohl (bandwidth_out.value__));
+ sug_p0 = GNUNET_YES;
+
+ /* Peer 0 should get more bandwidth */
+ if (cur_bandwidth_out <= p0_last_bandwidth_out)
+ GNUNET_break (0);
+ if (cur_bandwidth_in <= p0_last_bandwidth_in)
+ GNUNET_break (0);
+ p0_last_bandwidth_out = ntohl(bandwidth_out.value__);
+ p0_last_bandwidth_in = ntohl(bandwidth_in.value__);
+ }
+ if (0 == memcmp (&address->peer, &p[1].id, sizeof (p[1].id)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Stage %u: Callback for peer 1 `%s': (in/out) %u/%u\n",
+ stage,
+ GNUNET_i2s (&address->peer),
+ (unsigned int) ntohl (bandwidth_in.value__),
+ (unsigned int) ntohl (bandwidth_out.value__));
+ sug_p1 = GNUNET_YES;
+
+ /* Peer 1 should get less bandwidth */
+ if (cur_bandwidth_out >= p1_last_bandwidth_out)
+ {
+ GNUNET_break (0);
+ goto error;
+ }
+ if (cur_bandwidth_in >= p1_last_bandwidth_in)
+ {
+ GNUNET_break (0);
+ goto error;
+ }
+ p1_last_bandwidth_out = ntohl(bandwidth_out.value__);
+ p1_last_bandwidth_in = ntohl(bandwidth_in.value__);
+ }
+ if ((GNUNET_YES == sug_p0) && (GNUNET_YES == sug_p1))
+ {
+ stage ++;
+ sug_p0 = GNUNET_NO;
+ sug_p1 = GNUNET_NO;
+ return;
+ }
}
if (2 == stage)
{
- /* Callback due to preference aging */
- if (0 == memcmp (&address->peer, &p[0].id, sizeof (p[0].id)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage %u: Callback for peer `%s': (in/out) %llu/%llu\n",
- stage,
- GNUNET_i2s (&address->peer),
- ntohl (bandwidth_in.value__),
- ntohl (bandwidth_out.value__));
- sug_p0 = GNUNET_YES;
- }
- if (0 == memcmp (&address->peer, &p[1].id, sizeof (p[1].id)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage %u: Callback for peer `%s': (in/out) %llu/%llu\n",
- stage,
- GNUNET_i2s (&address->peer),
- ntohl (bandwidth_in.value__),
- ntohl (bandwidth_out.value__));
- sug_p1 = GNUNET_YES;
- }
+ /* Callback due to preference aging */
+ if (0 == memcmp (&address->peer, &p[0].id, sizeof (p[0].id)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Stage %u: Callback for peer 0 `%s': (in/out) %u/%u\n",
+ stage,
+ GNUNET_i2s (&address->peer),
+ (unsigned int) ntohl (bandwidth_in.value__),
+ (unsigned int) ntohl (bandwidth_out.value__));
+ sug_p0 = GNUNET_YES;
+
+ /* Peer 0 should get less bandwidth */
+ if (cur_bandwidth_out <= p0_last_bandwidth_out)
+ GNUNET_break (0);
+ if (cur_bandwidth_in <= p0_last_bandwidth_in)
+ GNUNET_break (0);
+ p0_last_bandwidth_out = ntohl(bandwidth_out.value__);
+ p0_last_bandwidth_in = ntohl(bandwidth_in.value__);
+ }
+ if (0 == memcmp (&address->peer, &p[1].id, sizeof (p[1].id)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Stage %u: Callback for peer 1 `%s': (in/out) %u/%u\n",
+ stage,
+ GNUNET_i2s (&address->peer),
+ (unsigned int) ntohl (bandwidth_in.value__),
+ (unsigned int) ntohl (bandwidth_out.value__));
+ sug_p1 = GNUNET_YES;
+ /* Peer 1 should get more bandwidth */
+ if (cur_bandwidth_out <= p1_last_bandwidth_out)
+ {
+ GNUNET_break (0);
+ goto error;
+ }
+ if (cur_bandwidth_in <= p1_last_bandwidth_in)
+ {
+ GNUNET_break (0);
+ goto error;
+ }
+ p0_last_bandwidth_out = ntohl(bandwidth_out.value__);
+ p0_last_bandwidth_in = ntohl(bandwidth_in.value__);
+ }
+
+ if ((GNUNET_YES == sug_p0) && (GNUNET_YES == sug_p1))
+ {
+ /* Done ! */
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Done!\n");
+ stage ++;
+ ret = 0;
+ GNUNET_SCHEDULER_add_now (&end,NULL);
+ return;
+ }
}
+ return;
-
-
-
-/*
- stage ++;
- if (3 == stage)
- GNUNET_SCHEDULER_add_now (&end, NULL);
-*/
-
-
-
+error:
+ /* Error ! */
+ ret = 1;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Error!\n");
+ GNUNET_SCHEDULER_add_now (&end,NULL);
}
+
static void
run (void *cls,
const struct GNUNET_CONFIGURATION_Handle *cfg,
int
main (int argc, char *argv[])
{
- if (0 != GNUNET_TESTING_peer_run ("test_ats_simplistic_pref_aging",
+ if (0 != GNUNET_TESTING_peer_run ("test_ats_proportional_pref_aging",
"test_ats_api.conf",
&run, NULL))
return 1;