Code cleanup

Removed unused members and functions. Converted a member with only two allowed values to be a bool.
cms-sw · Jul 2, 2017 · 08e0826 · 08e0826
1 parent cda1923
commit 08e0826
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 34 deletions.
diff --git a/FWCore/Framework/interface/EventProcessor.h b/FWCore/Framework/interface/EventProcessor.h
@@ -180,8 +180,8 @@ namespace edm {
     //
     StatusCode runToCompletion();
 
-    // The following functions are used by the code implementing our
-    // boost statemachine
+    // The following functions are used by the code implementing
+    // transition handling.
 
     InputSource::ItemType nextTransitionType();
     std::pair<edm::ProcessHistoryID, edm::RunNumber_t> nextRunID();
@@ -218,15 +218,12 @@ namespace edm {
     void writeLumi(ProcessHistoryID const& phid, RunNumber_t run, LuminosityBlockNumber_t lumi);
     void deleteLumiFromCache(ProcessHistoryID const& phid, RunNumber_t run, LuminosityBlockNumber_t lumi);
 
-    void readAndProcessEvent();
     bool shouldWeStop() const;
 
     void setExceptionMessageFiles(std::string& message);
     void setExceptionMessageRuns(std::string& message);
     void setExceptionMessageLumis(std::string& message);
 
-    bool alreadyHandlingException() const;
-
     bool setDeferredException(std::exception_ptr);
 
     InputSource::ItemType readAndProcessEvents();
@@ -303,12 +300,10 @@ namespace edm {
     PrincipalCache                                principalCache_;
     bool                                          beginJobCalled_;
     bool                                          shouldWeStop_;
-    std::string                                   fileMode_;
-    std::string                                   emptyRunLumiMode_;
+    bool                                          fileModeNoMerge_;
     std::string                                   exceptionMessageFiles_;
     std::string                                   exceptionMessageRuns_;
     std::string                                   exceptionMessageLumis_;
-    bool                                          alreadyHandlingException_;
     bool                                          forceLooperToEnd_;
     bool                                          looperBeginJobRun_;
     bool                                          forceESCacheClearOnNewRun_;

diff --git a/FWCore/Framework/src/EventProcessor.cc b/FWCore/Framework/src/EventProcessor.cc
@@ -238,12 +238,10 @@ namespace edm {
     principalCache_(),
     beginJobCalled_(false),
     shouldWeStop_(false),
-    fileMode_(),
-    emptyRunLumiMode_(),
+    fileModeNoMerge_(false),
     exceptionMessageFiles_(),
     exceptionMessageRuns_(),
     exceptionMessageLumis_(),
-    alreadyHandlingException_(false),
     forceLooperToEnd_(false),
     looperBeginJobRun_(false),
     forceESCacheClearOnNewRun_(false),
@@ -277,12 +275,10 @@ namespace edm {
     principalCache_(),
     beginJobCalled_(false),
     shouldWeStop_(false),
-    fileMode_(),
-    emptyRunLumiMode_(),
+    fileModeNoMerge_(false),
     exceptionMessageFiles_(),
     exceptionMessageRuns_(),
     exceptionMessageLumis_(),
-    alreadyHandlingException_(false),
     forceLooperToEnd_(false),
     looperBeginJobRun_(false),
     forceESCacheClearOnNewRun_(false),
@@ -319,12 +315,10 @@ namespace edm {
     principalCache_(),
     beginJobCalled_(false),
     shouldWeStop_(false),
-    fileMode_(),
-    emptyRunLumiMode_(),
+    fileModeNoMerge_(false),
     exceptionMessageFiles_(),
     exceptionMessageRuns_(),
     exceptionMessageLumis_(),
-    alreadyHandlingException_(false),
     forceLooperToEnd_(false),
     looperBeginJobRun_(false),
     forceESCacheClearOnNewRun_(false),
@@ -357,12 +351,10 @@ namespace edm {
     principalCache_(),
     beginJobCalled_(false),
     shouldWeStop_(false),
-    fileMode_(),
-    emptyRunLumiMode_(),
+    fileModeNoMerge_(false),
     exceptionMessageFiles_(),
     exceptionMessageRuns_(),
     exceptionMessageLumis_(),
-    alreadyHandlingException_(false),
     forceLooperToEnd_(false),
     looperBeginJobRun_(false),
     forceESCacheClearOnNewRun_(false),
@@ -402,8 +394,14 @@ namespace edm {
 
     // Now set some parameters specific to the main process.
     ParameterSet const& optionsPset(parameterSet->getUntrackedParameterSet("options", ParameterSet()));
-    fileMode_ = optionsPset.getUntrackedParameter<std::string>("fileMode", "");
-    emptyRunLumiMode_ = optionsPset.getUntrackedParameter<std::string>("emptyRunLumiMode", "");
+    auto const& fileMode = optionsPset.getUntrackedParameter<std::string>("fileMode", "FULLMERGE");
+    if(fileMode != "NOMERGE" and fileMode != "FULLMERGE") {
+        throw Exception(errors::Configuration, "Illegal fileMode parameter value: ")
+        << fileMode << ".\n"
+        << "Legal values are 'NOMERGE' and 'FULLMERGE'.\n";
+    } else {
+      fileModeNoMerge_ = (fileMode == "NOMERGE");
+    }
     forceESCacheClearOnNewRun_ = optionsPset.getUntrackedParameter<bool>("forceEventSetupCacheClearOnNewRun", false);
     //threading
     unsigned int nThreads=1;
@@ -758,7 +756,7 @@ namespace edm {
       nextItemTypeFromProcessingEvents_=InputSource::IsEvent;
       asyncStopRequestedWhileProcessingEvents_=false;
       try {
-        FilesProcessor fp(fileMode_ == std::string("NOMERGE"));
+        FilesProcessor fp(fileModeNoMerge_);
 
         convertException::wrap([&]() {
           bool firstTime = true;
@@ -1377,9 +1375,6 @@ namespace edm {
     });
   }
 
-  void EventProcessor::readAndProcessEvent() {
-    readAndProcessEvents();
-  }
   InputSource::ItemType EventProcessor::readAndProcessEvents() {
     nextItemTypeFromProcessingEvents_ = InputSource::IsEvent; //needed for looper
     asyncStopRequestedWhileProcessingEvents_ = false;
@@ -1545,10 +1540,6 @@ namespace edm {
     exceptionMessageLumis_ = message;
   }
 
-  bool EventProcessor::alreadyHandlingException() const {
-    return alreadyHandlingException_;
-  }
-
   bool EventProcessor::setDeferredException(std::exception_ptr iException) {
     bool expected =false;
     if(deferredExceptionPtrIsSet_.compare_exchange_strong(expected,true)) {

diff --git a/FWCore/Framework/test/MockEventProcessor.cc b/FWCore/Framework/test/MockEventProcessor.cc
@@ -265,7 +265,6 @@ namespace edm {
   void MockEventProcessor::setExceptionMessageRuns(std::string&) {}
   void MockEventProcessor::setExceptionMessageLumis(std::string&) {}
 
-  bool MockEventProcessor::alreadyHandlingException() const { return false; }
   bool MockEventProcessor::setDeferredException(std::exception_ptr) { return true;}
 
 }
diff --git a/FWCore/Framework/test/MockEventProcessor.h b/FWCore/Framework/test/MockEventProcessor.h
@@ -60,20 +60,19 @@ namespace edm {
     void writeLumi(ProcessHistoryID const& phid, RunNumber_t run, LuminosityBlockNumber_t lumi);
     void deleteLumiFromCache(ProcessHistoryID const& phid, RunNumber_t run, LuminosityBlockNumber_t lumi);
 
-    void readAndProcessEvent();
     bool shouldWeStop() const;
 
     void setExceptionMessageFiles(std::string& message);
     void setExceptionMessageRuns(std::string& message);
     void setExceptionMessageLumis(std::string& message);
 
-    bool alreadyHandlingException() const;
-
     InputSource::ItemType readAndProcessEvents();
 
     bool setDeferredException(std::exception_ptr);
 
   private:
+    void readAndProcessEvent();
+
     std::string mockData_;
     std::ostream & output_;
     std::istringstream input_;