Merge pull request #989 from intel/push-20251201

rdementi · web-flow · commit 1294d1c36f0b · 2025-12-02T10:23:20.000+01:00
Push 20251201
diff --git a/src/cpucounters.cpp b/src/cpucounters.cpp
@@ -7508,6 +7508,7 @@ void initSocket2Bus(std::vector<std::pair<uint32, uint32> > & socket2bus, uint32
     Mutex::Scope _(socket2busMutex);
     if(!socket2bus.empty()) return;
 
+    try {
     forAllIntelDevices(
         [&devIdsSize,&DEV_IDS, &socket2bus](const uint32 group, const uint32 bus, const uint32 /* device */, const uint32 /* function */, const uint32 device_id)
         {
@@ -7522,6 +7523,11 @@ void initSocket2Bus(std::vector<std::pair<uint32, uint32> > & socket2bus, uint32
                 }
             }
         }, device, function);
+    } catch (const std::exception & e)
+    {
+           std::cerr << "Error in initSocket2Bus: " << e.what() << "\n";
+           socket2bus.clear();
+    }
 }
 
 int getBusFromSocket(const uint32 socket)

Original file line number	Diff line number	Diff line change
`@@ -7508,6 +7508,7 @@ void initSocket2Bus(std::vector<std::pair<uint32, uint32> > & socket2bus, uint32`
`7508`	`7508`	`Mutex::Scope _(socket2busMutex);`
`7509`	`7509`	`if(!socket2bus.empty()) return;`
`7510`	`7510`
	`7511`	`+ try {`
`7511`	`7512`	`forAllIntelDevices(`
`7512`	`7513`	`[&devIdsSize,&DEV_IDS, &socket2bus](const uint32 group, const uint32 bus, const uint32 /* device /, const uint32 / function */, const uint32 device_id)`
`7513`	`7514`	`{`
`@@ -7522,6 +7523,11 @@ void initSocket2Bus(std::vector<std::pair<uint32, uint32> > & socket2bus, uint32`
`7522`	`7523`	`}`
`7523`	`7524`	`}`
`7524`	`7525`	`}, device, function);`
	`7526`	`+ } catch (const std::exception & e)`
	`7527`	`+ {`
	`7528`	`+ std::cerr << "Error in initSocket2Bus: " << e.what() << "\n";`
	`7529`	`+ socket2bus.clear();`
	`7530`	`+ }`
`7525`	`7531`	`}`
`7526`	`7532`
`7527`	`7533`	`int getBusFromSocket(const uint32 socket)`