From e9f09143b20f5997b5d7c892e74324b50b764958 Mon Sep 17 00:00:00 2001
From: Alexey Rybalchenko <alexryba@gmail.com>
Date: Tue, 17 May 2016 08:55:42 +0200
Subject: [PATCH] Gracefully end the device also in the termination case
 (instead of abort).

---
 fairmq/FairMQDevice.cxx                | 60 +++++++++++++-------------
 fairmq/FairMQStateMachine.h            |  4 +-
 fairmq/tools/runSimpleMQStateMachine.h | 13 +++---
 3 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/fairmq/FairMQDevice.cxx b/fairmq/FairMQDevice.cxx
index 025d81cf..da2f057b 100644
--- a/fairmq/FairMQDevice.cxx
+++ b/fairmq/FairMQDevice.cxx
@@ -80,29 +80,29 @@ void FairMQDevice::SignalHandler(int signal)
 {
     LOG(INFO) << "Caught signal " << signal;
 
-    fState = EXITING;
-    Unblock();
-    fStateThread.interrupt();
-    fStateThread.join();
+    if (!fTerminated)
+    {
+        ChangeState(STOP);
 
-    fTerminateStateThread = boost::thread(boost::bind(&FairMQDevice::Terminate, this));
-    Shutdown();
-    fTerminateStateThread.join();
+        ChangeState(RESET_TASK);
+        WaitForEndOfState(RESET_TASK);
 
-    stop();
-    exit(EXIT_FAILURE);
-    // fRunning = false;
-    // if (!fTerminated)
-    // {
-    //     fTerminated = true;
-    //     LOG(INFO) << "Exiting.";
-    // }
-    // else
-    // {
-    //     LOG(WARN) << "Repeated termination or bad initialization? Aborting.";
-    //     // std::abort();
-    //     exit(EXIT_FAILURE);
-    // }
+        ChangeState(RESET_DEVICE);
+        WaitForEndOfState(RESET_DEVICE);
+
+        ChangeState(END);
+
+        // exit(EXIT_FAILURE);
+        fRunning = false;
+        fTerminated = true;
+        LOG(INFO) << "Exiting.";
+    }
+    else
+    {
+        LOG(WARN) << "Repeated termination or bad initialization? Aborting.";
+        // std::abort();
+        exit(EXIT_FAILURE);
+    }
 }
 
 void FairMQDevice::ConnectChannels(list<FairMQChannel*>& chans)
@@ -769,31 +769,31 @@ void FairMQDevice::InteractiveStateLoop()
             {
                 case 'i':
                     LOG(INFO) << "[i] init device";
-                    ChangeState("INIT_DEVICE");
+                    ChangeState(INIT_DEVICE);
                     break;
                 case 'j':
                     LOG(INFO) << "[j] init task";
-                    ChangeState("INIT_TASK");
+                    ChangeState(INIT_TASK);
                     break;
                 case 'p':
                     LOG(INFO) << "[p] pause";
-                    ChangeState("PAUSE");
+                    ChangeState(PAUSE);
                     break;
                 case 'r':
                     LOG(INFO) << "[r] run";
-                    ChangeState("RUN");
+                    ChangeState(RUN);
                     break;
                 case 's':
                     LOG(INFO) << "[s] stop";
-                    ChangeState("STOP");
+                    ChangeState(STOP);
                     break;
                 case 't':
                     LOG(INFO) << "[t] reset task";
-                    ChangeState("RESET_TASK");
+                    ChangeState(RESET_TASK);
                     break;
                 case 'd':
                     LOG(INFO) << "[d] reset device";
-                    ChangeState("RESET_DEVICE");
+                    ChangeState(RESET_DEVICE);
                     break;
                 case 'h':
                     LOG(INFO) << "[h] help";
@@ -801,11 +801,11 @@ void FairMQDevice::InteractiveStateLoop()
                     break;
                 // case 'x':
                 //     LOG(INFO) << "[x] ERROR";
-                //     ChangeState("ERROR_FOUND");
+                //     ChangeState(ERROR_FOUND);
                 //     break;
                 case 'q':
                     LOG(INFO) << "[q] end";
-                    ChangeState("END");
+                    ChangeState(END);
                     if (CheckCurrentState("EXITING"))
                     {
                         fRunning = false;
diff --git a/fairmq/FairMQStateMachine.h b/fairmq/FairMQStateMachine.h
index 0285a5fa..4a3ee34b 100644
--- a/fairmq/FairMQStateMachine.h
+++ b/fairmq/FairMQStateMachine.h
@@ -343,7 +343,7 @@ struct FairMQFSM_ : public msm::front::state_machine_def<FairMQFSM_>
     virtual void Terminate() {} // Termination method called during StopFct action.
     virtual void Unblock() {} // Method to send commands.
 
-    // Transition table for FairMQFMS
+    // Transition table for FairMQFSM
     struct transition_table : mpl::vector<
         //        Start                    Event                  Next                     Action           Guard
         //        +------------------------+----------------------+------------------------+----------------+---------+
@@ -369,7 +369,7 @@ struct FairMQFSM_ : public msm::front::state_machine_def<FairMQFSM_>
     template <class FSM, class Event>
     void no_transition(Event const& e, FSM&, int state)
     {
-        LOG(STATE) << "no transition from state " << GetStateName(state) << " on event " << e.name();
+        LOG(STATE) << "no transition from state " << GetStateName(state) << " (" << state << ") on event " << e.name();
     }
 
     // backward compatibility to FairMQStateMachine
diff --git a/fairmq/tools/runSimpleMQStateMachine.h b/fairmq/tools/runSimpleMQStateMachine.h
index b160e3d9..a9f9f235 100644
--- a/fairmq/tools/runSimpleMQStateMachine.h
+++ b/fairmq/tools/runSimpleMQStateMachine.h
@@ -48,13 +48,16 @@ inline int runStateMachine(TMQDevice& device, FairMQProgOptions& config)
     {
         device.WaitForEndOfState(TMQDevice::RUN);
 
-        device.ChangeState(TMQDevice::RESET_TASK);
-        device.WaitForEndOfState(TMQDevice::RESET_TASK);
+        if (!device.CheckCurrentState(TMQDevice::EXITING))
+        {
+            device.ChangeState(TMQDevice::RESET_TASK);
+            device.WaitForEndOfState(TMQDevice::RESET_TASK);
 
-        device.ChangeState(TMQDevice::RESET_DEVICE);
-        device.WaitForEndOfState(TMQDevice::RESET_DEVICE);
+            device.ChangeState(TMQDevice::RESET_DEVICE);
+            device.WaitForEndOfState(TMQDevice::RESET_DEVICE);
 
-        device.ChangeState(TMQDevice::END);
+            device.ChangeState(TMQDevice::END);
+        }
     }
     else
     {