Changeset 11359

Timestamp:

07/12/11 13:12:01 (13 years ago)

Author:

tbretz

Message:

Implemented a solution to solve a multi-threading issue in factOut; added the possibility to allow output of kDebug messages coming from the event builder.

File:

• trunk/FACT++/src/EventBuilderWrapper.h (modified) (8 diffs)

trunk/FACT++/src/EventBuilderWrapper.h

@@ -197 +197 @@
 
 public:
-    DataFileRaw(uint32_t id) : DataFileImp(id)  { }
+    DataFileRaw(uint32_t id) : DataFileImp(id), fPosTail(0) { }
     ~DataFileRaw() { Close(); }
 
@@ -751 +751 @@
     bool fDebugStream;
     bool fDebugRead;
+    bool fDebugLog;
 
     int Write(const Time &time, const std::string &txt, int qos)
@@ -798 +799 @@
         fDimStatistics1 ("FAD_CONTROL/STATISTICS1",      "I:3;I:2;X:4;I:3;I:1;I:2;C:40;I:40;I:40;X:40", ""),
         fDimStatistics2 ("FAD_CONTROL/STATISTICS2",      "I:1;I:280;X:40;I:40;I:4;I:4;I:2;I:2;I:3;C:40",  ""),
-        fDebugStream(false), fDebugRead(false)
+        fDebugStream(false), fDebugRead(false), fDebugLog(false)
     {
         if (This)
@@ -851 +852 @@
             return;
         }
+
+        fLastMessage.clear();
 
         for (size_t i=0; i<40; i++)
@@ -974 +977 @@
 
     void SetOutputFormat(FileFormat_t f) { fFileFormat = f; }
+
+    void SetDebugLog(bool b) { fDebugLog = b; }
 
     void SetDebugStream(bool b)
@@ -1332 +1337 @@
     }
 
+    map<boost::thread::id, string> fLastMessage;
+
     void factOut(int severity, int err, const char *message)
     {
-        // FIXME: Make the output to the console stream thread-safe
+        if (!fDebugLog && severity==99)
+            return;
+
         ostringstream str;
+        //str << boost::this_thread::get_id() << " ";
         str << "EventBuilder(";
         if (err<0)
@@ -1343 +1353 @@
         str << "): " << message;
 
-        static string last;
-        if (str.str()==last)
+        string &old = fLastMessage[boost::this_thread::get_id()];
+
+        if (str.str()==old)
             return;
-
-        last = str.str();
+        old = str.str();
+
         fMsg.Update(str, severity);
     }
@@ -1705 +1716 @@
     void factOut(int severity, int err, const char *message)
     {
-        if (severity!=99)
-            EventBuilderWrapper::This->factOut(severity, err, message);
+        EventBuilderWrapper::This->factOut(severity, err, message);
     }