#include "gnunet_ats_service.h"
#include "ats.h"
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_EXTRA_LOGGING
#define VERBOSE_ARM GNUNET_EXTRA_LOGGING
static GNUNET_SCHEDULER_TaskIdentifier die_task;
+static GNUNET_SCHEDULER_TaskIdentifier consume_task;
+
static struct GNUNET_ATS_SchedulingHandle *ats;
static struct GNUNET_ATS_PerformanceHandle *atp;
-static struct GNUNET_OS_Process * arm_proc;
+struct GNUNET_ATS_ReservationContext *sh;
+
+static struct GNUNET_OS_Process *arm_proc;
-static struct GNUNET_BANDWIDTH_Value32NBO bw_in;
+static struct PeerContext *p;
-static struct GNUNET_BANDWIDTH_Value32NBO bw_out;
+static uint32_t bw_in;
+
+static uint32_t bw_out;
static int ret;
struct Address
{
- char * plugin;
+ char *plugin;
size_t plugin_len;
- void * addr;
+ void *addr;
size_t addr_len;
- struct GNUNET_TRANSPORT_ATS_Information * ats;
+ struct GNUNET_ATS_Information *ats;
int ats_count;
- void *session;
+ void *session;
};
struct PeerContext
{
struct GNUNET_PeerIdentity id;
- struct Address * addr;
+ struct Address *addr;
};
end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
die_task = GNUNET_SCHEDULER_NO_TASK;
+
+ if (consume_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (consume_task);
+ consume_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+
+ if (sh != NULL)
+ GNUNET_ATS_reserve_bandwidth_cancel (sh);
+
if (ats != NULL)
GNUNET_ATS_scheduling_done (ats);
if (atp != NULL)
GNUNET_ATS_performance_done (atp);
+ GNUNET_free (p->addr);
+ GNUNET_free (p);
+
ret = GNUNET_SYSERR;
stop_arm ();
{
if (die_task != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_SCHEDULER_cancel(die_task);
+ GNUNET_SCHEDULER_cancel (die_task);
die_task = GNUNET_SCHEDULER_NO_TASK;
}
+ if (consume_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (consume_task);
+ consume_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+
GNUNET_ATS_scheduling_done (ats);
GNUNET_ATS_performance_done (atp);
+ GNUNET_free (p->addr);
+ GNUNET_free (p);
+
ret = 0;
stop_arm ();
}
-void performance_cb (void *cls,
- const struct
- GNUNET_PeerIdentity *
- peer,
- const char *plugin_name,
- const void *plugin_addr,
- size_t plugin_addr_len,
- struct
- GNUNET_BANDWIDTH_Value32NBO
- bandwidth_out,
- struct
- GNUNET_BANDWIDTH_Value32NBO
- bandwidth_in,
- const struct
- GNUNET_TRANSPORT_ATS_Information
- * ats,
- uint32_t ats_count)
+void
+performance_cb (void *cls, const struct GNUNET_PeerIdentity *peer,
+ const char *plugin_name, const void *plugin_addr,
+ size_t plugin_addr_len,
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
+ const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
{
}
+void
+reservation_cb (void *cls, const struct GNUNET_PeerIdentity *peer,
+ int32_t amount, struct GNUNET_TIME_Relative res_delay)
+{
+ sh = NULL;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "ATS reserved bandwidth of %i to peer `%s' in %llu ms\n", amount,
+ GNUNET_i2s (peer), res_delay.rel_value);
+}
+
static void
-address_suggest_cb (void *cls,
- const struct
- GNUNET_PeerIdentity *
- peer,
- const char *plugin_name,
- const void *plugin_addr,
- size_t plugin_addr_len,
- struct Session * session,
- struct
- GNUNET_BANDWIDTH_Value32NBO
- bandwidth_out,
- struct
- GNUNET_BANDWIDTH_Value32NBO
- bandwidth_in,
- const struct
- GNUNET_TRANSPORT_ATS_Information
- * ats,
- uint32_t ats_count)
+consume_bandwidth (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ consume_task = GNUNET_SCHEDULER_NO_TASK;
+ int32_t to_reserve = 500;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Trying to reserver bandwidth of %i to peer `%s' in %llu ms\n",
+ to_reserve, GNUNET_i2s (&p->id));
+ sh = GNUNET_ATS_reserve_bandwidth (atp, &p->id, to_reserve, &reservation_cb,
+ NULL);
+}
+
+static void
+address_suggest_cb (void *cls, const struct GNUNET_PeerIdentity *peer,
+ const char *plugin_name, const void *plugin_addr,
+ size_t plugin_addr_len, struct Session *session,
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
+ const struct GNUNET_ATS_Information *ats,
+ uint32_t ats_count)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS suggested address for peer `%s'\n", GNUNET_i2s (peer));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS suggested address for peer `%s'\n",
+ GNUNET_i2s (peer));
- bw_in = bandwidth_in;
- bw_out = bandwidth_out;
+ bw_in = ntohl (bandwidth_in.value__);
+ bw_out = ntohl (bandwidth_out.value__);
+
+ consume_task = GNUNET_SCHEDULER_add_now (&consume_bandwidth, NULL);
}
void
start_arm (const char *cfgname)
{
- arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
- "gnunet-service-arm",
+ arm_proc =
+ GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
+ "gnunet-service-arm",
#if VERBOSE_ARM
- "-L", "DEBUG",
+ "-L", "DEBUG",
#endif
- "-c", cfgname, NULL);
+ "-c", cfgname, NULL);
}
static void
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
ret = GNUNET_SYSERR;
- struct Address addr;
- struct PeerContext p;
+ struct Address *addr;
- die_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT, &end_badly, NULL);
+ die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
start_arm (cfgfile);
ats = GNUNET_ATS_scheduling_init (cfg, &address_suggest_cb, NULL);
return;
}
+ p = GNUNET_malloc (sizeof (struct PeerContext));
+ addr = GNUNET_malloc (sizeof (struct Address));
+
atp = GNUNET_ATS_performance_init (cfg, &performance_cb, NULL);
if (atp == NULL)
{
ret = GNUNET_SYSERR;
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to init ATS performance\n");
- end_badly(NULL, NULL);
+ end_badly (NULL, NULL);
+ GNUNET_free (p);
+ GNUNET_free (addr);
return;
}
/* set up peer */
- GNUNET_CRYPTO_hash_create_random(GNUNET_CRYPTO_QUALITY_WEAK, &p.id.hashPubKey);
-
+ GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK,
+ &p->id.hashPubKey);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created peer `%s'\n", GNUNET_i2s (&p.id));
- p.addr = &addr;
- addr.plugin = "test";
- addr.session = NULL;
- addr.addr = NULL;
- addr.addr_len = 0;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created peer `%s'\n",
+ GNUNET_i2s (&p->id));
+ p->addr = addr;
+ addr->plugin = "test";
+ addr->session = NULL;
+ addr->addr = NULL;
+ addr->addr_len = 0;
- GNUNET_ATS_address_update(ats, &p.id, addr.plugin, addr.addr, addr.addr_len, addr.session, NULL, 0);
+ GNUNET_ATS_address_update (ats, &p->id, addr->plugin, addr->addr,
+ addr->addr_len, addr->session, NULL, 0);
- GNUNET_ATS_suggest_address(ats, &p.id);
+ GNUNET_ATS_suggest_address (ats, &p->id);
}
int
};
GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2,
- "test_ats_api_bandwidth_consumption", "nohelp", options, &check,
- NULL);
+ "test_ats_api_bandwidth_consumption", "nohelp", options,
+ &check, NULL);
return ret;
projects / oweals / gnunet.git / blobdiff