struct Experiment *e;
struct Node *n;
int state;
+ int outbound;
GNUNET_SCHEDULER_TaskIdentifier task;
};
-struct ScheduledExperiment *waiting_head;
-struct ScheduledExperiment *waiting_tail;
+struct ScheduledExperiment *waiting_in_head;
+struct ScheduledExperiment *waiting_in_tail;
+
+struct ScheduledExperiment *running_in_head;
+struct ScheduledExperiment *running_in_tail;
+
+struct ScheduledExperiment *waiting_out_head;
+struct ScheduledExperiment *waiting_out_tail;
+
+struct ScheduledExperiment *running_out_head;
+struct ScheduledExperiment *running_out_tail;
-struct ScheduledExperiment *running_head;
-struct ScheduledExperiment *running_tail;
static unsigned int experiments_scheduled;
-static unsigned int experiments_running;
+static unsigned int experiments_outbound_running;
+static unsigned int experiments_inbound_running;
static unsigned int experiments_requested;
+
+static struct ScheduledExperiment *
+find_experiment (struct ScheduledExperiment *head, struct ScheduledExperiment *tail,
+ struct Node *n, struct Experiment *e, int outbound)
+{
+ struct ScheduledExperiment *cur;
+ for (cur = head; NULL != cur; cur = cur->next)
+ {
+ if ((cur->n == n) && (cur->e == e) && (cur->outbound == outbound)) /* Node and experiment are equal */
+ break;
+ }
+ return cur;
+}
+
static void
request_timeout (void *cls,const struct GNUNET_SCHEDULER_TaskContext* tc)
{
struct ScheduledExperiment *se = cls;
se->task = GNUNET_SCHEDULER_NO_TASK;
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peer `%s' did not respond to request for experiment `%s'\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Peer `%s' did not respond to request for experiment `%s'\n"),
GNUNET_i2s (&se->n->id), se->e->name);
- GNUNET_CONTAINER_DLL_remove (waiting_head, waiting_tail, se);
+ GNUNET_CONTAINER_DLL_remove (waiting_out_head, waiting_out_tail, se);
GNUNET_free (se);
/* Remove experiment */
-
GNUNET_assert (experiments_requested > 0);
experiments_requested --;
- GNUNET_STATISTICS_set (GSE_stats, "# experiments requested", experiments_requested, GNUNET_NO);
+ GNUNET_STATISTICS_set (GED_stats, "# experiments requested", experiments_requested, GNUNET_NO);
}
-static void start_experiment (void *cls,const struct GNUNET_SCHEDULER_TaskContext* tc)
+static void run_experiment_inbound (void *cls,const struct GNUNET_SCHEDULER_TaskContext* tc)
{
struct ScheduledExperiment *se = cls;
+ struct GNUNET_TIME_Relative start;
struct GNUNET_TIME_Relative end;
- struct GNUNET_TIME_Relative backoff;
se->task = GNUNET_SCHEDULER_NO_TASK;
- if (GNUNET_NO == GED_nodes_rts (se->n))
- {
- se->state = BUSY;
- backoff = GNUNET_TIME_UNIT_SECONDS;
- backoff.rel_value += GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 1000);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Delaying start request to peer `%s' for `%s' for %llu ms\n",
- GNUNET_i2s (&se->n->id), se->e->name, (unsigned long long) backoff.rel_value);
- se->task = GNUNET_SCHEDULER_add_delayed (backoff, &start_experiment, se);
- return;
+ switch (se->state) {
+ case NOT_RUNNING:
+ /* Send START_ACK message */
+ GED_nodes_send_start_ack (se->n, se->e);
+ se->state = REQUESTED;
+ /* Schedule to run */
+ start = GNUNET_TIME_absolute_get_remaining(se->e->start);
+ if (0 == start.rel_value_us)
+ se->task = GNUNET_SCHEDULER_add_now (&run_experiment_inbound, se);
+ else
+ se->task = GNUNET_SCHEDULER_add_delayed (start, &run_experiment_inbound, se);
+ break;
+ case REQUESTED:
+ experiments_inbound_running ++;
+ GNUNET_STATISTICS_set (GED_stats, "# experiments inbound running", experiments_inbound_running, GNUNET_NO);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Starting inbound experiment `%s' with peer `%s'\n"),
+ se->e->name, GNUNET_i2s (&se->n->id));
+ se->state = STARTED;
+ se->task = GNUNET_SCHEDULER_add_now (&run_experiment_inbound, se);
+ break;
+ case STARTED:
+ /* Experiment is running */
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Running %s experiment `%s' peer for `%s'\n",
+ "inbound", GNUNET_i2s (&se->n->id), se->e->name);
+
+ /* do work here */
+
+ /* Reschedule */
+ end = GNUNET_TIME_absolute_get_remaining(GNUNET_TIME_absolute_add (se->e->stop, se->e->frequency));
+ if (0 == end.rel_value_us)
+ {
+ se->state = STOPPED;
+ return; /* End of experiment is reached */
+ }
+ /* Reschedule */
+ se->task = GNUNET_SCHEDULER_add_delayed (se->e->frequency, &run_experiment_inbound, se);
+ break;
+ case STOPPED:
+ /* Experiment expired */
+ break;
+ default:
+ break;
}
- else if (BUSY == se->state)
- se->state = NOT_RUNNING;
- if (NOT_RUNNING == se->state)
- {
- /* Send start message */
- GED_nodes_request_start (se->n, se->e);
+}
+
+static void run_experiment_outbound (void *cls,const struct GNUNET_SCHEDULER_TaskContext* tc)
+{
+ struct ScheduledExperiment *se = cls;
+ struct GNUNET_TIME_Relative end;
+
+ se->task = GNUNET_SCHEDULER_NO_TASK;
+
+ switch (se->state) {
+ case NOT_RUNNING:
+ /* Send START message */
+ GED_nodes_send_start (se->n, se->e);
se->state = REQUESTED;
se->task = GNUNET_SCHEDULER_add_delayed (EXP_RESPONSE_TIMEOUT, &request_timeout, se);
-
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Sending start request to peer `%s' for `%s'\n",
- GNUNET_i2s (&se->n->id), se->e->name);
experiments_requested ++;
- GNUNET_STATISTICS_set (GSE_stats, "# experiments requested", experiments_requested, GNUNET_NO);
- return;
- }
- else if (REQUESTED == se->state)
- {
- /* Already requested */
- return;
- }
- else if (STARTED == se->state)
- {
+ GNUNET_STATISTICS_set (GED_stats, "# experiments requested", experiments_requested, GNUNET_NO);
+ break;
+ case REQUESTED:
+ /* Expecting START_ACK */
+ GNUNET_break (0);
+ break;
+ case STARTED:
/* Experiment is running */
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Running experiment `%s' peer for `%s'\n",
- GNUNET_i2s (&se->n->id), se->e->name);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Running %s experiment `%s' peer for `%s'\n",
+ "outbound", GNUNET_i2s (&se->n->id), se->e->name);
/* do work here */
/* Reschedule */
end = GNUNET_TIME_absolute_get_remaining(GNUNET_TIME_absolute_add (se->e->stop, se->e->frequency));
- if (0 == end.rel_value)
+ if (0 == end.rel_value_us)
{
se->state = STOPPED;
return; /* End of experiment is reached */
}
/* Reschedule */
- se->task = GNUNET_SCHEDULER_add_delayed (se->e->frequency, &start_experiment, se);
- }
-
- else if (STOPPED == se->state)
- {
+ se->task = GNUNET_SCHEDULER_add_delayed (se->e->frequency, &run_experiment_outbound, se);
+ break;
+ case STOPPED:
/* Experiment expired */
+ break;
+ default:
+ break;
}
}
+
/**
* Handle a START message from a remote node
*
void
GED_scheduler_handle_start (struct Node *n, struct Experiment *e)
{
+ struct ScheduledExperiment *se;
+
+ if ((NULL != (se = find_experiment (waiting_in_head, waiting_in_tail, n, e, GNUNET_NO))) ||
+ (NULL != (se = find_experiment (running_in_head, running_in_tail, n, e, GNUNET_NO))))
+ {
+ GNUNET_break_op (0);
+ return;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received %s message from peer %s for experiment `%s'\n",
+ "START", GNUNET_i2s (&n->id), e->name);
+
+ GED_scheduler_add (n, e, GNUNET_NO);
}
/**
- * Handle a START_ACL message from a remote node
+ * Handle a START_ACK message from a remote node
*
* @param n the node
* @param e the experiment
void
GED_scheduler_handle_start_ack (struct Node *n, struct Experiment *e)
{
+ struct ScheduledExperiment *se;
+
+ if (NULL == (se = find_experiment (waiting_out_head, waiting_out_tail, n, e, GNUNET_YES)))
+ {
+ GNUNET_break (0);
+ return;
+ }
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received %s message from peer %s for requested experiment `%s'\n",
+ "START_ACK", GNUNET_i2s (&n->id), e->name);
+ if (GNUNET_SCHEDULER_NO_TASK != se->task)
+ {
+ GNUNET_SCHEDULER_cancel (se->task); /* *Canceling timeout task */
+ se->task = GNUNET_SCHEDULER_NO_TASK;
+ }
+
+ /* Remove from waiting list, add to running list */
+ GNUNET_CONTAINER_DLL_remove (waiting_out_head, waiting_out_tail, se);
+ GNUNET_CONTAINER_DLL_insert (running_out_head, running_out_tail, se);
+
+ /* Change state and schedule to run */
+ experiments_outbound_running ++;
+ GNUNET_STATISTICS_set (GED_stats, "# experiments outbound running", experiments_outbound_running, GNUNET_NO);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Starting outbound experiment `%s' with peer `%s'\n"),
+ e->name, GNUNET_i2s (&n->id));
+ se->state = STARTED;
+ se->task = GNUNET_SCHEDULER_add_now (&run_experiment_outbound, se);
}
void
GED_scheduler_handle_stop (struct Node *n, struct Experiment *e)
{
+ struct ScheduledExperiment *se;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Received %s message from peer %s for experiment `%s'\n"),
+ "STOP", GNUNET_i2s (&n->id), e->name);
+
+ if (NULL != (se = find_experiment (waiting_in_head, waiting_in_tail, n, e, GNUNET_NO)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received %s message from peer %s for waiting experiment `%s'\n",
+ "STOP", GNUNET_i2s (&n->id), e->name);
+ }
+
+ if (NULL != (se = find_experiment (running_in_head, running_in_tail, n, e, GNUNET_NO)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received %s message from peer %s for running experiment `%s'\n",
+ "STOP", GNUNET_i2s (&n->id), e->name);
+ }
}
*
* @param n the node
* @param e the experiment
+ * @param outbound are we initiator (GNUNET_YES) or client (GNUNET_NO)?
*/
void
-GED_scheduler_add (struct Node *n, struct Experiment *e)
+GED_scheduler_add (struct Node *n, struct Experiment *e, int outbound)
{
struct ScheduledExperiment *se;
struct GNUNET_TIME_Relative start;
struct GNUNET_TIME_Relative end;
+ GNUNET_assert ((GNUNET_YES == outbound) || (GNUNET_NO == outbound));
+
start = GNUNET_TIME_absolute_get_remaining(e->start);
end = GNUNET_TIME_absolute_get_remaining(e->stop);
- if (0 == end.rel_value)
+ if (0 == end.rel_value_us)
return; /* End of experiment is reached */
/* Add additional checks here if required */
-
se = GNUNET_malloc (sizeof (struct ScheduledExperiment));
se->state = NOT_RUNNING;
+ se->outbound = outbound;
se->e = e;
se->n = n;
- if (0 == start.rel_value)
- se->task = GNUNET_SCHEDULER_add_now (&start_experiment, se);
+
+ if (GNUNET_YES == outbound)
+ {
+ if (0 == start.rel_value_us)
+ se->task = GNUNET_SCHEDULER_add_now (&run_experiment_outbound, se);
+ else
+ se->task = GNUNET_SCHEDULER_add_delayed (start, &run_experiment_outbound, se);
+ GNUNET_CONTAINER_DLL_insert (waiting_out_head, waiting_out_tail, se);
+ }
else
- se->task = GNUNET_SCHEDULER_add_delayed (start, &start_experiment, se);
+ {
+ if (0 == start.rel_value_us)
+ se->task = GNUNET_SCHEDULER_add_now (&run_experiment_inbound, se);
+ else
+ se->task = GNUNET_SCHEDULER_add_delayed (start, &run_experiment_inbound, se);
+ GNUNET_CONTAINER_DLL_insert (waiting_in_head, waiting_in_tail, se);
+ }
- GNUNET_CONTAINER_DLL_insert (waiting_head, waiting_tail, se);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Added experiment `%s' for node to be scheduled\n",
- e->name, GNUNET_i2s(&se->n->id));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Added %s experiment `%s' for node to be scheduled\n",
+ (GNUNET_YES == outbound) ? "outbound" : "inbound", e->name, GNUNET_i2s(&se->n->id));
experiments_scheduled ++;
- GNUNET_STATISTICS_set (GSE_stats, "# experiments scheduled", experiments_scheduled, GNUNET_NO);
+ GNUNET_STATISTICS_set (GED_stats, "# experiments scheduled", experiments_scheduled, GNUNET_NO);
+
}
/**
struct ScheduledExperiment *cur;
struct ScheduledExperiment *next;
- next = waiting_head;
+ next = waiting_in_head;
+ while (NULL != (cur = next))
+ {
+ next = cur->next;
+ GNUNET_CONTAINER_DLL_remove (waiting_in_head, waiting_in_tail, cur);
+ if (GNUNET_SCHEDULER_NO_TASK != cur->task)
+ {
+ GNUNET_SCHEDULER_cancel (cur->task);
+ cur->task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ GNUNET_free (cur);
+ GNUNET_assert (experiments_scheduled > 0);
+ experiments_scheduled --;
+ GNUNET_STATISTICS_set (GED_stats, "# experiments scheduled", experiments_scheduled, GNUNET_NO);
+ }
+
+ next = running_in_head;
+ while (NULL != (cur = next))
+ {
+ next = cur->next;
+ GNUNET_CONTAINER_DLL_remove (running_in_head, running_in_tail, cur);
+ if (GNUNET_SCHEDULER_NO_TASK != cur->task)
+ {
+ GNUNET_SCHEDULER_cancel (cur->task);
+ cur->task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ GNUNET_free (cur);
+ GNUNET_assert (experiments_outbound_running > 0);
+ experiments_inbound_running --;
+ GNUNET_STATISTICS_set (GED_stats, "# experiments inbound running", experiments_inbound_running, GNUNET_NO);
+ }
+
+ next = waiting_out_head;
while (NULL != (cur = next))
{
next = cur->next;
- GNUNET_CONTAINER_DLL_remove (waiting_head, waiting_tail, cur);
+ GNUNET_CONTAINER_DLL_remove (waiting_out_head, waiting_out_tail, cur);
if (GNUNET_SCHEDULER_NO_TASK != cur->task)
{
GNUNET_SCHEDULER_cancel (cur->task);
GNUNET_free (cur);
GNUNET_assert (experiments_scheduled > 0);
experiments_scheduled --;
- GNUNET_STATISTICS_set (GSE_stats, "# experiments scheduled", experiments_scheduled, GNUNET_NO);
+ GNUNET_STATISTICS_set (GED_stats, "# experiments scheduled", experiments_scheduled, GNUNET_NO);
}
- next = running_head;
+ next = running_out_head;
while (NULL != (cur = next))
{
next = cur->next;
- GNUNET_CONTAINER_DLL_remove (running_head, running_tail, cur);
+ GNUNET_CONTAINER_DLL_remove (running_out_head, running_out_tail, cur);
if (GNUNET_SCHEDULER_NO_TASK != cur->task)
{
GNUNET_SCHEDULER_cancel (cur->task);
cur->task = GNUNET_SCHEDULER_NO_TASK;
}
GNUNET_free (cur);
- GNUNET_assert (experiments_running > 0);
- experiments_running --;
- GNUNET_STATISTICS_set (GSE_stats, "# experiments running", experiments_running, GNUNET_NO);
+ GNUNET_assert (experiments_outbound_running > 0);
+ experiments_outbound_running --;
+ GNUNET_STATISTICS_set (GED_stats, "# experiments outbound running", experiments_outbound_running, GNUNET_NO);
}
}
projects / oweals / gnunet.git / blobdiff