Merge CMSSW_7_5_X into CMSSW_7_6_X.

cms-sw · Jun 24, 2015 · 68b4ccf · 68b4ccf
2 parents 913a399 + f9bbfee
commit 68b4ccf
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 10 deletions.
diff --git a/FWCore/PrescaleService/interface/PrescaleService.h b/FWCore/PrescaleService/interface/PrescaleService.h
@@ -1,6 +1,7 @@
 #ifndef FWCore_PrescaleService_PrescaleService_h
 #define FWCore_PrescaleService_PrescaleService_h
 
+#include "DataFormats/Provenance/interface/ParameterSetID.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/SaveConfiguration.h"
 
@@ -12,6 +13,8 @@
 namespace edm {
   class ActivityRegistry;
   class ConfigurationDescriptions;
+  class PathsAndConsumesOfModulesBase;
+  class ProcessContext;
 
   namespace service {
 
@@ -47,6 +50,7 @@ namespace edm {
       //
       // private member functions
       //
+      void preBeginJob(PathsAndConsumesOfModulesBase const&, ProcessContext const&);
       void postBeginJob();
 
       //
@@ -57,8 +61,10 @@ namespace edm {
       const unsigned int    lvl1Default_;
       const std::vector<ParameterSet> vpsetPrescales_;
       PrescaleTable_t prescaleTable_;
+      ParameterSetID processParameterSetID_;
     };
   }
 }
 
 #endif
+
diff --git a/FWCore/PrescaleService/src/PrescaleService.cc b/FWCore/PrescaleService/src/PrescaleService.cc
@@ -8,9 +8,9 @@
 
 #include "FWCore/PrescaleService/interface/PrescaleService.h"
 #include "FWCore/ServiceRegistry/interface/ActivityRegistry.h"
-#include "FWCore/ParameterSet/interface/Registry.h"
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
+#include "FWCore/ServiceRegistry/interface/ProcessContext.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
 #include <iostream>
@@ -29,6 +29,7 @@ namespace edm {
       , vpsetPrescales_(iPS.getParameterSetVector("prescaleTable"))
       , prescaleTable_()
     {
+      iReg.watchPreBeginJob(this, &PrescaleService::preBeginJob);
       iReg.watchPostBeginJob(this, &PrescaleService::postBeginJob);
 
       // Sanity check
@@ -61,11 +62,17 @@ namespace edm {
 
     // member functions
 
+    void PrescaleService::preBeginJob(PathsAndConsumesOfModulesBase const&,
+                                      ProcessContext const& processContext) {
+      if(!processParameterSetID_.isValid()) {
+        processParameterSetID_ = processContext.parameterSetID();
+      }
+    }
+
     void PrescaleService::postBeginJob() {
 
-      // Acesss to Process ParameterSet needed - can't be done in c'tor
-      const ParameterSet prcPS = getProcessParameterSet();
-
+      // Acess to Process ParameterSet needed - can't be done in c'tor
+      ParameterSet const& prcPS = edm::getParameterSet(processParameterSetID_);
       // Label of HLTPrescaler on each path, keyed on pathName
       std::map<std::string,std::string> path2module;
       // Name of path for each HLTPrescaler, keyed on moduleLabel

diff --git a/FastSimulation/Tracking/src/TrackingLayer.cc b/FastSimulation/Tracking/src/TrackingLayer.cc
@@ -1,6 +1,7 @@
 #include "FastSimulation/Tracking/interface/TrackingLayer.h"
 
-
+const TrackingLayer::eqfct TrackingLayer::_eqfct;
+
 TrackingLayer::TrackingLayer():
     _subDet(Det::UNKNOWN),
     _side(Side::BARREL),

diff --git a/Utilities/StaticAnalyzers/scripts/data-class-funcs.py b/Utilities/StaticAnalyzers/scripts/data-class-funcs.py
@@ -173,7 +173,6 @@
 				exact= r"^" + re.escape(flaggedclass) + r"$"
 				exactmatch=re.match(exact,dataclass)
 				if exactmatch:
-				if re.match(flaggedclass,dataclass):
 					print "Flagged event setup data class '"+dataclass+"' is accessed in call stack '",
 					path = nx.shortest_path(G,tfunc,dataclassfunc)
 					for p in path:

diff --git a/Utilities/StaticAnalyzers/src/ClassChecker.cpp b/Utilities/StaticAnalyzers/src/ClassChecker.cpp
@@ -671,7 +671,7 @@ void ClassChecker::checkASTDecl(const clang::CXXRecordDecl *RD, clang::ento::Ana
                     WalkAST walker(this,BR, mgr.getAnalysisDeclContext(RD), (*(RD->ctor_begin()))->getMostRecentDecl() ) ;
                     std::string buf;
                     llvm::raw_string_ostream os(buf);
-                    os << "Mutable member '" <<t.getAsString()<<" "<<*D << "' in data class '"<<support::getQualifiedName(*RD)<<"', might be thread-unsafe when accessing via a const handle.";
+                    os << "Mutable member '" <<t.getCanonicalType().getAsString()<<" "<<*D << "' in data class '"<<support::getQualifiedName(*RD)<<"', might be thread-unsafe when accessing via a const handle.";
                     BR.EmitBasicReport(D, this, "Mutable member in data class",
                         "Data Class Const Correctness", os.str(), DLoc);
                     std::string pname = support::getQualifiedName(*(RD));

diff --git a/Utilities/StaticAnalyzers/src/CmsSupport.cpp b/Utilities/StaticAnalyzers/src/CmsSupport.cpp
@@ -112,8 +112,9 @@ std::string support::getQualifiedName(const clang::NamedDecl &d) {
 bool support::isSafeClassName(const std::string &cname) {
 
   static const std::vector<std::string> names = {
-    "std::atomic",
-    "struct std::atomic",
+    "atomic<",
+    "std::atomic<",
+    "struct std::atomic<",
     "std::__atomic_",
     "std::mutex",
     "std::recursive_mutex",

diff --git a/Utilities/StaticAnalyzers/src/MutableMemberChecker.cpp b/Utilities/StaticAnalyzers/src/MutableMemberChecker.cpp
@@ -29,7 +29,7 @@ void MutableMemberChecker::checkASTDecl(const clang::FieldDecl *D,
 	    if ( ! support::isDataClass( D->getParent()->getQualifiedNameAsString() ) ) return;
 	    std::string buf;
 	    llvm::raw_string_ostream os(buf);
-	    os << "Mutable member'" <<t.getAsString()<<" "<<*D << "' in class '"<<D->getParent()->getQualifiedNameAsString()<<"', might be thread-unsafe when accessing via a const handle.";
+	    os << "Mutable member'" <<t.getCanonicalType().getAsString()<<" "<<*D << "' in class '"<<D->getParent()->getQualifiedNameAsString()<<"', might be thread-unsafe when accessing via a const handle.";
 	    BR.EmitBasicReport(D, this, "mutable member",
 	    					"ThreadSafety", os.str(), DLoc);
 	    return;