Merge pull request #965 from intel/push-2025-07-21

rdementi · web-flow · commit b15282824f62 · 2025-07-21T09:09:32.000+02:00
Push 2025 07 21
diff --git a/Intel-PMT b/Intel-PMT
@@ -1 +1 @@
-Subproject commit 134c36d1d4dd344a9893e02e350554f3df507a80
+Subproject commit 20f55dcf635f77e6f51667504acc202be39b6b03
diff --git a/src/cpucounters.cpp b/src/cpucounters.cpp
@@ -3033,6 +3033,8 @@ void enableNMIWatchdog(const bool silent)
 }
 #endif
 
+constexpr const char* threadCreateErrorMessage = "This might be due to a too low limit for the number of threads per process. Try to increase it\n";
+
 class CoreTaskQueue
 {
     std::queue<std::packaged_task<void()> > wQueue;
@@ -3043,28 +3045,38 @@ class CoreTaskQueue
     CoreTaskQueue(CoreTaskQueue &) = delete;
     CoreTaskQueue & operator = (CoreTaskQueue &) = delete;
 public:
-    CoreTaskQueue(int32 core) :
-        worker([=]() {
+    CoreTaskQueue(int32 core)
+    {
         try {
-            TemporalThreadAffinity tempThreadAffinity(core, false);
-            std::unique_lock<std::mutex> lock(m);
-            while (1) {
-                while (wQueue.empty()) {
-                    condVar.wait(lock);
+            worker = std::thread([=]() {
+                try {
+                    TemporalThreadAffinity tempThreadAffinity(core, false);
+                    std::unique_lock<std::mutex> lock(m);
+                    while (1) {
+                        while (wQueue.empty()) {
+                            condVar.wait(lock);
+                        }
+                        while (!wQueue.empty()) {
+                            wQueue.front()();
+                            wQueue.pop();
+                        }
+                    }
                 }
-                while (!wQueue.empty()) {
-                    wQueue.front()();
-                    wQueue.pop();
+                catch (const std::exception& e)
+                {
+                    std::cerr << "PCM Error. Exception in CoreTaskQueue worker function: " << e.what() << "\n";
                 }
-            }
+
+            });
         }
-        catch (const std::exception & e)
+        catch (const std::exception& e)
         {
-            std::cerr << "PCM Error. Exception in CoreTaskQueue worker function: " << e.what() << "\n";
+            std::cerr << "PCM Error: caught exception " << e.what() << " while creating thread for core task queue " << core << "\n" <<
+                threadCreateErrorMessage;
+            throw; // re-throw
         }
 
-        })
-    {}
+    }
     void push(std::packaged_task<void()> & task)
     {
         std::unique_lock<std::mutex> lock(m);
@@ -10939,15 +10951,23 @@ CounterWidthExtender::CounterWidthExtender(AbstractRawCounter * raw_counter_, ui
     last_raw_value = (*raw_counter)();
     extended_value = last_raw_value;
     DBG(3, "Initial Value " , extended_value);
-    UpdateThread = new std::thread(
-        [&]() {
-        while (1)
-        {
-            MySleepMs(static_cast<int>(this->watchdog_delay_ms));
-            /* uint64 dummy = */ this->read();
+    try {
+        UpdateThread = new std::thread(
+            [&]() {
+            while (1)
+            {
+                MySleepMs(static_cast<int>(this->watchdog_delay_ms));
+                /* uint64 dummy = */ this->read();
+            }
         }
+        );
+    }
+    catch (const std::exception& e)
+    {
+        std::cerr << "PCM Error: caught exception " << e.what() << " while creating thread for a CounterWidthExtender\n" <<
+            threadCreateErrorMessage;
+        throw; // re-throw
     }
-    );
 }
 CounterWidthExtender::~CounterWidthExtender()
 {
diff --git a/src/pcm-raw.cpp b/src/pcm-raw.cpp
@@ -1074,7 +1074,7 @@ AddEventStatus addEvent(PCM::RawPMUConfigs & curPMUConfigs, string eventStr)
     const auto configArray = split(configStr, ',');
     bool fixed = false;
     std::string lookup;
-    auto pmtAddRecord = [&lookup, &pmuName, &config](const std::vector<TelemetryDB::PMTRecord> & records) -> AddEventStatus
+    auto pmtAddRecord = [&lookup, &pmuName, &config](const std::vector<TelemetryDB::PMTRecord> & records, const bool first = false) -> AddEventStatus
     {
         if (pmuName == "pmt")
         {
@@ -1083,7 +1083,7 @@ AddEventStatus addEvent(PCM::RawPMUConfigs & curPMUConfigs, string eventStr)
                     cerr << "ERROR: lookup \"" << lookup << "\" not found in PMT telemetry database\n";
                     return AddEventStatus::Failed;
                 }
-                if (records.size() > 1)
+                if (records.size() > 1 && first == false)
                 {
                     cerr << "ERROR: lookup \"" << lookup << "\" is ambiguous in PMT telemetry database\n\n";
                     for (const auto & record : records)
@@ -1092,10 +1092,11 @@ AddEventStatus addEvent(PCM::RawPMUConfigs & curPMUConfigs, string eventStr)
                         record.print(cerr);
                         cerr << "\n";
                     }
+                    cerr << "Alternatively use lookupf or ilookupf to select the first record in the list.\n";
                     return AddEventStatus::Failed;
                 }
                 config.second = records[0].fullName;
-                assert(records.size() == 1);
+                assert(records.size() >= 1);
                 config.first[PCM::PMTEventPosition::UID] = records[0].uid;
                 config.first[PCM::PMTEventPosition::offset] = records[0].qWordOffset;
                 config.first[PCM::PMTEventPosition::type] = (records[0].sampleType == "Snapshot") ? PCM::MSRType::Static : PCM::MSRType::Freerun;
@@ -1150,6 +1151,16 @@ AddEventStatus addEvent(PCM::RawPMUConfigs & curPMUConfigs, string eventStr)
             if (pmtAddRecord(telemDB.ilookup(lookup)) != AddEventStatus::OK)
                 return AddEventStatus::Failed;
         }
+        else if (pcm_sscanf(item) >> s_expect("lookupf=") >> setw(255) >> lookup)
+        {
+            if (pmtAddRecord(telemDB.lookup(lookup), true) != AddEventStatus::OK)
+                return AddEventStatus::Failed;
+        }
+        else if (pcm_sscanf(item) >> s_expect("ilookupf=") >> setw(255) >> lookup)
+        {
+            if (pmtAddRecord(telemDB.ilookup(lookup), true) != AddEventStatus::OK)
+                return AddEventStatus::Failed;
+        }
         else if (item == "fixed")
         {
             fixed = true;
diff --git a/src/threadpool.h b/src/threadpool.h
@@ -102,7 +102,14 @@ class ThreadPool {
 
 private:
     void addThread() {
-        threads_.push_back( std::thread( std::bind( &this->execute, this ) ) );
+        try {
+            threads_.push_back( std::thread( std::bind( &this->execute, this ) ) );
+        } catch (const std::exception& e) {
+            std::cerr << "PCM Error. Exception in ThreadPool::addThread: " << e.what()
+                      << ". Possible causes: insufficient system resources, thread limit reached, or invalid thread function."
+                      << " Suggested actions: check system resource availability, verify thread pool configuration, and ensure the thread function is valid.\n";
+            throw;
+        }
     }
 
     // Executes work items from a std::thread, do not call manually
