Merge pull request #10951 from wmtan/TriggerResultsBasedEventSelector…

…Cleanup Thread Safety: Remove unneeded state from TriggerResultsBasedEventSelector
cms-sw · Aug 30, 2015 · fc6792e · fc6792e
2 parents 6efd44f + 4ca2385
commit fc6792e
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 178 deletions.
diff --git a/FWCore/Framework/interface/TriggerResultsBasedEventSelector.h b/FWCore/Framework/interface/TriggerResultsBasedEventSelector.h
@@ -18,91 +18,50 @@
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
-namespace edm
-{
+namespace edm {
   class ModuleCallingContext;
 
-  namespace detail
-  {
+  namespace detail {
     typedef edm::Handle<edm::TriggerResults> handle_t;
 
-    class NamedEventSelector
-    {
+    class NamedEventSelector {
     public:
       NamedEventSelector(std::string const& n, EventSelector const& s) :
-	inputTag_("TriggerResults", "", n), 
-	eventSelector_(s), 
-	product_() 
+	inputTag_("TriggerResults", "", n),
+	eventSelector_(s)
       { }
 
-      void fill(EventPrincipal const& e, ModuleCallingContext const* mcc);
-
-      bool match()
-      {
-	return eventSelector_.acceptEvent(*product_);
+      bool match(TriggerResults const& product) {
+	return eventSelector_.acceptEvent(product);
       }
 
-      handle_t product() const
-      {
-	return product_;
+      InputTag const& inputTag() const {
+        return inputTag_;
       }
 
-      void clear()
-      {
-	product_ = handle_t();
-      }
-
     private:
       InputTag            inputTag_;
       EventSelector       eventSelector_;
-      handle_t            product_;
     };
 
-    class TriggerResultsBasedEventSelector
-    {
+    class TriggerResultsBasedEventSelector {
     public:
       TriggerResultsBasedEventSelector();
       typedef detail::handle_t                    handle_t;
       typedef std::vector<NamedEventSelector>     selectors_t;
-      typedef selectors_t::size_type              size_type;
       typedef std::pair<std::string, std::string> parsed_path_spec_t;
 
       void setupDefault(std::vector<std::string> const& triggernames);
-      
+
       void setup(std::vector<parsed_path_spec_t> const& path_specs,
 		 std::vector<std::string> const& triggernames,
                  const std::string& process_name);
 
       bool wantEvent(EventPrincipal const& e, ModuleCallingContext const*);
 
-      // Clear the cache
-      void clear();
-
     private:
-      typedef selectors_t::iterator iter;
-
-      // Get all TriggerResults objects for the process names we're
-      // interested in.
-      size_type fill(EventPrincipal const& ev, ModuleCallingContext const*);
-
-      bool        fillDone_;
-      size_type   numberFound_;
       selectors_t selectors_;
     };
-
-    class  TRBESSentry {
-    public:
-      TRBESSentry(detail::TriggerResultsBasedEventSelector& prods) : p(prods) {}
-      ~TRBESSentry() {
-        p.clear();
-      }
-    private:
-      detail::TriggerResultsBasedEventSelector& p;
-
-      TRBESSentry(TRBESSentry const&) = delete;
-      TRBESSentry& operator=(TRBESSentry const&) = delete;
-    };
-
 
     /** Handles the final initialization of the TriggerResutsBasedEventSelector
      \return true if all events will be selected

diff --git a/FWCore/Framework/src/OutputModule.cc b/FWCore/Framework/src/OutputModule.cc
@@ -215,8 +215,6 @@ namespace edm {
   bool OutputModule::prePrefetchSelection(StreamID id, EventPrincipal const& ep, ModuleCallingContext const* mcc) {
 
     auto& s = selectors_[id.value()];
-    detail::TRBESSentry products_sentry(s);
-
     return wantAllEvents_ or s.wantEvent(ep,mcc);
   }
 

diff --git a/FWCore/Framework/src/SubProcess.cc b/FWCore/Framework/src/SubProcess.cc
@@ -296,9 +296,6 @@ namespace edm {
   SubProcess::doEvent(EventPrincipal const& ep) {
     ServiceRegistry::Operate operate(serviceToken_);
     /* BEGIN relevant bits from OutputModule::doEvent */
-    detail::TRBESSentry products_sentry(selectors_);
-
-
     if(!wantAllEvents_) {
       // use module description and const_cast unless interface to
       // event is changed to just take a const EventPrincipal