Changeset 10606 for trunk

Timestamp:

05/06/11 09:52:22 (13 years ago)

Author:

tbretz

Message:

Added support for boost 1.42 even with gcc 4.5; added many new commands; added FTM_COUNTROL/COUNTER

File:

• trunk/FACT++/src/ftmctrl.cc (modified) (28 diffs)

trunk/FACT++/src/ftmctrl.cc

@@ -1 +1 @@
 #include <boost/bind.hpp>
 #include <boost/array.hpp>
+#if BOOST_VERSION<1440
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 4))
+#undef BOOST_HAS_RVALUE_REFS
+#error test
+#endif
+#endif
 #include <boost/thread.hpp>
 #include <boost/asio/error.hpp>
@@ -18 +24 @@
 #include "LocalControl.h"
 #include "HeadersFTM.h"
+
 
 namespace ba = boost::asio;
@@ -61 +68 @@
     // ...
 
+protected:
     map<uint16_t, int> fCounter;
 
-protected:
     FTM::Header      fHeader;
     FTM::FtuList     fFtuList;
@@ -138 +145 @@
     }
 
+    virtual void UpdateCounter()
+    {
+        if (!fIsVerbose)
+            return;
+
+        if (!fIsDynamicOut)
+            return;
+
+        Out() << "Received: ";
+        Out() << "H=" << fCounter[kHeader] << "  ";
+        Out() << "S=" << fCounter[kStaticData] << "  ";
+        Out() << "D=" << fCounter[kDynamicData] << "  ";
+        Out() << "F=" << fCounter[kFtuList] << "  ";
+        Out() << "E=" << fCounter[kError] << "  ";
+        Out() << "R=" << fCounter[kRegister] << endl;
+    }
+
 private:
     void HandleReceivedData(const bs::error_code& err, size_t bytes_received, int /*type*/)
     {
+        cout << "Data received " << err << " " << bytes_received << endl;
+
         // Do not schedule a new read if the connection failed.
         if (bytes_received==0 || err)
@@ -205 +231 @@
                 UpdateFirstHeader();
 
+            UpdateCounter();
             UpdateHeader();
 
@@ -254 +281 @@
 
             fCounter[fHeader.fType]++;
+            UpdateCounter();
+
+            cout << "TYPE=" << fHeader.fType << endl;
 
             switch (fHeader.fType)
@@ -263 +293 @@
 
             case kStaticData:
+                cout << fBuffer.size() << " " << sizeof(fStaticData) << endl;
                 fStaticData = fBuffer;
                 UpdateStaticData();
-            break;
+                break;
 
             case kDynamicData:
@@ -416 +447 @@
 public:
     ConnectionFTM(ba::io_service& ioservice, MessageImp &imp) : Connection(ioservice, imp()),
-        fIsVerbose(true), fIsDynamicOut(false), fIsHexOutput(false)
+        fIsVerbose(true), fIsDynamicOut(true), fIsHexOutput(true)
     {
         SetLogStream(&imp);
@@ -512 +543 @@
     }
 
+    void SetHexOutput(bool b)
+    {
+        fIsHexOutput = b;
+    }
+
+    void SetDynamicOut(bool b)
+    {
+        fIsDynamicOut = b;
+    }
+
     bool LoadStaticData(string name)
     {
@@ -536 +577 @@
         fStaticData = data;
 
-        CmdSendStatDat();
+        for (int i=0; i<100; i++)
+            CmdSendStatDat();
 
         return true;
@@ -557 +599 @@
     bool SetThreshold(int32_t patch, int32_t value)
     {
-
         if (patch>159)
             return false;
@@ -566 +607 @@
         if (patch<0)
         {
+            bool ident = true;
+            for (int i=0; i<160; i++)
+                if (fStaticData[i/4].fDAC[patch%4] != value)
+                {
+                    ident = false;
+                    break;
+                }
+
+            if (ident)
+                return;
+
             for (int i=0; i<160; i++)
                 fStaticData[i/4].fDAC[i%4] = value;
         }
         else
+        {
+            if (fStaticData[patch/4].fDAC[patch%4] == value)
+                return true;
+
             fStaticData[patch/4].fDAC[patch%4] = value;
+        }
+
+        // Maybe move to a "COMMIT" command?
+        CmdSendStatDat();
+
+        return true;
+    }
+
+    bool SetPrescaling(uint16_t value)
+    {
+        if (value>0xffff)
+            return false;
+
+
+        bool ident = true;
+        for (int i=0; i<40; i++)
+            if (fStaticData[i].fPrescaling != value)
+            {
+                ident = false;
+                break;
+            }
+
+        if (ident)
+            return true;
+
+        for (int i=0; i<40; i++)
+            fStaticData[i].fPrescaling = value;
 
         // Maybe move to a "COMMIT" command?
@@ -672 +755 @@
     DimDescribedService fDimStaticData;
     DimDescribedService fDimDynamicData;
+    DimDescribedService fDimCounter;
 
     template<class T>
@@ -681 +765 @@
     }
 
-    virtual void UpdateFirstHeader()
+    void UpdateFirstHeader()
     {
         ConnectionFTM::UpdateFirstHeader();
@@ -689 +773 @@
     }
 
-    virtual void UpdateHeader()
+    void UpdateHeader()
     {
         ConnectionFTM::UpdateHeader();
@@ -697 +781 @@
     }
 
-    virtual void UpdateFtuList()
+    void UpdateFtuList()
     {
         ConnectionFTM::UpdateFtuList();
@@ -705 +789 @@
     }
 
-    virtual void UpdateStaticData()
+    void UpdateStaticData()
     {
         ConnectionFTM::UpdateStaticData();
@@ -713 +797 @@
     }
 
-    virtual void UpdateDynamicData()
+    void UpdateDynamicData()
     {
         ConnectionFTM::UpdateDynamicData();
@@ -721 +805 @@
     }
 
-    virtual void UpdateError()
+    void UpdateError()
     {
         ConnectionFTM::UpdateError();
@@ -727 +811 @@
         const DimError data(fHeader, fError);
         Update(fDimError, data);
+    }
+
+    void UpdateCounter()
+    {
+        ConnectionFTM::UpdateCounter();
+
+        const uint32_t counter[6] =
+        {
+            fCounter[kHeader],
+            fCounter[kStaticData],
+            fCounter[kDynamicData],
+            fCounter[kFtuList],
+            fCounter[kError],
+            fCounter[kRegister],
+        };
+
+        Update(fDimCounter, counter);
     }
 
@@ -737 +838 @@
         fDimFtuList       ("FTM_CONTROL/FTU_LIST",        "X:1;X:1;S:1;C:4;X:40;C:40;C:40", NULL, 0, ""),
         fDimStaticData    ("FTM_CONTROL/STATIC_DATA",     "X:1;S:1;S:1;X:1;S:1;S:3;S:1;S:1;S:1;S:1;S:1;S:1;I:1;S:8;S:80;S:160;S:40;S:40", NULL, 0, ""),
-        fDimDynamicData   ("FTM_CONTROL/DYNAMIC_DATA",    "X:1;X:1;F:4;I:160;I:40;S:40;S:40", NULL, 0, "")
+        fDimDynamicData   ("FTM_CONTROL/DYNAMIC_DATA",    "X:1;X:1;F:4;I:160;I:40;S:40;S:40", NULL, 0, ""),
+        fDimCounter       ("FTM_CONTROL/COUNTER",         "I:6",          NULL, 0, "")
     {
     }
@@ -867 +969 @@
     }
 
+    int SetHexOutput(const EventImp &evt)
+    {
+        if (!CheckEventSize(evt.GetSize(), "SetHexOutput", 1))
+            return T::kSM_FatalError;
+
+        fFTM.SetHexOutput(evt.GetText()[0]!=0);
+
+        return T::GetCurrentState();
+    }
+
+    int SetDynamicOut(const EventImp &evt)
+    {
+        if (!CheckEventSize(evt.GetSize(), "SetDynamicOut", 1))
+            return T::kSM_FatalError;
+
+        fFTM.SetDynamicOut(evt.GetText()[0]!=0);
+
+        return T::GetCurrentState();
+    }
+
     int LoadStaticData(const EventImp &evt)
     {
@@ -966 +1088 @@
         if (!fFTM.SetTimeMarkerDelay(evt.GetInt()))
             T::Warn("SetTimeMarkerDelay -  Value out of range.");
+
+        return T::GetCurrentState();
+    }
+
+    int SetPrescaling(const EventImp &evt)
+    {
+        if (!CheckEventSize(evt.GetSize(), "SetPrescaling", 4))
+            return T::kSM_FatalError;
+
+        if (!fFTM.SetPrescaling(evt.GetInt()))
+            T::Warn("SetPrescaling -  Value out of range.");
 
         return T::GetCurrentState();
@@ -1113 +1246 @@
              "|Threshold[counts]:Threshold to be set in binary counts");
 
+        AddConfiguration("SET_PRESCALING", "I:1", kStateIdle)
+            (boost::bind(&StateMachineFTM::SetPrescaling, this, _1))
+            (""
+             "|[]:");
+
         AddConfiguration("ENABLE_FTU", "I:1;B:1", kStateIdle)
             (boost::bind(&StateMachineFTM::EnableFTU, this, _1))
@@ -1144 +1282 @@
              "|[]:");
 
