- replace deprecated INCLUDES with AM_CPPFLAGS

[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 78177f59c71bdd04328eaccea83b839656ff676f..60a515022ebb6172880503db8746677e075528b2 100644 (file)
--- a/src/experimentation/gnunet-daemon-experimentation.c
+++ b/src/experimentation/gnunet-daemon-experimentation.c
@@ -31,12 +31,21 @@
 #include "gnunet_statistics_service.h"
 #include "gnunet-daemon-experimentation.h"
 
-struct GNUNET_STATISTICS_Handle *GSE_stats;
 
-struct GNUNET_CONFIGURATION_Handle *GSE_cfg;
+/**
+ * Statistics handle shared between components
+ */
+struct GNUNET_STATISTICS_Handle *GED_stats;
+
 
 /**
- * Task run during shutdown.
+ * Configuration handle shared between components
+ */
+struct GNUNET_CONFIGURATION_Handle *GED_cfg;
+
+
+/**
+ * Task run during shutdown to stop all submodules of the experimentation daemon.
  *
  * @param cls unused
  * @param tc unused
@@ -45,11 +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_experiments_stop ();
-  GNUNET_EXPERIMENTATION_capabilities_stop ();
-}
 
+  GED_scheduler_stop ();
+  GED_nodes_stop ();
+  GED_experiments_stop ();
+  GED_storage_stop ();
+  GED_capabilities_stop ();
+}
 
 
 /**
@@ -66,22 +77,26 @@ 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)
+       GED_cfg = (struct GNUNET_CONFIGURATION_Handle *) cfg;
+       GED_stats = GNUNET_STATISTICS_create ("experimentation", cfg);
+       if (NULL == GED_stats)
        {
                GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Failed to create statistics!\n"));
                return;
        }
 
-       GNUNET_EXPERIMENTATION_capabilities_start ();
-       if (GNUNET_SYSERR == GNUNET_EXPERIMENTATION_experiments_start ())
+       GED_capabilities_start ();
+
+       GED_storage_start ();
+
+       if (GNUNET_SYSERR == GED_experiments_start ())
        {
          GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
          return;
        }
-       GNUNET_EXPERIMENTATION_nodes_start ();
 
+       GED_nodes_start ();
+  GED_scheduler_start ();
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
                                 NULL);
 }
@@ -103,7 +118,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;
 }