Merge pull request #38805 from Dr15Jones/noLogSummaryByDefault

MessageLogger no longer prints summary by default
cms-sw · Jul 21, 2022 · de4a8cd · de4a8cd
2 parents 5984a2e + 85ab8e7
commit de4a8cd
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/FWCore/Integration/test/unit_test_outputs/testSubProcess.grep.txt b/FWCore/Integration/test/unit_test_outputs/testSubProcess.grep.txt
@@ -12,4 +12,3 @@ got data of type "edmtest::Doodad" with name "abcd" in record GadgetRcd
 ++++++++ finished: processing esmodule: label = '' type = DoodadESSource in record = GadgetRcd
 got data of type "edmtest::Doodad" with name "abc" in record GadgetRcd
 got data of type "edmtest::Doodad" with name "abc" in record GadgetRcd
-   25 Tracer               -s DoodadESSource:D                       4        4
diff --git a/FWCore/MessageService/src/ThreadSafeLogMessageLoggerScribe.cc b/FWCore/MessageService/src/ThreadSafeLogMessageLoggerScribe.cc
@@ -885,6 +885,15 @@ namespace edm {
         if (m_statisticsResets[i])
           m_statisticsDestControls[i]->wipe();
       }
+      auto dropped = m_tooManyWaitingMessagesCount.load();
+      if (m_statisticsDestControls.empty() and dropped != 0) {
+        if (m_stream_ps.find("cerr") != m_stream_ps.end()) {
+          std::cerr << "MessageLogger: dropped waiting message count " << dropped << "\n";
+        }
+        if (m_stream_ps.find("cout") != m_stream_ps.end()) {
+          std::cout << "MessageLogger: dropped waiting message count " << dropped << "\n";
+        }
+      }
     }
 
     void ThreadSafeLogMessageLoggerScribe::triggerFJRmessageSummary(std::map<std::string, double>& sm)  // ChangeLog 29

diff --git a/FWCore/MessageService/test/u20_cfg.py b/FWCore/MessageService/test/u20_cfg.py
@@ -16,6 +16,7 @@
     noTimeStamps = cms.untracked.bool(True)
 )
 process.MessageLogger.cerr.noTimeStamps = True
+process.MessageLogger.cerr.enableStatistics = True
 
 process.maxEvents = cms.untracked.PSet(
     input = cms.untracked.int32(1)

diff --git a/FWCore/ParameterSet/python/Config.py b/FWCore/ParameterSet/python/Config.py
@@ -2397,7 +2397,7 @@ def testProcessDumpPython(self):
             limit = cms.untracked.int32(10000000)
         ),
         enable = cms.untracked.bool(True),
-        enableStatistics = cms.untracked.bool(True),
+        enableStatistics = cms.untracked.bool(False),
         lineLength = cms.optional.untracked.int32,
         noLineBreaks = cms.optional.untracked.bool,
         noTimeStamps = cms.untracked.bool(False),

diff --git a/FWCore/ParameterSet/python/MessageLogger.py b/FWCore/ParameterSet/python/MessageLogger.py
@@ -61,7 +61,7 @@
     default = _default_pset.clone(),
     cerr = _destination_base.clone(
         enable = untracked.bool(True),
-        enableStatistics = untracked.bool(True),
+        enableStatistics = untracked.bool(False),
         resetStatistics = untracked.bool(False),
         statisticsThreshold = untracked.string('WARNING'),
         INFO = untracked.PSet(