+
+
+        // Load/save static data block
+        T::AddConfiguration("SAVE", "C", kStateIdle)
+            (boost::bind(&StateMachineFTM::SaveStaticData, this, _1))
+            ("Saves the static data (FTM configuration) from memory to a file"
+             "|filename[string]:Filename (can include a path), .bin is automatically added");
+
+        T::AddConfiguration("LOAD", "C", kStateIdle)
+            (boost::bind(&StateMachineFTM::LoadStaticData, this, _1))
+            ("Loads the static data (FTM configuration) from a file into memory and sends it to the FTM"
+             "|filename[string]:Filename (can include a path), .bin is automatically added");
+
+
+
+        // Verbosity commands
         T::AddConfiguration("SET_VERBOSE", "B")
             (boost::bind(&StateMachineFTM::SetVerbosity, this, _1))
@@ -1149 +1303 @@
              "|verbosity[bool]:disable or enable verbosity for received data (yes/no)");
 
-        T::AddConfiguration("SAVE", "C", kStateIdle)
-            (boost::bind(&StateMachineFTM::SaveStaticData, this, _1))
-            ("Saves the static data (FTM configuration) from memory to a file"
-             "|filename[string]:Filename (can include a path), .bin is automatically added");
-
-        T::AddConfiguration("LOAD", "C", kStateIdle)
-            (boost::bind(&StateMachineFTM::LoadStaticData, this, _1))
-            ("Loads the static data (FTM configuration) from a file into memory and sends it to the FTM"
-             "|filename[string]:Filename (can include a path), .bin is automatically added");
+        T::AddConfiguration("SET_HEX_OUTPUT", "B")
+            (boost::bind(&StateMachineFTM::SetHexOutput, this, _1))
+            ("enable or disable hex output for received data"
+             "|hexout[bool]:disable or enable hex output for verbose and received data (yes/no)");
+
+        T::AddConfiguration("SET_DYNAMIC_OUTPUT", "B")
+            (boost::bind(&StateMachineFTM::SetDynamicOut, this, _1))
+            ("enable or disable output for received dynamic data (data is still broadcasted via Dim)"
+             "|dynout[bool]:disable or enable output for dynamic data (yes/no)");
+
 
         // Conenction commands
