Changeset 10379 for trunk

Timestamp:

04/18/11 10:56:51 (13 years ago)

Author:

tbretz

Message:

Added service to provide the STATE_LIST with the available descriptions of the states.

Location:

trunk/FACT++/src

Files:

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

trunk/FACT++/src/StateMachineDim.cc

@@ -65 +65 @@
 StateMachineDim::StateMachineDim(ostream &out, const std::string &name)
 : StateMachine(out, name), DimStart(name, *this), fLog(name, out),
-fSrvState(Form("%s/STATE", name.c_str()).c_str(), const_cast<char*>("")),
-fSrvVersion(Form("%s/VERSION", name.c_str()).c_str(), const_cast<int&>(fVersion))
+    fSrvState(Form("%s/STATE", name.c_str()).c_str(), const_cast<char*>("")),
+    fSrvVersion(Form("%s/VERSION", name.c_str()).c_str(), const_cast<int&>(fVersion)),
+    fDescriptionStates(Form("%s/STATE_LIST", name.c_str()).c_str(), const_cast<char*>(""))
 {
     // WARNING: This exit handler is GLOBAL!
     DimServer::addExitHandler(this);
+
+    for (StateNames::const_iterator i=fStateNames.begin(); i!=fStateNames.end(); i++)
+        DistStateName(i->first, i->second.first, i->second.second);
 }
 
@@ -83 +87 @@
 {
     return new EventDim(targetstate, GetName()+"/"+name, fmt, this);
+}
+
+void StateMachineDim::DistStateName(const int state, const std::string &name, const std::string &doc)
+{
+    ostringstream out;
+    out << reinterpret_cast<char*>(fDescriptionStates.itsData);
+    out << state << ':' << name << '=' << doc << '\n';
+
+    fDescriptionStates.setData(const_cast<char*>(out.str().c_str()));
+    fDescriptionStates.updateService();
+}
+
+void StateMachineDim::AddStateName(const int state, const std::string &name, const std::string &doc)
+{
+    StateMachineImp::AddStateName(state, name, doc);
+    DistStateName(state, name, doc);
 }
 

trunk/FACT++/src/StateMachineDim.h

@@ -33 +33 @@
     static const int fVersion;   /// Version number
 
-    DimService fSrvState;        /// DimService offering fCurrentState
-    DimService fSrvVersion;      /// DimService offering fVersion
+    DimService fSrvState;          /// DimService offering fCurrentState
+    DimService fSrvVersion;        /// DimService offering fVersion
+
+    DimService fDescriptionStates; /// DimService propagating the state descriptions
 
     void exitHandler(int code);  /// Overwritten DimCommand::exitHandler.
@@ -50 +52 @@
 public:
     StateMachineDim(std::ostream &out=std::cout, const std::string &name="DEFAULT");
+
+    void AddStateName(const int state, const std::string &name, const std::string &doc="");
+    void DistStateName(const int state, const std::string &name, const std::string &doc="");
 };