[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r11067 - gnunet/src/include
From: |
gnunet |
Subject: |
[GNUnet-SVN] r11067 - gnunet/src/include |
Date: |
Mon, 26 Apr 2010 15:56:39 +0200 |
Author: nevans
Date: 2010-04-26 15:56:39 +0200 (Mon, 26 Apr 2010)
New Revision: 11067
Modified:
gnunet/src/include/gnunet_testing_lib.h
Log:
changes so things compile
Modified: gnunet/src/include/gnunet_testing_lib.h
===================================================================
--- gnunet/src/include/gnunet_testing_lib.h 2010-04-26 13:45:27 UTC (rev
11066)
+++ gnunet/src/include/gnunet_testing_lib.h 2010-04-26 13:56:39 UTC (rev
11067)
@@ -75,10 +75,63 @@
/**
* Phases of starting GNUnet on a system.
*/
-enum GNUNET_TESTING_StartPhase;
+enum GNUNET_TESTING_StartPhase
+{
+ /**
+ * Copy the configuration file to the target system.
+ */
+ SP_COPYING,
+ /**
+ * Configuration file has been copied, start ARM on target system.
+ */
+ SP_COPIED,
+ /**
+ * ARM has been started, check that it has properly daemonized and
+ * then try to connect to the CORE service (which should be
+ * auto-started by ARM).
+ */
+ SP_START_ARMING,
+
+ /**
+ * We're waiting for CORE to start.
+ */
+ SP_START_CORE,
+
+ /**
+ * Core has notified us that we've established a connection to the service.
+ * The main FSM halts here and waits to be moved to UPDATE or CLEANUP.
+ */
+ SP_START_DONE,
+
+ /**
+ * We've been asked to terminate the instance and are now waiting for
+ * the remote command to stop the gnunet-arm process and delete temporary
+ * files.
+ */
+ SP_SHUTDOWN_START,
+
+ /**
+ * We've received a configuration update and are currently waiting for
+ * the copy process for the update to complete. Once it is, we will
+ * return to "SP_START_DONE" (and rely on ARM to restart all affected
+ * services).
+ */
+ SP_CONFIG_UPDATE
+};
+
/**
+ * Prototype of a function that will be called when a
+ * particular operation was completed the testing library.
+ *
+ * @param cls closure
+ * @param emsg NULL on success
+ */
+typedef void (*GNUNET_TESTING_NotifyCompletion)(void *cls,
+ const char *emsg);
+
+/**
* Handle for a GNUnet daemon (technically a set of
* daemons; the handle is really for the master ARM
* daemon) started by the testing library.
@@ -249,17 +302,7 @@
struct GNUNET_TESTING_Daemon *
GNUNET_TESTING_daemon_get (struct GNUNET_TESTING_PeerGroup *pg, unsigned int
position);
-/**
- * Prototype of a function that will be called when a
- * particular operation was completed the testing library.
- *
- * @param cls closure
- * @param emsg NULL on success
- */
-typedef void (*GNUNET_TESTING_NotifyCompletion)(void *cls,
- const char *emsg);
-
/**
* Stops a GNUnet daemon.
*
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r11067 - gnunet/src/include,
gnunet <=