Changeset 11126

Timestamp:

06/22/11 23:30:34 (13 years ago)

Author:

tbretz

Message:

Added EventBuilder thread status to UpdateConnectionStatus

File:

• trunk/FACT++/src/fadctrl.cc (modified) (5 diffs)

trunk/FACT++/src/fadctrl.cc

@@ -1173 +1173 @@
     }
 
+    bool            fStatusT;
     vector<uint8_t> fStatus1;
     vector<uint8_t> fStatus2;
@@ -1236 +1237 @@
         // ===== Send connection status via dim =====
 
-        if (fStatus1!=stat1 || fStatus2!=stat2)
+        if (fStatus1!=stat1 || fStatus2!=stat2 || fStatusT!=IsThreadRunning())
         {
             fStatus1 = stat1;
             fStatus2 = stat2;
-            UpdateConnectionStatus(stat1, stat2);
+            fStatusT = IsThreadRunning();
+            UpdateConnectionStatus(stat1, stat2, IsThreadRunning());
         }
 
@@ -1254 +1256 @@
             return FAD::kConnecting;
 
-//        cout << 1 << " " << nconnecting1 << " " << nconnected1 << " " << nclosed1 << endl;
-//        cout << 2 << " " << nconnecting2 << " " << nconnected2 << endl;
-
         // nconnected1 == nconnected2 == 0
         return IsThreadRunning() ? FAD::kDisconnected : FAD::kOffline;
@@ -1295 +1294 @@
     }
  */
-    void UpdateConnectionStatus(const vector<uint8_t> &stat1, const vector<uint8_t> &stat2)
-    {
-        vector<uint8_t> stat(40);
+    void UpdateConnectionStatus(const vector<uint8_t> &stat1, const vector<uint8_t> &stat2, bool thread)
+    {
+        vector<uint8_t> stat(41);
 
         for (int i=0; i<40; i++)
             stat[i] = stat1[i]+stat2[i];
 
-        fDimConnection.setData(stat.data(), 40);
+        stat[40] = thread;
+
+        fDimConnection.setData(stat.data(), 41);
         fDimConnection.updateService();
     }
@@ -1309 +1310 @@
     StateMachineFAD(ostream &out=cout) :
         T(out, "FAD_CONTROL"), EventBuilderWrapper(*static_cast<MessageImp*>(this)), ba::io_service::work(static_cast<ba::io_service&>(*this)),
-        fStatus1(40), fStatus2(40),
-        fDimConnection("FAD_CONTROL/CONNECTIONS", "C:40", "")
+        fStatus1(40), fStatus2(40), fStatusT(false),
+        fDimConnection("FAD_CONTROL/CONNECTIONS", "C:40;C:1", "")
     {
         // ba::io_service::work is a kind of keep_alive for the loop.