Changeset 10940 for trunk

Timestamp:

06/08/11 20:20:03 (13 years ago)

Author:

tbretz

Message:

Adapted to latest changes in EventBuilder; added some Dim services.

File:

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

trunk/FACT++/src/fadctrl.cc

@@ -101 +101 @@
             for (unsigned int ch=0; ch<FAD::kNumChannelsPerChip; ch++)
                 Out() << " " << setw(4) << fChannelHeader[c*FAD::kNumChannelsPerChip+ch].fStartCell;
-            Out() << endl;
         }
 
@@ -306 +305 @@
     void PostCmd(std::vector<uint16_t> cmd)
     {
+#ifdef DEBUG_TX
         ostringstream msg;
         msg << "Sending command:" << hex;
@@ -311 +311 @@
         msg << " (+ " << cmd.size()-1 << " bytes data)";
         Message(msg);
-
+#endif
         transform(cmd.begin(), cmd.end(), cmd.begin(), htons);
 
@@ -319 +319 @@
     void PostCmd(uint16_t cmd)
     {
+#ifdef DEBUG_TX
         ostringstream msg;
         msg << "Sending command:" << hex;
         msg << " 0x" << setw(4) << setfill('0') << cmd;
         Message(msg);
-
+#endif
         cmd = htons(cmd);
         PostMessage(&cmd, sizeof(uint16_t));
@@ -330 +331 @@
     void PostCmd(uint16_t cmd, uint16_t data)
     {
+#ifdef DEBUG_TX
         ostringstream msg;
         msg << "Sending command:" << hex;
@@ -335 +337 @@
         msg << " 0x" << setw(4) << setfill('0') << data;
         Message(msg);
-
+#endif
         const uint16_t d[2] = { htons(cmd), htons(data) };
         PostMessage(d, sizeof(d));
@@ -505 +507 @@
 
 // ------------------------------------------------------------------------
-/*
 #include "DimDescriptionService.h"
-
-class ConnectionDimFAD : public ConnectionFAD
-{
-private:
-
-    DimDescribedService fDimPassport;
-    DimDescribedService fDimTemperatures;
-    DimDescribedService fDimSetup;
-    DimDescribedService fDimEventHeader;
-
-    template<class T>
-        void Update(DimDescribedService &svc, const T &data) const
-    {
-        //cout << "Update: " << svc.getName() << " (" << sizeof(T) << ")" << endl;
-        svc.setData(const_cast<T*>(&data), sizeof(T));
-        svc.updateService();
-    }
-
-    void UpdateFirstHeader()
-    {
-        ConnectionFAD::UpdateFirstHeader();
-
-        const FAD::DimPassport data(fEventHeader);
-        Update(fDimPassport, data);
-    }
-
-    void UpdateEventHeader()
-    {
-        ConnectionFAD::UpdateEventHeader();
-
-        const FAD::DimTemperatures data0(fEventHeader);
-        const FAD::DimSetup        data1(fEventHeader);
-        const FAD::DimEventHeader  data2(fEventHeader);
-
-        Update(fDimTemperatures, data0);
-        Update(fDimSetup,        data1);
-        Update(fDimEventHeader,  data2);
-    }
-
-public:
-    ConnectionDimFAD(ba::io_service& ioservice, MessageImp &imp) :
-        ConnectionFAD(ioservice, imp),
-        fDimPassport    ("FAD_CONTROL/PASSPORT",     "I:1;S:2;X:1", ""),
-        fDimTemperatures("FAD_CONTROL/TEMPERATURES", "I:1;F:4",     ""),
-        fDimSetup       ("FAD_CONTROL/SETUP",        "I:2;S:12",    ""),
-        fDimEventHeader ("FAD_CONTROL/EVENT_HEADER", "C",           "")
-    {
-    }
-
-    // A B [C] [D] E [F] G H [I] J K [L] M N O P Q R [S] T U V W [X] Y Z
-};
-*/
-// ------------------------------------------------------------------------
-
 #include "EventBuilderWrapper.h"
 
@@ -569 +516 @@
 {
 private:
-    typedef pair<string, ConnectionFAD*>    Connection;
-    typedef pair<const uint8_t, Connection> Board;
-    typedef map<uint8_t, Connection>        BoardList;
+    typedef pair<tcp::endpoint, ConnectionFAD*> Connection;
+    typedef vector<Connection>            BoardList;
 
     BoardList fBoards;
@@ -593 +539 @@
     {
         for (BoardList::iterator i=fBoards.begin(); i!=fBoards.end(); i++)
-            i->second.second->Cmd(command);
+            i->second->Cmd(command);
 
         return T::GetCurrentState();
@@ -604 +550 @@
 
         for (BoardList::iterator i=fBoards.begin(); i!=fBoards.end(); i++)
-            i->second.second->Cmd(command, evt.GetBool());
+            i->second->Cmd(command, evt.GetBool());
 
         return T::GetCurrentState();
@@ -641 +587 @@
 
         for (BoardList::iterator i=fBoards.begin(); i!=fBoards.end(); i++)
-            i->second.second->CmdSetRegister(dat[0], dat[1]);
+            i->second->CmdSetRegister(dat[0], dat[1]);
 
         return T::GetCurrentState();
@@ -659 +605 @@
 
         for (BoardList::iterator i=fBoards.begin(); i!=fBoards.end(); i++)
-            i->second.second->CmdSetRoi(dat[0], dat[1]);
+            i->second->CmdSetRoi(dat[0], dat[1]);
 
         return T::GetCurrentState();
@@ -675 +621 @@
 
         for (BoardList::iterator i=fBoards.begin(); i!=fBoards.end(); i++)
-            i->second.second->CmdSetDacValue(dat[0], dat[1]);
+            i->second->CmdSetDacValue(dat[0], dat[1]);
 
         return T::GetCurrentState();
@@ -684 +630 @@
         for (int nn=0; nn<n; nn++)
             for (BoardList::iterator i=fBoards.begin(); i!=fBoards.end(); i++)
-                i->second.second->Cmd(FAD::kCmdSingleTrigger);
+                i->second->Cmd(FAD::kCmdSingleTrigger);
 
         return T::GetCurrentState();
@@ -705 +651 @@
 
         for (BoardList::iterator i=fBoards.begin(); i!=fBoards.end(); i++)
-            i->second.second->Cmd(FAD::kCmdRun, start);
+            i->second->Cmd(FAD::kCmdRun, start);
 
         return T::GetCurrentState();
@@ -716 +662 @@
 
         for (BoardList::iterator i=fBoards.begin(); i!=fBoards.end(); i++)
-            i->second.second->CmdPhaseShift(evt.GetShort());
+            i->second->CmdPhaseShift(evt.GetShort());
 
         return T::GetCurrentState();
@@ -735 +681 @@
 
         for (BoardList::iterator i=fBoards.begin(); i!=fBoards.end(); i++)
-            i->second.second->CmdSetTriggerRate(evt.GetUInt());
+            i->second->CmdSetTriggerRate(evt.GetUInt());
 
         return T::GetCurrentState();
@@ -756 +702 @@
 
         for (BoardList::iterator i=fBoards.begin(); i!=fBoards.end(); i++)
-            i->second.second->CmdSetRunNumber(num);
+            i->second->CmdSetRunNumber(num);
 
         return T::GetCurrentState();
@@ -779 +725 @@
 
         for (BoardList::iterator i=fBoards.begin(); i!=fBoards.end(); i++)
-            i->second.second->SetVerbose(evt.GetBool());
+            i->second->SetVerbose(evt.GetBool());
 
         return T::GetCurrentState();
@@ -790 +736 @@
 
         for (BoardList::iterator i=fBoards.begin(); i!=fBoards.end(); i++)
-            i->second.second->SetHexOutput(evt.GetBool());
+            i->second->SetHexOutput(evt.GetBool());
 
         return T::GetCurrentState();
@@ -801 +747 @@
 
        for (BoardList::iterator i=fBoards.begin(); i!=fBoards.end(); i++)
-            i->second.second->SetDataOutput(evt.GetBool());
-
-        return T::GetCurrentState();
-    }
-
-    const BoardList::iterator GetSlot(int slot)
-    {
-        const BoardList::iterator i = fBoards.find(slot);
-        if (i!=fBoards.end())
-            return i;
-
-        ostringstream str;
-        str << "Slot " << slot << " not found.";
-        T::Warn(str.str());
-        return fBoards.end();
+            i->second->SetDataOutput(evt.GetBool());
+
+        return T::GetCurrentState();
     }
 
@@ -822 +756 @@
         const string addr = Tools::Trim(evt.GetText());
 
+        const tcp::endpoint endpoint = GetEndpoint(addr);
+        if (endpoint==tcp::endpoint())
+            return T::GetCurrentState();
+
         for (BoardList::const_iterator i=fBoards.begin(); i!=fBoards.end(); i++)
         {
-            if (i->second.first==addr)
+            if (i->first==endpoint)
             {
                T::Warn("Address "+addr+" already known.... ignored.");
@@ -831 +769 @@
         }
 
-        AddEndpoint(addr);
+        AddEndpoint(endpoint);
 
         return T::GetCurrentState();
@@ -843 +781 @@
         const int16_t slot = evt.GetShort();
 
-        const BoardList::iterator v = GetSlot(slot);
-        if (v!=fBoards.end())
-        {
-            delete v->second.second;
-            fBoards.erase(v);
-        }
+        if (fBoards[slot].first==tcp::endpoint())
+        {
+            ostringstream str;
+            str << "Slot " << slot << " not found.";
+            T::Warn(str.str());
+            return T::GetCurrentState();
+        }
+
+        delete fBoards[slot].second;
+        fBoards[slot] = make_pair(tcp::endpoint(), (ConnectionFAD*)NULL);
 
         return T::GetCurrentState();
@@ -855 +797 @@
     int ListSlots()
     {
-        for (BoardList::const_iterator i=fBoards.begin(); i!=fBoards.end(); i++)
-        {
+        for (int i=0; i<40; i++)
+        {
+            if (fBoards[i].first==tcp::endpoint())
+                continue;
+
             ostringstream str;
-            str << "Slot " << setw(2) << (int)i->first << ": " << i->second.first;
-
-            const ConnectionFAD *c = i->second.second;
+            str << "Slot " << setw(2) << i << ": " << fBoards[i].first;
+
+            const ConnectionFAD *c = fBoards[i].second;
 
             if (c->IsConnecting())
@@ -872 +817 @@
             }
 
-            switch (fStatus2[i->first])
+            switch (fStatus2[i])
             {
             case 0:  str << "1-7:not connected)"; break;
-            case 7:  str << "1-7:connected)";    break;
-            default: str << "1-7:connecting [" << fStatus2[i->first] << "])";   break;
+            case 7:  str << "1-7:connected)";     break;
+            default: str << "1-7:connecting [" << fStatus2[i] << "])"; break;
             }
 
@@ -892 +837 @@
     }
 
-    void EnableSlot(BoardList::iterator i, bool enable=true)
-    {
-        if (i==fBoards.end())
+    void EnableSlot(int i, bool enable=true)
+    {
+        if (fBoards[i].first==tcp::endpoint())
             return;
 
-        ConnectionFAD* &ptr = i->second.second;
+        ConnectionFAD* &ptr = fBoards[i].second;
+        if (!ptr)
+            return;
 
         if (!enable)
@@ -903 +850 @@
         else
         {
-            ptr->SetEndpoint(i->second.first);
+            ostringstream str;
+            str << fBoards[i].first;
+            ptr->SetEndpoint(str.str());
             ptr->StartConnect();
         }
@@ -910 +859 @@
     void EnableAll(bool enable=true)
     {
-        for (BoardList::iterator i=fBoards.begin(); i!=fBoards.end(); i++)
+        for (int i=0; i<40; i++)
             EnableSlot(i, enable);
     }
-
-    /*
-    int Enable(const EventImp &evt)
-    {
-        if (!CheckEventSize(evt.GetSize(), "Enable", 3))
-            return T::kSM_FatalError;
-
-        const int16_t slot   = evt.GetShort();
-        const bool    enable = evt.GetText()[2]>0;
-
-        if (slot<0)
-        {
-            EnableAll(enable);
-            return T::GetCurrentState();
-        }
-
-        EnableSlot(GetSlot(slot), enable);
-
-        return T::GetCurrentState();
-    }*/
 
     int Disconnect()
@@ -941 +870 @@
     }
 
+    int ForceDisconnect()
+    {
+        Abort();
+        EnableAll(false);
+        return T::GetCurrentState();
+    }
+
+    int CloseOpenFiles()
+    {
+        EventBuilderWrapper::CloseOpenFiles();
+        return T::GetCurrentState();
+    }
+
     int Connect()
     {
-        vector<string> addr;
-
-        for (BoardList::const_iterator i=fBoards.begin(); i!=fBoards.end(); i++)
-            addr.push_back(i->second.first);
+        vector<tcp::endpoint> addr(40);
+
+        for (int i=0; i<40; i++)
+            addr[i] = fBoards[i].first;
 
         Start(addr);
@@ -952 +894 @@
 
         return T::GetCurrentState();
-   }
-
-    /*
-    int Reconnect(const EventImp &evt)
-    {
-        if (!CheckEventSize(evt.GetSize(), "Reconnect", 2))
-            return T::kSM_FatalError;
-
-        const int16_t slot = evt.GetShort();
-
-        if (slot<0)
-        {
-            // Close all connections to supress the warning in SetEndpoint
-            for (BoardList::const_iterator i=fBoards.begin(); i!=fBoards.end(); i++)
-                i->second.second->PostClose(false);
-
-            // Now wait until all connection have been closed and
-            // all pending handlers have been processed
-            poll();
-
-            // Now we can reopen the connection
-            for (BoardList::const_iterator i=fBoards.begin(); i!=fBoards.end(); i++)
-                i->second.second->PostClose(true);
-
-            return T::GetCurrentState();
-        }
-
-        const BoardList::const_iterator v = GetSlot(slot);
-        if (v==fBoards.end())
-            return T::GetCurrentState();
-
-        // Close all connections to supress the warning in SetEndpoint
-        v->second.second->PostClose(false);
-
-        // Now wait until all connection have been closed and
-        // all pending handlers have been processed
-        poll();
-
-        // Now we can reopen the connection
-        v->second.second->PostClose(true);
-
-        return T::GetCurrentState();
-    }*/
-
-    virtual void UpdateConnectionStatus()
-    {
-        //cout << "Connection Status changed prop to Dim." << endl;
-    }
-
-    vector<char> fStatus1;
-    vector<char> fStatus2;
+    }
+
+    vector<uint8_t> fStatus1;
+    vector<uint8_t> fStatus2;
 
     int Execute()
@@ -1020 +915 @@
         uint16_t nconnected2  = 0;
 
-        vector<char> stat1(40);
-        vector<char> stat2(40);
-
-        int cnt = 0;
-        for (BoardList::const_iterator i=fBoards.begin(); i!=fBoards.end(); i++)
-        {
-            const ConnectionFAD &c = *i->second.second;
-
+        vector<uint8_t> stat1(40);
+        vector<uint8_t> stat2(40);
+
+        int cnt = 0; // counter for enbled board
+
+        for (int idx=0; idx<40; idx++)
+        {
             // ----- Command socket -----
-            if (c.IsConnecting())
+            if (fBoards[idx].first!=tcp::endpoint())
             {
-                stat1[i->first] = 1;
-                nconnecting1++;
+                const ConnectionFAD *c = fBoards[idx].second;
+                if (c->IsConnecting())
+                {
+                    stat1[idx] = 1;
+                    nconnecting1++;
+                }
+                if (c->IsConnected())
+                {
+                    stat1[idx] = 2;
+                    nconnected1++;
+                }
+
+                cnt++;
             }
-            if (c.IsConnected())
-            {
-                stat1[i->first] = 2;
-                nconnected1++;
-            }
 
             // ----- Event builder -----
-            stat2[i->first] = GetNumConnected(cnt);
-
-            if (!IsConnected(cnt) && !IsDisconnected(cnt))
+            stat2[idx] = GetNumConnected(idx);
+
+            if (!IsConnected(idx) && !IsDisconnected(idx))
                 nconnecting2++;
 
-            if (IsConnected(cnt))
+            if (IsConnected(idx))
                 nconnected2++;
         }
@@ -1056 +956 @@
             fStatus1 = stat1;
             fStatus2 = stat2;
-            UpdateConnectionStatus();
+            UpdateConnectionStatus(stat1, stat2);
         }
 
@@ -1064 +964 @@
         // event builder:
 
-        if (nconnected1==fBoards.size() && nconnected2==fBoards.size())
+       // FIXME: Evaluate event builder status
+         if (nconnected1==cnt && nconnected2==cnt && cnt>0)
             return FAD::kConnected;
 
-        if (nconnected1==0 && nconnected2==0)
-            return IsThreadRunning() ? FAD::kDisconnected : FAD::kOffline;
-
-        // FIXME: Evaluate event builder status
-        return FAD::kConnecting;
-    }
-
-    void AddEndpoint(const string &addr)
-    {
-        if (fBoards.size()==40)
+        if (nconnected1!=0 || nconnected2!=0)
+            return FAD::kConnecting;
+
+        // nconnected1 == nconnected2 == 0
+        return IsThreadRunning() ? FAD::kDisconnected : FAD::kOffline;
+    }
+
+    void AddEndpoint(const tcp::endpoint &addr)
+    {
+        int i=0;
+        while (i<40)
+        {
+            if (fBoards[i].first==tcp::endpoint())
+                break;
+            i++;
+        }
+
+        if (i==40)
         {
             T::Warn("Not more than 40 slots allowed.");
             return;
-        }
-
-        int i=0;
-        while (1)
-        {
-            const BoardList::const_iterator v = fBoards.find(i);
-            if (v==fBoards.end())
-                break;
-            i++;
         }
 
@@ -1098 +998 @@
 
 
+    DimDescribedService fDimConnection;
+ /*
+    template<class T>
+        void Update(DimDescribedService &svc, const T &data) const
+    {
+        //cout << "Update: " << svc.getName() << " (" << sizeof(T) << ")" << endl;
+        svc.setData(const_cast<T*>(&data), sizeof(T));
+        svc.updateService();
+    }
+ */
+    void UpdateConnectionStatus(const vector<uint8_t> &stat1, const vector<uint8_t> &stat2)
+    {
+        vector<uint8_t> stat(40);
+
+        for (int i=0; i<40; i++)
+            stat[i] = stat1[i]+stat2[i];
+
+        fDimConnection.setData(stat.data(), 40);
+        fDimConnection.updateService();
+    }
 
 public:
     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)
+        fBoards(40), fStatus1(40), fStatus2(40),
+        fDimConnection("FAD_CONTROL/CONNECTIONS", "C:41", "")
     {
         // ba::io_service::work is a kind of keep_alive for the loop.
@@ -1226 +1147 @@
             ("");
 
+        T::AddEvent("FORCE_DISCONNECT", FAD::kDisconnected, FAD::kConnecting, FAD::kConnected)
+            (boost::bind(&StateMachineFAD::ForceDisconnect, this))
+            ("");
+
+        T::AddEvent("CLOSE_OPEN_FILES", FAD::kConnecting, FAD::kConnected)
+            (boost::bind(&StateMachineFAD::CloseOpenFiles, this))
+            ("");
+
         T::AddEvent("TEST", "S:1")
             (boost::bind(&StateMachineFAD::Test, this, _1))
@@ -1246 +1175 @@
     {
         for (BoardList::const_iterator i=fBoards.begin(); i!=fBoards.end(); i++)
-            delete i->second.second;
+            delete i->second;
         fBoards.clear();
+    }
+
+    tcp::endpoint GetEndpoint(const string &base)
+    {
+        const size_t p0 = base.find_first_of(':');
+        const size_t p1 = base.find_last_of(':');
+
+        if (p0==string::npos || p0!=p1)
+        {
+           T::Out() << kRed << "GetEndpoint - Wrong format ('host:port' expected)" << endl;
+           return tcp::endpoint();
+        }
+
+        tcp::resolver resolver(get_io_service());
+
+        boost::system::error_code ec;
+
+        const tcp::resolver::query query(base.substr(0, p0), base.substr(p0+1));
+        const tcp::resolver::iterator iterator = resolver.resolve(query, ec);
+
+        if (ec)
+        {
+           T::Out() << kRed << "GetEndpoint - Couldn't resolve endpoint '" << base << "': " << ec.message();
+           return tcp::endpoint();
+        }
+
+        return *iterator;
     }
 
@@ -1259 +1215 @@
 
         // vvvvv for debugging vvvvv
-        if (conf.Has("debug-port"))
-        {
-            const int port = conf.Get<unsigned int>("debug-port");
-            const int num  = conf.Get<unsigned int>("debug-num");
+        if (conf.Has("debug-addr"))
+        {
+            const string addr = conf.Get<string>("debug-addr");
+            const int    num  = conf.Get<unsigned int>("debug-num");
+
+            const tcp::endpoint endpoint = GetEndpoint(addr);
+            if (endpoint==tcp::endpoint())
+                return false;
+
             for (int i=0; i<num; i++)
-            {
-                ostringstream str;
-                str << "localhost:" << port+8*i;
-                AddEndpoint(str.str());
-            }
+                AddEndpoint(tcp::endpoint(endpoint.address(), endpoint.port()+8*i));
+
             Connect();
             return true;
@@ -1284 +1242 @@
             const string base = conf.Get<string>("base-addr");
 
-            const size_t p0 = base.find_first_of(':');
-            const size_t p1 = base.find_last_of(':');
-
-            if (p0==string::npos || p0!=p1)
-            {
-                T::Out() << kRed << "SetConfiguration - Wrong format of argument --base-addr ('host:port' expected)" << endl;
+            const tcp::endpoint endpoint = GetEndpoint(base);
+            if (endpoint==tcp::endpoint())
                 return false;
-            }
-
-            tcp::resolver resolver(get_io_service());
-
-            boost::system::error_code ec;
-
-            const tcp::resolver::query query(base.substr(0, p0), base.substr(p0+1));
-            const tcp::resolver::iterator iterator = resolver.resolve(query, ec);
-
-            if (ec)
-            {
-               T::Out() << " " << ec.message() << " (" << ec << ")";
-               return false;
-            }
-
-            const tcp::endpoint endpoint = *iterator;
 
             const ba::ip::address_v4::bytes_type ip = endpoint.address().to_v4().to_bytes();
@@ -1316 +1254 @@
             }
 
-            for (int crate=0; crate<2; crate++)
+            for (int crate=0; crate<4; crate++)
                 for (int board=0; board<10; board++)
                 {
-                    //if (crate==0 && board==2)
-                    //    continue;
-
-                    ostringstream str;
-                    str << (int)ip[0] << "." << (int)ip[1] << ".";
-                    str << (int)(ip[2]+crate) << "." << (int)(ip[3]+board) << ":";
-                    str << endpoint.port();
-
-                    AddEndpoint(str.str());
+                    ba::ip::address_v4::bytes_type target = endpoint.address().to_v4().to_bytes();
+                    target[2] += crate;
+                    target[3] += board;
+
+                    AddEndpoint(tcp::endpoint(ba::ip::address_v4(target), endpoint.port()));
                 }
         }
@@ -1335 +1269 @@
             const vector<string> addrs = conf.Get<vector<string>>("addr");
             for (vector<string>::const_iterator i=addrs.begin(); i<addrs.end(); i++)
-                AddEndpoint(*i);
+            {
+                const tcp::endpoint endpoint = GetEndpoint(*i);
+                if (endpoint==tcp::endpoint())
+                    return false;
+
+                AddEndpoint(endpoint);
+            }
         }
 
@@ -1446 +1386 @@
     po::options_description connect("FAD connection options");
     connect.add_options()
-        ("addr",       vars<string>(),     "Network address of FAD")
-        ("base-addr",  var<string>(),      "Base address of all FAD")
-        ("debug-num,n",  var<unsigned int>(40),  "Sets the number of fake boards to be connected locally")
-        ("debug-port,p", var<unsigned int>(),    "Sets <debug-num> addresses to 'localhost:<debug-port>' in steps of 8")
+        ("addr",        vars<string>(),     "Network address of FAD")
+        ("base-addr",   var<string>(),      "Base address of all FAD")
+        ("debug-num,n", var<unsigned int>(40),  "Sets the number of fake boards to be connected locally")
+        ("debug-addr",  var<string>(),    "")
         ;