Changeset 13905 for trunk

Timestamp:

05/26/12 11:27:42 (12 years ago)

Author:

tbretz

Message:

Initialize callbacks in constructor; output also if dim dns not available; improved handling of dimctrl messages; handle scriptdepth

File:

• trunk/FACT++/src/smartfact.cc (modified) (12 diffs)

trunk/FACT++/src/smartfact.cc

@@ -328 +328 @@
 
     deque<string> fControlMessageHist;
+    int32_t       fControlScriptDepth;
 
     uint32_t fMcpConfigurationState;   // For consistency
@@ -377 +378 @@
     deque<float> fRateScanDataHist[41];
 
-    bool fHasError;
+    int fHasError;
 
     // ------------- Initialize variables before the Dim stuff ------------
@@ -520 +521 @@
     int HandleDimControlMessage(const EventImp &d)
     {
+        cout << "Received1: " << d.GetQoS() << endl;
+
         if (d.GetQoS()==90)
             HandleControlMessageImp(d);
@@ -528 +531 @@
     void HandleControlStateChange(const EventImp &d)
     {
-        if (d.GetQoS()==-2)
+        DimControl ctrl;
+        ctrl.Handler(d);
+
+        if (d.GetQoS()==-2 && ctrl.scriptdepth==0)
             fControlMessageHist.clear();
 
-        if (d.GetQoS()<0)
-        {
-            DimControl ctrl;
-            ctrl.Handler(d);
+        cout << "Received2: " << d.GetString() << endl;
+        cout << "Received2: " << d.GetQoS() << endl;
+
+        if (d.GetQoS()>=0)
+            return;
 
 #if BOOST_VERSION < 104600
-            const string file = boost::filesystem::path(ctrl.file).filename();
+        const string file = boost::filesystem::path(ctrl.file).filename();
 #else
-            const string file = boost::filesystem::path(ctrl.file).filename().string();
+        const string file = boost::filesystem::path(ctrl.file).filename().string();
 #endif
 
-            const string msg = ctrl.shortmsg+"<br>"+file;
-            HandleControlMessageImp(Event(d, msg.data(), msg.length()+1));
-        }
+        HandleControlMessageImp(Event(d, ctrl.shortmsg.data(), ctrl.shortmsg.length()+1));
+        HandleControlMessageImp(Event(d, file.data(), file.length()+1));
     }
 
@@ -551 +557 @@
         if (!CheckDataSize(d, "Mcp:Configuration", 16, true))
         {
-            fMcpConfigurationState     = -4;
+            fMcpConfigurationState     = -256;
             fMcpConfigurationMaxTime   = 0;
             fMcpConfigurationMaxEvents = 0;
@@ -1497 +1503 @@
         //poll_one();
 
-        if (!fDimDNS.online())
-            return kStateDimNetworkNA;
-
         Time now;
         if (now-fLastUpdate<boost::posix_time::seconds(1))
@@ -1510 +1513 @@
         ostringstream msg;
 
+        if (fHasError==2)
+            msg << "SmartFACT backend initializing." << endl;
+        if (!fDimDNS.online())
+            msg << "DIM network not available.<br/>";
         if (fDimDriveControl.state()>0xff)
             msg << "Drive in ERROR state<br/>";
@@ -1569 +1576 @@
 
         fHasError = haserror;
+
+        if (!fDimDNS.online())
+            return kStateDimNetworkNA;
 
         // ==============================================================
@@ -1845 +1855 @@
     StateMachineSmartFACT(ostream &out=cout) : StateMachineDim(out, "SMART_FACT"),
         fPath("www/smartfact/data"),
+        fControlScriptDepth(0),
         fMcpConfigurationMaxTime(0),
         fMcpConfigurationMaxEvents(0),
@@ -1855 +1866 @@
         fRateScanDataId(0),
         fRateScanBoard(0),
-        fHasError(false),
+        fHasError(2),
         // ---
         fDimMcp         ("MCP"),
@@ -1887 +1898 @@
         fDimChatServer.Subscribe(*this);
 
+        fDimControl.SetCallback(bind(&StateMachineSmartFACT::HandleControlStateChange, this, placeholders::_1));
+        fDimControl.AddCallback("dotest.dim", bind(&StateMachineSmartFACT::HandleDoTest, this, placeholders::_1));
+
         Subscribe("DIM_CONTROL/MESSAGE")
             (bind(&StateMachineSmartFACT::HandleDimControlMessage,   this, placeholders::_1));
@@ -1962 +1976 @@
 
         fPath = conf.Get<string>("path");
-
-        fDimControl.SetCallback(bind(&StateMachineSmartFACT::HandleControlStateChange, this, placeholders::_1));
-        fDimControl.AddCallback("dotest.dim", bind(&StateMachineSmartFACT::HandleDoTest, this, placeholders::_1));
 
         return -1;