Changeset 11118

Timestamp:

06/22/11 20:17:06 (13 years ago)

Author:

tbretz

Message:

Added possibility to debug data transmission to the boards.

Location:

trunk/FACT++/src

Files:

• Connection.cc (modified) (2 diffs)
• Connection.h (modified) (2 diffs)
• fadctrl.cc (modified) (8 diffs)

trunk/FACT++/src/Connection.cc

@@ -19 +19 @@
 using boost::lexical_cast;
 using ba::ip::tcp;
-
-#define DEBUG_TX
 
     // -------- Abbreviations for starting async tasks ---------
@@ -177 +175 @@
     else
     {
-#ifdef DEBUG_TX
-        ostringstream msg;
-        msg << n << " bytes successfully sent to " << URL();
-        Message(msg);
-#endif
+        if (fDebugTx)
+        {
+            ostringstream msg;
+            msg << n << " bytes successfully sent to " << URL();
+            Message(msg);
+        }
     }
 

trunk/FACT++/src/Connection.h

@@ -17 +17 @@
     std::string fAddress;
     std::string fPort;
+
+    bool fDebugTx;
 
     enum ConnectionStatus_t
@@ -107 +109 @@
     bool IsConnecting() const   { return fConnectionStatus==kConnecting;   }
 
+    void SetDebugTx(bool b=true) { fDebugTx=b; }
+
     std::string URL() const { return fAddress + ":" + fPort; }
 };

trunk/FACT++/src/fadctrl.cc

@@ -574 +574 @@
     bool fIsHexOutput;
     bool fIsDataOutput;
+    bool fDebugTx;
 
     bool CheckEventSize(size_t has, const char *name, size_t size)
@@ -840 +841 @@
             return T::kSM_FatalError;
 
-       for (BoardList::iterator i=fBoards.begin(); i!=fBoards.end(); i++)
+        for (BoardList::iterator i=fBoards.begin(); i!=fBoards.end(); i++)
             i->second.second->SetDataOutput(evt.GetBool());
+
+        return T::GetCurrentState();
+    }
+
+    int SetDebugTx(const EventImp &evt)
+    {
+        if (!CheckEventSize(evt.GetSize(), "SetDebugTx", 1))
+            return T::kSM_FatalError;
+
+        for (BoardList::iterator i=fBoards.begin(); i!=fBoards.end(); i++)
+            i->second.second->SetDebugTx(evt.GetBool());
 
         return T::GetCurrentState();
@@ -1083 +1095 @@
 
         ptr->SetEndpoint(str.str());
-        ptr->StartConnect();
+        ptr->StartConnect();
     }
 
@@ -1269 +1281 @@
         fBoards[i].second->SetHexOutput(fIsHexOutput);
         fBoards[i].second->SetDataOutput(fIsDataOutput);
+        fBoards[i].second->SetDebugTx(fDebugTx);
     }
 
@@ -1405 +1418 @@
         T::AddEvent("SET_VERBOSE", "B:1")
             (boost::bind(&StateMachineFAD::SetVerbosity, this, _1))
-            ("set verbosity state"
+            ("Set verbosity state"
              "|verbosity[bool]:disable or enable verbosity for received data (yes/no), except dynamic data");
 
         T::AddEvent("SET_HEX_OUTPUT", "B:1")
             (boost::bind(&StateMachineFAD::SetHexOutput, this, _1))
-            ("enable or disable hex output for received data"
+            ("Enable or disable hex output for received data"
              "|hexout[bool]:disable or enable hex output for received data (yes/no)");
 
@@ -1416 +1429 @@
             (boost::bind(&StateMachineFAD::SetDataOutput, this, _1))
             ("");
+
+        T::AddEvent("SET_DEBUG_TX", "B:1")
+            (boost::bind(&StateMachineFAD::SetDebugTx, this, _1))
+            ("Enable or disable the output of messages in case of successfull data transmission to the boards."
+             "|debug[bool]:disable or enable debug output for transmitted data (yes/no)");
 
         T::AddEvent("PRINT_EVENT", "S:1")
@@ -1543 +1561 @@
         fIsHexOutput = conf.Get<bool>("hex-out");
         fIsDataOutput = conf.Get<bool>("data-out");
+        fDebugTx = conf.Get<bool>("debug-tx");
 
         SetMaxMemory(conf.Get<unsigned int>("max-mem"));
@@ -1712 +1731 @@
         ("hex-out",    po_bool(),  "Enable printing contents of all printed messages also as hex data.")
         ("data-out",   po_bool(),  "Enable printing received event data.")
+        ("debug-tx",   po_bool(),  "Enable debugging of ethernet transmission.")
         ;