#include "gnunet_statistics_service.h"
#include "gnunet-daemon-experimentation.h"
+/**
+ * An experiment is added during startup as not running NOT_RUNNING
+ *
+ * The scheduler then decides to schedule it and sends a request to the
+ * remote peer, if core cannot send since it is busy we wait for some time
+ * and change state to BUSY, if we can send we change to REQUESTED and wait
+ * for remote peers ACK.
+ *
+ * When we receive an ACK we change to STARTED and when scheduler decides that
+ * the experiment is finished we change to STOPPED.
+ */
+
enum ExperimentState
{
+ /* Experiment is added and waiting to be executed */
NOT_RUNNING,
+ /* Cannot send request to remote peer, core is busy*/
+ BUSY,
+ /* We requested experiment and wait for remote peer to ACK */
REQUESTED,
+ /* Experiment is running */
STARTED,
+ /* Experiment is done */
STOPPED
};
GNUNET_SCHEDULER_TaskIdentifier task;
};
-struct ScheduledExperiment *list_head;
-struct ScheduledExperiment *list_tail;
+struct ScheduledExperiment *waiting_head;
+struct ScheduledExperiment *waiting_tail;
+
+struct ScheduledExperiment *running_head;
+struct ScheduledExperiment *running_tail;
static unsigned int experiments_scheduled;
+static unsigned int experiments_running;
static unsigned int experiments_requested;
static void
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peer `%s' did not respond to request for experiment `%s'\n",
GNUNET_i2s (&se->n->id), se->e->name);
- GNUNET_CONTAINER_DLL_remove (list_head, list_tail, se);
+ GNUNET_CONTAINER_DLL_remove (waiting_head, waiting_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)
{
struct ScheduledExperiment *se = cls;
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;
+ }
+ else if (BUSY == se->state)
+ se->state = NOT_RUNNING;
if (NOT_RUNNING == se->state)
{
/* Send start message */
- GNUNET_EXPERIMENT_nodes_request_start (se->n, se->e);
+ GED_nodes_request_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);
+ GNUNET_STATISTICS_set (GED_stats, "# experiments requested", experiments_requested, GNUNET_NO);
return;
}
else if (REQUESTED == se->state)
se->state = STOPPED;
return; /* End of experiment is reached */
}
+ /* Reschedule */
se->task = GNUNET_SCHEDULER_add_delayed (se->e->frequency, &start_experiment, se);
}
}
/**
- * Start the scheduler component
+ * Handle a START message from a remote node
+ *
+ * @param n the node
+ * @param e the experiment
+ */
+void
+GED_scheduler_handle_start (struct Node *n, struct Experiment *e)
+{
+
+}
+
+/**
+ * Handle a START_ACL 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)
+{
+
+}
+
+
+/**
+ * Handle a STOP message from a remote node
+ *
+ * @param n the node
+ * @param e the experiment
*/
void
-GNUNET_EXPERIMENTATION_scheduler_add (struct Node *n, struct Experiment *e)
+GED_scheduler_handle_stop (struct Node *n, struct Experiment *e)
+{
+
+}
+
+/**
+ * Add a new experiment for a node
+ *
+ * @param n the node
+ * @param e the experiment
+ */
+void
+GED_scheduler_add (struct Node *n, struct Experiment *e)
{
struct ScheduledExperiment *se;
struct GNUNET_TIME_Relative start;
else
se->task = GNUNET_SCHEDULER_add_delayed (start, &start_experiment, se);
- GNUNET_CONTAINER_DLL_insert (list_head, list_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));
experiments_scheduled ++;
- GNUNET_STATISTICS_set (GSE_stats, "# experiments scheduled", experiments_scheduled, GNUNET_NO);
+ GNUNET_STATISTICS_set (GED_stats, "# experiments scheduled", experiments_scheduled, GNUNET_NO);
}
/**
* Start the scheduler component
*/
void
-GNUNET_EXPERIMENTATION_scheduler_start ()
+GED_scheduler_start ()
{
experiments_requested = 0;
experiments_scheduled = 0;
* Stop the scheduler component
*/
void
-GNUNET_EXPERIMENTATION_scheduler_stop ()
+GED_scheduler_stop ()
{
struct ScheduledExperiment *cur;
struct ScheduledExperiment *next;
- next = list_head;
+ next = waiting_head;
while (NULL != (cur = next))
{
next = cur->next;
- GNUNET_CONTAINER_DLL_remove (list_head, list_tail, cur);
+ GNUNET_CONTAINER_DLL_remove (waiting_head, waiting_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;
+ while (NULL != (cur = next))
+ {
+ next = cur->next;
+ GNUNET_CONTAINER_DLL_remove (running_head, running_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 (GED_stats, "# experiments running", experiments_running, GNUNET_NO);
}
}
projects / oweals / gnunet.git / blobdiff