updated code

4 files changed, 21 insertions, 13 deletions

diff --git a/src/experimentation/gnunet-daemon-experimentation.c b/src/experimentation/gnunet-daemon-experimentation.c
index 085dd14b1..4ecc03d7d 100644
--- a/src/experimentation/gnunet-daemon-experimentation.c
+++ b/src/experimentation/gnunet-daemon-experimentation.c
@@ -86,15 +86,19 @@ run (void *cls, char *const *args, const char *cfgfile,
         }
 
         GNUNET_EXPERIMENTATION_capabilities_start ();
+
         GNUNET_EXPERIMENTATION_storage_start ();
+
         if (GNUNET_SYSERR == GNUNET_EXPERIMENTATION_experiments_start ())
         {
           GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
           return;
         }
+
         GNUNET_EXPERIMENTATION_nodes_start ();
+        /*
   GNUNET_EXPERIMENTATION_scheduler_start ();
-
+*/
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
                                 NULL);
 }
@@ -116,7 +120,7 @@ main (int argc, char *const *argv)
 
   return (GNUNET_OK ==
           GNUNET_PROGRAM_run (argc, argv, "experimentation",
-                                                                                        _("GNUnet hostlist server and client"), options,
+                                                                                        _("GNUnet experimentation daemon"), options,
                               &run, NULL)) ? 0 : 1;
 }
 
diff --git a/src/experimentation/gnunet-daemon-experimentation_experiments.c b/src/experimentation/gnunet-daemon-experimentation_experiments.c
index 09fd8d1ec..bf8bc7df5 100644
--- a/src/experimentation/gnunet-daemon-experimentation_experiments.c
+++ b/src/experimentation/gnunet-daemon-experimentation_experiments.c
@@ -56,6 +56,11 @@ static struct GNUNET_CONTAINER_MultiHashMap *experiments;
 
 uint32_t GSE_my_issuer_count;
 
+/**
+ * Valid experiment issuer for this daemon
+ *
+ * Array Experimentation_Issuer with GSE_my_issuer_count elements
+ */
 struct Experimentation_Issuer *GSE_my_issuer;
 
 
diff --git a/src/experimentation/gnunet-daemon-experimentation_nodes.c b/src/experimentation/gnunet-daemon-experimentation_nodes.c
index ac1d00ce0..a77e841b8 100644
--- a/src/experimentation/gnunet-daemon-experimentation_nodes.c
+++ b/src/experimentation/gnunet-daemon-experimentation_nodes.c
@@ -199,7 +199,7 @@ remove_request (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * @param buf the buffer to copy to
  * @return bytes passed
  */
-size_t send_request_cb (void *cls, size_t bufsize, void *buf)
+size_t send_experimentation_request_cb (void *cls, size_t bufsize, void *buf)
 {
         struct Node *n = cls;
         struct Experimentation_Request msg;
@@ -234,11 +234,11 @@ size_t send_request_cb (void *cls, size_t bufsize, void *buf)
 
 
 /**
- * Send request
+ * Send request to peer to start add him to to the set of experimentation nodes
  *
  * @param peer the peer to send to
  */
-static void send_request (const struct GNUNET_PeerIdentity *peer)
+static void send_experimentation_request (const struct GNUNET_PeerIdentity *peer)
 {
         struct Node *n;
         size_t size;
@@ -254,7 +254,7 @@ static void send_request (const struct GNUNET_PeerIdentity *peer)
         n->capabilities = NONE;
         n->cth = GNUNET_CORE_notify_transmit_ready(ch, GNUNET_NO, 0,
                                                                 GNUNET_TIME_relative_get_forever_(),
-                                                                peer, size, send_request_cb, n);
+                                                                peer, size, send_experimentation_request_cb, n);
 
         GNUNET_assert (GNUNET_OK == GNUNET_CONTAINER_multihashmap_put (nodes_requested,
                         &peer->hashPubKey, n, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST));
@@ -315,9 +315,8 @@ get_experiments_cb (struct Node *n, struct Experiment *e)
                         e->name,
                         GNUNET_i2s (&n->id));
 
-        /* Request experiment */
+        /* Tell the scheduler to add a node with an experiment */
         GNUNET_EXPERIMENTATION_scheduler_add (n, e);
-
         counter ++;
 }
 
@@ -571,7 +570,7 @@ void core_connect_handler (void *cls,
         if (GNUNET_YES == GNUNET_CONTAINER_multihashmap_contains (nodes_inactive, &peer->hashPubKey))
                 return; /* This peer is known as inactive  */
 
-        send_request (peer);
+        send_experimentation_request (peer);
 
 }
 
diff --git a/src/experimentation/gnunet-daemon-experimentation_scheduler.c b/src/experimentation/gnunet-daemon-experimentation_scheduler.c
index 502c65229..795c993dd 100644
--- a/src/experimentation/gnunet-daemon-experimentation_scheduler.c
+++ b/src/experimentation/gnunet-daemon-experimentation_scheduler.c
@@ -74,7 +74,7 @@ request_timeout (void *cls,const struct GNUNET_SCHEDULER_TaskContext* tc)
         GNUNET_STATISTICS_set (GSE_stats, "# experiments requested", experiments_requested, GNUNET_NO);
 }
 
-static void run (void *cls,const struct GNUNET_SCHEDULER_TaskContext* tc)
+static void start_experiment (void *cls,const struct GNUNET_SCHEDULER_TaskContext* tc)
 {
         struct ScheduledExperiment *se = cls;
         struct GNUNET_TIME_Relative end;
@@ -114,7 +114,7 @@ static void run (void *cls,const struct GNUNET_SCHEDULER_TaskContext* tc)
                                 se->state = STOPPED;
                                 return; /* End of experiment is reached */
                         }
-                se->task = GNUNET_SCHEDULER_add_delayed (se->e->frequency, &run, se);
+                se->task = GNUNET_SCHEDULER_add_delayed (se->e->frequency, &start_experiment, se);
         }
 
         else if (STOPPED == se->state)
@@ -145,9 +145,9 @@ GNUNET_EXPERIMENTATION_scheduler_add (struct Node *n, struct Experiment *e)
         se->e = e;
         se->n = n;
         if (0 == start.rel_value)
-                        se->task = GNUNET_SCHEDULER_add_now (&run, se);
+                        se->task = GNUNET_SCHEDULER_add_now (&start_experiment, se);
         else
-                        se->task = GNUNET_SCHEDULER_add_delayed (start, &run, se);
+                        se->task = GNUNET_SCHEDULER_add_delayed (start, &start_experiment, se);
 
         GNUNET_CONTAINER_DLL_insert (list_head, list_tail, se);
         GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Added experiment `%s' for node to be scheduled\n",