@@ -1389 +1544 @@
         << endl;
 }
+/*
+string GetLocalIp()
+{
+    const char *kDnsIp = getenv("DIM_DNS_NODE");
+
+    struct addrinfo hints, *servinfo, *p;
+
+    memset(&hints, 0, sizeof hints);
+    hints.ai_family   = AF_INET; //AF_UNSPEC; // use AF_INET6 to force IPv6
+    hints.ai_socktype = SOCK_STREAM;
+
+    int rv;
+    if ((rv = getaddrinfo(kDnsIp, NULL, &hints, &servinfo)) != 0)
+    {
+        cout << "WARNING - getaddrinfo: " << gai_strerror(rv) << endl;
+        return kDnsIp;
+    }
+
+    // loop through all the results and connect to the first we can
+    for (p=servinfo; p; p=p->ai_next)
+    {
+        const int sock = socket(AF_INET, SOCK_DGRAM, 0);
+        if (sock==-1)
+            continue;
+
+        if (connect(sock, p->ai_addr, p->ai_addrlen)==-1)
+        {
+            cout << "WARNING - connect: " << strerror(errno) << endl;
+            close(sock);
+            continue;
+        }
+
+        sockaddr_in name;
+        socklen_t namelen = sizeof(name);
+        if (getsockname(sock, (sockaddr*)&name, &namelen)==-1)
+        {
+            cout << "WARNING - getsockname: " << strerror(errno) << endl;
+            close(sock);
+            continue;
+        }
+
+        char buffer[16];
+        if (!inet_ntop(AF_INET, &name.sin_addr, buffer, 16))
+        {
+            cout << "WARNING - inet_ntop: " << strerror(errno) << endl;
+            close(sock);
+            continue;
+        }
+
+        close(sock);
+
+        freeaddrinfo(servinfo); // all done with this structure
+
+        cout << "DIM_HOST_NODE=" << buffer << endl;
+        return buffer;
+    }
+
+    freeaddrinfo(servinfo); // all done with this structure
+    return kDnsIp;
+}
+*/
 
 int main(int argc, const char* argv[])
@@ -1434 +1650 @@
     // To allow overwriting of DIM_DNS_NODE set 0 to 1
     setenv("DIM_DNS_NODE", conf.Get<string>("dns").c_str(), 1);
+    //setenv("DIM_HOST_NODE", GetLocalIp().c_str(), 1);
 
     //try