Changeset 11063

Timestamp:

06/18/11 18:12:11 (13 years ago)

Author:

tbretz

Message:

INtroduced a new class DimLog which ensures that the MessageDimTX is initialized _before_ the DimErrorRedirecter, otherwise a very early error could be emitted to the MessageDimTX even before it was instantiated.

Location:

trunk/FACT++/src

Files:

• StateMachineDim.cc (modified) (4 diffs)
• StateMachineDim.h (modified) (2 diffs)

trunk/FACT++/src/StateMachineDim.cc

@@ -1 +1 @@
 // **************************************************************************
 /** @class StateMachineDim
-
-@brief Class for a state machine implementation within a DIM network
 
 This class implements a StateMachine within a Dim network. It redirects
@@ -67 +65 @@
 //
 StateMachineDim::StateMachineDim(ostream &out, const std::string &name)
-    : StateMachine(out, name), DimStart(name, *this), fLog(name, out),
+    : StateMachine(out, name), DimLog(out, name), DimStart(name, DimLog::fLog),
     fDescriptionStates((name+"/STATE_LIST").c_str(), const_cast<char*>(""),
                        "Provides a list with descriptions for each service."
@@ -178 +176 @@
 int StateMachineDim::Write(const Time &time, const string &txt, int qos)
 {
-    return fLog.Write(time, txt, qos);
+    return DimLog::fLog.Write(time, txt, qos);
 }
 
@@ -193 +191 @@
 void StateMachineDim::exitHandler(int code)
 {
-    Out() << " -- " << Time().GetAsStr() << ": EXIT(" << code << ") command received." << endl;
+    Out() << " -- " << Time().GetAsStr() << " - EXIT(" << code << ") command received." << endl;
     if (code<0) // negative values reserved for internal use
     {

trunk/FACT++/src/StateMachineDim.h

@@ -2 +2 @@
 #define FACT_StateMachineDim
 
+// ***************************************************************************
+/**
+ @class DimLog
+
+ @brief Ensures that the MessageDimTX is initialized before errors could be redirected to it
+
+**/
+// ***************************************************************************
 #include "MessageDim.h"       // MessageDimTX
-#include "StateMachine.h"     // StateMachien
+
+class DimLog
+{
+    friend class StateMachineDim;
+
+    MessageDimTX fLog;
+    DimLog(std::ostream &out, const std::string &name) : fLog(name, out) { }
+};
 
 // ***************************************************************************
@@ -28 +43 @@
 };
 
-class StateMachineDim : public DimCommandHandler, public StateMachine, public DimStart
+// ***************************************************************************
+/**
+ @class StateMachineDim
+
+ @brief Class for a state machine implementation within a DIM network
+
+**/
+// ***************************************************************************
+#include "StateMachine.h"     // StateMachien
+
+class StateMachineDim : public DimCommandHandler, public StateMachine, public DimLog, public DimStart
 {
 private:
-    MessageDimTX fLog;           /// Logging to the Dim network
-
     static const int fVersion;   /// Version number