new components

5 files changed, 131 insertions, 1 deletions

diff --git a/src/experimentation/Makefile.am b/src/experimentation/Makefile.am
index 2f0da9ee7..aaa205460 100644
--- a/src/experimentation/Makefile.am
+++ b/src/experimentation/Makefile.am
@@ -36,7 +36,9 @@ gnunet_daemon_experimentation_SOURCES = \
  gnunet-daemon-experimentation.c \
  gnunet-daemon-experimentation_capabilities.c \
  gnunet-daemon-experimentation_nodes.c \
- gnunet-daemon-experimentation_experiments.c
+ gnunet-daemon-experimentation_scheduler.c \
+ gnunet-daemon-experimentation_experiments.c \
+ gnunet-daemon-experimentation_storage.c
 gnunet_daemon_experimentation_LDADD = \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
diff --git a/src/experimentation/gnunet-daemon-experimentation.c b/src/experimentation/gnunet-daemon-experimentation.c
index ee632ec86..085dd14b1 100644
--- a/src/experimentation/gnunet-daemon-experimentation.c
+++ b/src/experimentation/gnunet-daemon-experimentation.c
@@ -54,8 +54,11 @@ 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_scheduler_stop ();
   GNUNET_EXPERIMENTATION_nodes_stop ();
   GNUNET_EXPERIMENTATION_experiments_stop ();
+  GNUNET_EXPERIMENTATION_storage_stop ();
   GNUNET_EXPERIMENTATION_capabilities_stop ();
 }
 
@@ -83,12 +86,14 @@ 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);
diff --git a/src/experimentation/gnunet-daemon-experimentation.h b/src/experimentation/gnunet-daemon-experimentation.h
index d2fc6bd37..a8bfc3523 100644
--- a/src/experimentation/gnunet-daemon-experimentation.h
+++ b/src/experimentation/gnunet-daemon-experimentation.h
@@ -194,4 +194,19 @@ void
 GNUNET_EXPERIMENTATION_experiments_stop ();
 
 
+/**
+ * Start the storage component
+ */
+void
+GNUNET_EXPERIMENTATION_storage_start ();
+
+
+
+/**
+ * Stop the storage component
+ */
+void
+GNUNET_EXPERIMENTATION_storage_stop ();
+
+
 /* end of gnunet-daemon-experimentation.h */
diff --git a/src/experimentation/gnunet-daemon-experimentation_scheduler.c b/src/experimentation/gnunet-daemon-experimentation_scheduler.c
new file mode 100644
index 000000000..478813cf7
--- /dev/null
+++ b/src/experimentation/gnunet-daemon-experimentation_scheduler.c
@@ -0,0 +1,54 @@
+/*
+     This file is part of GNUnet.
+     (C) 2009 Christian Grothoff (and other contributing authors)
+
+     GNUnet is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published
+     by the Free Software Foundation; either version 3, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file experimentation/gnunet-daemon-experimentation_scheduler.c
+ * @brief experimentation daemon: execute experiments
+ * @author Christian Grothoff
+ * @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"
+
+
+/**
+ * Start the scheduler component
+ */
+void
+GNUNET_EXPERIMENTATION_scheduler_start ()
+{
+
+}
+
+
+/**
+ * Stop the scheduler component
+ */
+void
+GNUNET_EXPERIMENTATION_scheduler_stop ()
+{
+
+}
+
+/* end of gnunet-daemon-experimentation_scheduler.c */
diff --git a/src/experimentation/gnunet-daemon-experimentation_storage.c b/src/experimentation/gnunet-daemon-experimentation_storage.c
new file mode 100644
index 000000000..8382eaa6f
--- /dev/null
+++ b/src/experimentation/gnunet-daemon-experimentation_storage.c
@@ -0,0 +1,54 @@
+/*
+     This file is part of GNUnet.
+     (C) 2009 Christian Grothoff (and other contributing authors)
+
+     GNUnet is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published
+     by the Free Software Foundation; either version 3, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file experimentation/gnunet-daemon-experimentation_storage.c
+ * @brief experimentation daemon: store results
+ * @author Christian Grothoff
+ * @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"
+
+
+/**
+ * Start the storage component
+ */
+void
+GNUNET_EXPERIMENTATION_storage_start ()
+{
+
+}
+
+
+/**
+ * Stop the storage component
+ */
+void
+GNUNET_EXPERIMENTATION_storage_stop ()
+{
+
+}
+
+/* end of gnunet-daemon-experimentation_storage.c */