AtlasTest/CITest/Athena.cmake

@@ -460,7 +460,7 @@ atlas_add_citest( TriggerConfigFlags
 
 atlas_add_citest( EFTracking_FPGATrackSim_CI
   SCRIPT FPGATrackSim_CI.sh
-   LOG_IGNORE_PATTERN "Acts.*FindingAlg.*ERROR Propagation reached the step count limit|Acts.*FindingAlg.*ERROR Propagation failed: PropagatorError:. Propagation reached the configured maximum number of steps with the initial parameters|Acts.*FindingAlg.*ERROR CombinatorialKalmanFilter failed: CombinatorialKalmanFilterError:5 Propagation reaches max steps before track finding is finished with the initial parameters|Acts.*FindingAlg.Acts.*ERROR.*SurfaceError:1|Acts.*FindingAlg.*ERROR.*failed.*to.*extrapolate.*track|FPGATrackSimProto.*ERROR Propagation reached the step count limit.*|FPGATrackSimProto.*ERROR.*Propagation failed: PropagatorError.*" )
+   LOG_IGNORE_PATTERN "FPGATrackSimProto.*ERROR Propagation reached the step count limit.*|FPGATrackSimProto.*ERROR.*Propagation failed: PropagatorError.*|WARNING FPE.*FPGATrackSimProtoTackFitAlg.*" )
 
 atlas_add_citest (TrigInDetValidationMenu 
                SCRIPT TrigInDetValidation_menu_test.py

Control/AthLinks/AthLinks/ElementLink.icc

@@ -403,7 +403,7 @@ ElementLink<STORABLE>::cptr() const
   const STORABLE* ptr = this->getDataPtr();
   if (ptr && IndexingPolicy::isValid(this->storedIndex())) {
     this->setCachedElement (IndexingPolicy::lookup(this->storedIndex(), *ptr));
-    this->getCachedElement (ret);
+    (void)this->getCachedElement (ret);
   }
   return ret;
 }

Control/AthLinks/AthLinks/tools/AssociationVectorIterator.h

 /*
-  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifdef ASSOCIATION_CONTEXT
@@ -97,8 +97,6 @@
        return AssociationVectorIterator(*m_store, m_store->end()); 
      } else {
        throw std::runtime_error( "Null pointer to store of associations" );
-       // dead-code
-       return AssociationVectorIterator( *m_store );
      }
    }
 

Control/AthLinks/test/AssociationMap_test.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 #undef NDEBUG
@@ -257,7 +257,7 @@ void test1 (SGTest::TestStore& store)
 		  << (*assItr)->getP()
 		  << "]"
 		  << std::endl;
-	if ( tIdx - assoIdx == 1 ) {
+	if ( assoIdx == tIdx + 1 ) {
 	  ttAsso.addAssociation( tCont, *tIter, tCont, *assItr );
 	} else {
 	  ttAsso.addAssociation( tCont, tIdx,   tCont, assoIdx );

Control/AthLinks/test/ElementLink_test.cxx

@@ -956,7 +956,7 @@ void test7 (SGTest::TestStore& store)
   linkset.setElement(pCF);  // set only element
   linkset.toPersistent(); // XXX SHOULD BE AN ERROR???
 
-  linkset.setStorableObject(*fooVec);  // set Collection
+  (void)linkset.setStorableObject(*fooVec);  // set Collection
   assert (linkset.index() == 2);
   assert ((**linkset).x == 3);
   assert( linkset.toPersistent() );

Control/AthenaKernel/AthenaKernel/CondCont.icc

@@ -518,7 +518,7 @@ CondContMixed<T>::CondContMixed (Athena::IRCUSvc& rcusvc,
                                  SG::DataProxy* proxy,
                                  std::shared_ptr<typename CondContSet::IPayloadDeleter> payloadDeleter,
                                  size_t capacity)
-  : Base (rcusvc, clid, id, proxy, payloadDeleter, capacity)
+  : Base (rcusvc, clid, id, proxy, std::move(payloadDeleter), capacity)
 {
   CondContMixed<T>::registerBaseInit();
 }

Control/AthenaKernel/AthenaKernel/MetaCont.h

 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef ATHENAKERNEL_METACONT_H
@@ -105,7 +105,7 @@ namespace SG {
 
 template <typename T>
 MetaCont<T>::~MetaCont() {
-  for (auto t : m_metaSet) {
+  for (auto& t : m_metaSet) {
     delete t.second;
   }
   m_metaSet.clear();
@@ -202,7 +202,7 @@ MetaCont<T>::sources() const {
   std::lock_guard<std::mutex> lock(m_mut);
 
   std::vector<MetaContBase::SourceID> r;
-  for (auto ent : m_metaSet) {
+  for (const auto& ent : m_metaSet) {
     r.push_back(ent.first);
   }
 

Control/AthenaKernel/src/IOVTime.cxx

 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 /*****************************************************************************
@@ -124,7 +124,8 @@ IOVTime::isValid() const noexcept {
   
   // Check run/event to be < max
   if (m_timestamp == IOVTime::UNDEFTIMESTAMP) {
-      if ( run() > IOVTime::MAXRUN || event() > IOVTime::MAXEVENT ) {
+      // event() can never be more than MAXEVENT, by construction.
+      if ( run() > IOVTime::MAXRUN /*|| event() > IOVTime::MAXEVENT*/ ) {
 	  return 0;
       }
   }
