Changeset 10784

Timestamp:

05/23/11 15:09:50 (13 years ago)

Author:

tbretz

Message:

Added some code to redirect error output to fadctrl (still commented); replaces stringstream by ostringstream where needed.

Location:

trunk/FACT++/src

Files:

• EventBuilder.h (modified) (1 diff)
• fadctrl.cc (modified) (14 diffs)

trunk/FACT++/src/EventBuilder.h

@@ -35 +35 @@
 extern uint gp_EvtTot   ;
 
+//#define error Error
+//extern void Error(int severity, int errnum, const char *fmt, ...);
+
 #ifdef __cplusplus
 }

trunk/FACT++/src/fadctrl.cc

@@ -103 +103 @@
                 err!=ba::error::basic_errors::operation_aborted)  // Connection closed by us
             {
-                stringstream str;
+                ostringstream str;
                 str << "Reading from " << URL() << ": " << err.message() << " (" << err << ")";// << endl;
                 Error(str);
@@ -117 +117 @@
             if (fEventHeader.fStartDelimiter!=FAD::kDelimiterStart)
             {
-                stringstream str;
+                ostringstream str;
                 str << "Invalid header received: start delimiter wrong, received ";
                 str << hex << fEventHeader.fStartDelimiter << ", expected " << FAD::kDelimiterStart << ".";
@@ -140 +140 @@
         if (ntohs(fBuffer.back())!=FAD::kDelimiterEnd)
         {
-            stringstream str;
+            ostringstream str;
             str << "Invalid data received: end delimiter wrong, received ";
             str << hex << ntohs(fBuffer.back()) << ", expected " << FAD::kDelimiterEnd << ".";
@@ -231 +231 @@
         if (error && error!=ba::error::basic_errors::operation_aborted)
         {
-            stringstream str;
+            ostringstream str;
             str << "Read timeout of " << URL() << ": " << error.message() << " (" << error << ")";// << endl;
             Error(str);
@@ -261 +261 @@
     void PostCmd(std::vector<uint16_t> cmd)
     {
-        stringstream msg;
+        ostringstream msg;
         msg << "Sending command:" << hex;
         msg << " 0x" << setw(4) << setfill('0') << cmd[0];
@@ -273 +273 @@
     void PostCmd(uint16_t cmd)
     {
-        stringstream msg;
+        ostringstream msg;
         msg << "Sending command:" << hex;
         msg << " 0x" << setw(4) << setfill('0') << cmd;
@@ -284 +284 @@
     void PostCmd(uint16_t cmd, uint16_t data)
     {
-        stringstream msg;
+        ostringstream msg;
         msg << "Sending command:" << hex;
         msg << " 0x" << setw(4) << setfill('0') << cmd;
@@ -589 +589 @@
 class EventBuilderWrapper
 {
+public:
+    // FIXME
+    static EventBuilderWrapper *This;
+
+private:
     boost::thread fThread;
 
@@ -609 +614 @@
     EventBuilderWrapper(MessageImp &msg) : fMsg(msg)
     {
+        if (This)
+            throw runtime_error("EventBuilderWrapper cannot be instantiated twice.");
+
+        This = this;
         Start();
+    }
+
+    void Update(ostringstream &out, int severity)
+    {
+        fMsg.Update(out, severity);
     }
 
@@ -672 +686 @@
         Abort();
     }
-
 };
+/*
+extern "C" {
+
+void Error(int severity, int errnum, const char *fmt, ...)
+{
+    va_list ap;
+    va_start(ap, fmt);
+
+    int n=256;
+
+    char *ret=0;
+    while (1)
+    {
+        ret = new char[n+1];
+
+        const int sz = vsnprintf(ret, n, fmt, ap);
+        if (sz<=n)
+            break;
+
+        n *= 2;
+        delete [] ret;
+    };
+
+    va_end(ap);
+
+    ostringstream str;
+    str << ret << " (" << errnum << ":" << strerror(errnum) << ")";
+
+    delete [] ret;
+
+    EventBuilderWrapper::This->Update(str, severity);
+}
+
+}
+*/
+
+EventBuilderWrapper *EventBuilderWrapper::This = 0;
 
 // ------------------------------------------------------------------------
@@ -696 +746 @@
             return true;
 
-        stringstream msg;
+        ostringstream msg;
         msg << name << " - Received event has " << has << " bytes, but expected " << size << ".";
         T::Fatal(msg);
@@ -725 +775 @@
         if (dat[0]>FAD::kMaxRegAddr)
         {
-            stringstream msg;
+            ostringstream msg;
             msg << hex << "Address " << dat[0] << " out of range, max=" << maxaddr << ".";
             T::Error(msg);
@@ -733 +783 @@
         if (dat[1]>FAD::kMaxRegValue)
         {
-            stringstream msg;
+            ostringstream msg;
             msg << hex << "Value " << dat[1] << " out of range, max=" << maxval << ".";
             T::Error(msg);
@@ -840 +890 @@
         if (evt.GetUShort()>0xff)
         {
-            stringstream msg;
+            ostringstream msg;
             msg << hex << "Value " << evt.GetUShort() << " out of range, max=" << 0xff << "(?)";
             T::Error(msg);