* @author Matthias Wachs
*/
#include "platform.h"
-#include "gnunet_getopt_lib.h"
#include "gnunet_util_lib.h"
#include "gnunet_core_service.h"
#include "gnunet_statistics_service.h"
#include "gnunet-daemon-experimentation.h"
-static struct GNUNET_STATISTICS_Handle *GSE_stats;
/**
- * Task run during shutdown.
+ * Statistics handle shared between components
+ */
+struct GNUNET_STATISTICS_Handle *GED_stats;
+
+
+/**
+ * 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
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();
-}
+ GED_scheduler_stop ();
+ GED_nodes_stop ();
+ GED_experiments_stop ();
+ GED_storage_stop ();
+ GED_capabilities_stop ();
+}
/**
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Experimentation daemon starting ...\n"));
- 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_nodes_start (cfg);
+ GED_capabilities_start ();
+ GED_storage_start ();
+
+ if (GNUNET_SYSERR == GED_experiments_start ())
+ {
+ GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
+ return;
+ }
+
+ GED_nodes_start ();
+ GED_scheduler_start ();
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
NULL);
-
}
return (GNUNET_OK ==
GNUNET_PROGRAM_run (argc, argv, "experimentation",
- _("GNUnet hostlist server and client"), options,
+ _("GNUnet experimentation daemon"), options,
&run, NULL)) ? 0 : 1;
}