Changeset 13068 for trunk/FACT++/src

Timestamp:

03/11/12 20:00:53 (13 years ago)

Author:

tbretz

Message:

Removed some old debug output when commands are issued.

Location:

trunk/FACT++/src

Files:

• DimServiceInfoList.cc (modified) (1 diff)
• StateMachineImp.cc (modified) (3 diffs)

trunk/FACT++/src/DimServiceInfoList.cc

@@ -676 +676 @@
     const string fmt = t->second.first;
 
+    // Avoid compiler warning of unused parameter
+    lout << flush;
+
     // Convert the user entered data according to the format string
     // into a data block which will be attached to the event
+#ifndef DEBUG
+    ostringstream sout;
+    const Converter conv(sout, fmt, false);
+#else
     const Converter conv(lout, fmt, false);
+#endif
     if (!conv)
         throw runtime_error("Couldn't properly parse the format... ignored.");
 
+#ifdef DEBUG
     lout << kBlue << cmd;
+#endif
     const vector<char> v = conv.GetVector(str.substr(p0));
+#ifdef DEBUG
     lout << endl;
+#endif
 
     const int rc = DimClient::sendCommand(cmd.c_str(), (void*)v.data(), v.size());

trunk/FACT++/src/StateMachineImp.cc

@@ -250 +250 @@
     // Convert the user entered data according to the format string
     // into a data block which will be attached to the event
+#ifndef DEBUG
+    ostringstream sout;
+    const Converter conv(sout, fmt, false);
+#else
     const Converter conv(lout, fmt, false);
+#endif
     if (!conv)
     {
@@ -259 +264 @@
     try
     {
+#ifdef DEBUG
         lout << kBlue << name;
+#endif
         const vector<char> v = conv.GetVector(str.substr(p0));
+#ifdef DEBUG
         lout << endl;
+#endif
 
         return PostEvent(*evt, v.data(), v.size());
@@ -313 +322 @@
     {
         Event *event = new Event(evt, ptr, siz);
-        Debug("Posted: "+event->GetName());
+        //Debug("Posted: "+event->GetName());
         PushEvent(event);
     }