scheduling

[oweals/gnunet.git] / src / experimentation / gnunet-daemon-experimentation.c

diff --git a/src/experimentation/gnunet-daemon-experimentation.c b/src/experimentation/gnunet-daemon-experimentation.c
index 1222b6ed583855cf514851c568d6d331b279003c..085dd14b171fd3cdcc4707191aeddc65ecba29fc 100644 (file)
--- a/src/experimentation/gnunet-daemon-experimentation.c
+++ b/src/experimentation/gnunet-daemon-experimentation.c
@@ -31,10 +31,21 @@
 #include "gnunet_statistics_service.h"
 #include "gnunet-daemon-experimentation.h"
 
+
+/**
+ * Statistics handle shared between components
+ */
 struct GNUNET_STATISTICS_Handle *GSE_stats;
 
+
 /**
- * Task run during shutdown.
+ * Configuration handle shared between components
+ */
+struct GNUNET_CONFIGURATION_Handle *GSE_cfg;
+
+
+/**
+ * Task run during shutdown to stop all submodules of the experimentation daemon.
  *
  * @param cls unused
  * @param tc unused
@@ -43,9 +54,13 @@ static void
 shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Experimentation daemon shutting down ...\n"));
-  GNUNET_EXPERIMENTATION_nodes_stop();
-}
 
+  GNUNET_EXPERIMENTATION_scheduler_stop ();
+  GNUNET_EXPERIMENTATION_nodes_stop ();
+  GNUNET_EXPERIMENTATION_experiments_stop ();
+  GNUNET_EXPERIMENTATION_storage_stop ();
+  GNUNET_EXPERIMENTATION_capabilities_stop ();
+}
 
 
 /**
@@ -62,6 +77,7 @@ run (void *cls, char *const *args, const char *cfgfile,
 {
        GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Experimentation daemon starting ...\n"));
 
+       GSE_cfg = (struct GNUNET_CONFIGURATION_Handle *) cfg;
        GSE_stats = GNUNET_STATISTICS_create ("experimentation", cfg);
        if (NULL == GSE_stats)
        {
@@ -69,11 +85,18 @@ run (void *cls, char *const *args, const char *cfgfile,
                return;
        }
 
-       GNUNET_EXPERIMENTATION_nodes_start (cfg);
+       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);
-
 }