various small improvements

* Cannot override process methods in state machine
* can run indefinitely until a process calls halt
* check that a state machine _current != NULL
* get the statemachine pointer in a state

include/manager.h

@@ -28,7 +28,7 @@ namespace elma {
         public: 
 
         //! Default constructor
-        Manager() {}
+        Manager() : _running(false) {}
 
         Manager& schedule(Process& process, high_resolution_clock::duration period);
         Manager& all(std::function<void(Process&)> f);
@@ -42,6 +42,7 @@ namespace elma {
         Manager& stop();
 
         Manager& run(high_resolution_clock::duration);
+        Manager& run();
 
         //! Getter
         //! \return The time the Manager was most recently started
@@ -68,6 +69,7 @@ namespace elma {
         high_resolution_clock::time_point _start_time;
         high_resolution_clock::duration _elapsed;
         Client _client;
+        bool _running;
 
     };
 

include/process.h

@@ -107,6 +107,8 @@ namespace elma {
 
         void http_get(std::string url, std::function<void(json&)> handler);
 
+        void halt();
+
         private:
 
         // Manager interface

include/state.h

@@ -53,6 +53,9 @@ namespace elma {
         //! \param e The event to emit
         void emit(const Event& e);
 
+        //! \return Get a reference to the parent state machine.
+        StateMachine& state_machine() { return *_state_machine_ptr; }
+
         private:
         std::string _name;
         int _id;

include/state_machine.h

@@ -41,13 +41,13 @@ namespace elma {
         State& current() { return *_current; }
 
         //! Do not override init() for a state machine.
-        void init();
+        void init() final;
 
         //! Do not override init() for a state machine.        
-        void start();
+        void start() final;
 
         //! Do not override init() for a state machine.        
-        void update();
+        void update() final;
 
         //! Do not override init() for a state machine.        
         void stop();

src/manager.cc

@@ -101,12 +101,14 @@ namespace elma {
     //! Start all processes. Usually not called directly.
     //! \return A reference to the manager, for chaining
     Manager& Manager::start() {
+        _running = true;
         return all([this](Process& p) { p._start(_elapsed) ;});
     }    
 
     //! Stop all processes. Usually not called directly.
     //! \return A reference to the manager, for chaining
     Manager& Manager::stop() {
+        _running  = false;
         return all([](Process& p) { p._stop(); });
     }    
 
@@ -143,7 +145,7 @@ namespace elma {
     if (Priority_min <= priority && priority <= Priority_max  ){
         process._priority = priority;
         sort_processes();
-    }else{
+    } else {
         throw Exception("Priority must be between -5(low priority) and 15(high priority)");
     }    
         return *this;
@@ -169,4 +171,22 @@ namespace elma {
 
     }
 
+    //! Run the manager indefinitely or until a process calls halt().
+    //! \return A reference to the manager, for chaining
+    Manager& Manager::run() {
+
+        _start_time = high_resolution_clock::now();
+        _elapsed = high_resolution_clock::duration::zero();
+        start();        
+
+        while ( _running ) {
+            update();
+            _elapsed = high_resolution_clock::now() - _start_time;
+        }
+
+        return *this;
+
+    }
+
+
 }

src/process.cc

@@ -84,4 +84,6 @@ namespace elma {
         stop();
     }       
 
+    void Process::halt() { _manager_ptr->stop(); }    
+
 }

src/state_machine.cc

@@ -1,4 +1,3 @@
-#include <iostream>
 #include "elma.h"
 
 namespace elma {
@@ -41,6 +40,9 @@ namespace elma {
     }
 
     void StateMachine::update() {
+        if ( _current == NULL ) {
+            throw(Exception("State machine updated without a valid current state (call set_initial(...) first)"));
+        }
         _current->during();
     }