@@ -139,7 +140,8 @@ IOVTime::isValid() const noexcept {
   if (m_timestamp != IOVTime::UNDEFTIMESTAMP &&
       m_time      != IOVTime::UNDEFRETIME) {
       // May have both timestamp and run/event set 
-      if ( run() > IOVTime::MAXRUN || event() > IOVTime::MAXEVENT ) {
+      // event() can never be more than MAXEVENT, by construction.
+      if ( run() > IOVTime::MAXRUN /*|| event() > IOVTime::MAXEVENT*/ ) {
 	  return 0;
       }
       if ( m_timestamp > IOVTime::MAXTIMESTAMP ) {

Control/AthenaKernel/test/CondCont_test.cxx

 /*
-  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file AthenaKernel/test/CondCont_test.cxx
@@ -1160,10 +1160,10 @@ void testThread_MixedWriter::operator()()
     if (i >= ninflight/2) {
       std::vector<CondContBase::key_type> keys;
       keys.reserve (ninflight/2);
-      for (int j = i/2-ninflight/2; j<i/2; j++) {
+      for (int j = std::max(0, i/2-ninflight/2); j<i/2; j++) {
         keys.push_back (j);
       }
-      m_map.trim (keys,keys);
+      (void)m_map.trim (keys,keys);
     }
     EventIDRange r = makeRange(i);
     int payload = r.start().lumi_block() + r.start().time_stamp();

Control/AthenaServices/src/AthenaSummarySvc.cxx

@@ -179,8 +179,9 @@ StatusCode AthenaSummarySvc::initialize() {
 
   // save some space for the summary output if we run out of memory
   ATH_MSG_DEBUG("allocating block of 100 pages");
-  const int pageSize = sysconf( _SC_PAGESIZE );
-  if (pageSize < 1){
+  const long pageSize = sysconf( _SC_PAGESIZE );
+  if (pageSize < 1 || pageSize > 1024*1024*1024) {
+    ATH_MSG_FATAL ("Bad page size from sysconf");
     return StatusCode::FAILURE;
   }
   s_block = new char[ pageSize * 100 ];
@@ -195,7 +196,12 @@ StatusCode AthenaSummarySvc::initialize() {
 StatusCode AthenaSummarySvc::reinitialize() {
 
   delete[] s_block; s_block = nullptr;
-  s_block = new char[ sysconf( _SC_PAGESIZE ) * 100 ];
+  long pageSize = sysconf( _SC_PAGESIZE );
+  if (pageSize < 1 || pageSize > 1024*1024*1024) {
+    ATH_MSG_FATAL ("Bad page size from sysconf");
+    return StatusCode::FAILURE;
+  }
+  s_block = new char[ pageSize * 100 ];
   return s_block ? StatusCode::SUCCESS : StatusCode::FAILURE;
 
 }

Control/AthenaServices/src/OutputStreamSequencerSvc.cxx

@@ -57,6 +57,7 @@ StatusCode OutputStreamSequencerSvc::initialize() {
 
    // Gaudi::Concurrency::ConcurrencyFlags::numConcurrentEvents() not set yet
    // m_rangeIDinSlot.resize( );
+   std::lock_guard lockg( m_mutex );
    m_finishedRange = m_fnToRangeId.end();
 
    return(StatusCode::SUCCESS);
@@ -77,6 +78,7 @@ bool    OutputStreamSequencerSvc::inConcurrentEventsMode() {
 
 //__________________________________________________________________________
 bool    OutputStreamSequencerSvc::inUse() const {
+   std::lock_guard lockg( m_mutex );
    return m_fileSequenceNumber >= 0;
 }
 
@@ -106,6 +108,7 @@ void OutputStreamSequencerSvc::handle(const Incident& inc)
             ATH_MSG_DEBUG("MetaData transition");
             // immediate write and disconnect for ES, otherwise do it after Event write is done
             bool disconnect { true };
+            std::lock_guard lockg( m_mutex );
             if( !m_metaDataSvc->transitionMetaDataFile( m_lastFileName, disconnect ).isSuccess() ) {
                throw GaudiException("Cannot transition MetaData", name(), StatusCode::FAILURE);
             }
@@ -146,8 +149,8 @@ void OutputStreamSequencerSvc::handle(const Incident& inc)
    }
    else if( inc.type() == IncidentType::BeginProcessing ) {
       // new event start - assing current rangeId to its slot
-      ATH_MSG_DEBUG("Assigning rangeID = " << m_currentRangeID << " to slot " << slot);
       std::lock_guard lockg( m_mutex );
+      ATH_MSG_DEBUG("Assigning rangeID = " << m_currentRangeID << " to slot " << slot);
       // If this service is enabled but not getting NextRange incidents, need to resize here
       if( slot >= m_rangeIDinSlot.size() ) {
          m_rangeIDinSlot.resize( std::max(slot+1, Gaudi::Concurrency::ConcurrencyFlags::numConcurrentEvents()) );

Control/CxxUtils/CxxUtils/ConcurrentHashmapImpl.icc

@@ -385,7 +385,8 @@ std::pair<typename CHMIMPL::const_iterator, bool>
 CHMIMPL::put (val_t key, size_t hash, val_t val, bool overwrite,
               const typename Updater_t::Context_t& ctx)
 {
-  return put (lock(), key, hash, val, overwrite, ctx);
+  Lock_t l (m_mutex);
+  return put (l, key, hash, val, overwrite, ctx);
 }
 
 

Control/CxxUtils/CxxUtils/ConcurrentRangeMap.icc

@@ -97,7 +97,7 @@ CONCURRENTRANGEMAP::ConcurrentRangeMap (Updater_t&& updater,
 
   : m_updater (std::move (updater)),
     m_compare (compare),
-    m_payloadDeleter (payloadDeleter),
+    m_payloadDeleter (std::move (payloadDeleter)),
     m_nInserts (0),
     m_maxSize (0)
 {
@@ -359,7 +359,7 @@ CONCURRENTRANGEMAP::emplace (const RANGE& range,
     if (ptr) {
       // Possible to get here if overlap() moved the start of the range
       // forward past all existing ranges.
-      new_end->first = newRange;
+      new_end->first = std::move(newRange);
       new_end->second = ptr.release();
       ++new_end;
     }

Control/CxxUtils/Root/SealDebug.cxx

@@ -138,16 +138,20 @@ struct ATLAS_NOT_THREAD_SAFE BacktraceInit
       if (pos != std::string::npos) ++pos;
       path.erase (0, pos);
 
-      std::string p1 = dir + "/eu-addr2line";
-      if (access (p1.c_str(), F_OK) == 0) {
-        addr2LinePath = p1;
-        break;
+      {
+        std::string p1 = dir + "/eu-addr2line";
+        if (access (p1.c_str(), F_OK) == 0) {
+          addr2LinePath = std::move (p1);
+          break;
+        }
       }
 
-      std::string p2 = dir + "/addr2line";
-      if (access (p2.c_str(), F_OK) == 0) {
-        addr2LinePath = p2;
-        break;
+      {
+        std::string p2 = dir + "/addr2line";
+        if (access (p2.c_str(), F_OK) == 0) {
+          addr2LinePath = std::move (p2);
+          break;
+        }
       }
     }
   }
@@ -1047,6 +1051,7 @@ void DebugAids::disableCoreFiles()
 {
   struct rlimit core_limit;
   core_limit.rlim_cur = 0;
+  core_limit.rlim_max = 0;
   setrlimit(RLIMIT_CORE, &core_limit);
 }
 

Control/CxxUtils/Root/UnwindBacktrace.cxx

 /*
- * Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration.
+ * Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration.
  */
 /**
  * @file UnwindBacktrace.cc
@@ -247,6 +247,7 @@ bool tryUnwindFixup (_Unwind_Ptr addr)
   data.ob.b.count = 1;
   std::atomic_thread_fence (std::memory_order_seq_cst);
   data.ob.b.sorted = 1;
+  data.ob.pad = 0;
 
   return true;
 }

Control/CxxUtils/Root/hexdump.cxx

 /*
- * Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration.
+ * Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration.
  */
 /**
  * @file CxxUtils/src/hexdump.cxx
@@ -112,7 +112,12 @@ void safeHexdump (std::ostream& s, const void* addr, size_t n, size_t offset /*=
     n += nadj;
   }
 
-  size_t pagesize = sysconf (_SC_PAGESIZE);
+  long pagesize_ret = sysconf (_SC_PAGESIZE);
+  if (pagesize_ret < 0 || pagesize_ret >= 1024*1024*1024) {
+    std::abort();
+  }
+  size_t pagesize = pagesize_ret;
+  
 
   procmaps m;
 

Control/CxxUtils/Root/read_athena_statm.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 #include <errno.h>
@@ -27,7 +27,10 @@ read_athena_statm()
       return res;
     }
 
-    fscanf(fd, "%80u %80u", &res.vm_pages, &res.rss_pages);
+    if (fscanf(fd, "%80u %80u", &res.vm_pages, &res.rss_pages) < 2) {
+      fprintf(stderr,
+	      "read_statm: problem reading file %s:\n", filename);
+    }
     fclose(fd);
 #else
     int pagesize = getpagesize();

Control/CxxUtils/test/ConcurrentMap_test.cxx

 /*
- * Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration.
+ * Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration.
  */
 /**
  * @file CxxUtils/test/ConcurrentMap_test.cxx
@@ -1229,10 +1229,12 @@ void Tester<CONT>::test()
 template <class CONT>
 void perftest_one()
 {
-  Tester<CONT> tester;
-  std::cout << tester.name() << "\n";
-  tester.test();
-  tester.report();
+  // Tester<> is large... allocate it from the heap rather than
+  // from the stack.
+  auto tester = std::make_unique<Tester<CONT >>();
+  std::cout << tester->name() << "\n";
+  tester->test();
+  tester->report();
 }
 
 

Control/CxxUtils/test/ConcurrentStrMap_test.cxx

 /*
- * Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration.
+ * Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration.
  */
 /**
  * @file CxxUtils/test/ConcurrentStrMap_test.cxx
@@ -123,16 +123,21 @@ public:
     };
 
     swap_atomic (m_p, other.m_p);
+    std::lock_guard<std::mutex> g (m_mutex);
+    std::lock_guard<std::mutex> gother (other.m_mutex);
     m_garbage.swap (other.m_garbage);
     std::swap (m_inGrace, other.m_inGrace);
   }
 
 
-  unsigned int inGrace() const { return m_inGrace; }
+  unsigned int inGrace() const {
+    std::lock_guard<std::mutex> g (m_mutex);
+    return m_inGrace;
+  }
 
 
 private:
-  std::mutex m_mutex;
+  mutable std::mutex m_mutex;
   std::atomic<T*> m_p;
   std::vector<T*> m_garbage;
   unsigned int m_inGrace;

Control/CxxUtils/test/PageAccessControl_test.cxx

 /*
-  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 #undef NDEBUG
@@ -13,7 +13,9 @@
 using namespace std;
 int main(void) {
   cout << "*** PageAccessControl_test starts ***" <<endl;
-  size_t pagesize = sysconf(_SC_PAGE_SIZE);
+  long pagesize_ret = sysconf(_SC_PAGE_SIZE);
+  if (pagesize_ret < 0 || pagesize_ret >= 1024*1024*1024) return 1;
+  size_t pagesize = pagesize_ret;
 #ifdef DEBUGIT
   const bool DUMPMAPS(true);
 #else