Skip to content

Commit 629f6b0

Browse files
add-uosdeepin-bot[bot]
authored andcommitted
fix: from dmidecode get cpu num error
fix from dmidecode get cpu num maybe error log: fix from dmidecode get cpu num maybe error bug: https://pms.uniontech.com/bug-view-343951.html
1 parent fd19e3a commit 629f6b0

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

deepin-devicemanager/src/GenerateDevice/DeviceGenerator.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,13 @@ void DeviceGenerator::generatorCpuDevice()
222222
logicalNum_dmi += dd4["Thread Count"].toInt();
223223
}
224224
}
225+
if(coreNum_dmi > coreNum && coreNum_dmi <= 512) { //due to offline policy
226+
// If obtaining data from /proc/cpuinfo is incorrect, refer to the content of dmidecode.
227+
if (logicalNum != logicalNum_dmi)
228+
coreNum = coreNum_dmi;
229+
}
225230
if(logicalNum_dmi > logicalNum && logicalNum_dmi < 1024) //due to offline policy
226231
logicalNum = logicalNum_dmi;
227-
if(coreNum_dmi > coreNum && coreNum_dmi <= 512) //due to offline policy
228-
coreNum = coreNum_dmi;
229232

230233
DeviceManager::instance()->setCpuNum(allCPUS.isEmpty() ? dmidecode4.size() : allCPUS.size());
231234
qCDebug(appLog) << "DeviceGenerator::generatorCpuDevice set cpu num" << (allCPUS.isEmpty() ? dmidecode4.size() : allCPUS.size());

0 commit comments

Comments
 (0)