Skip to content

Commit b462768

Browse files
shuaijiedeepin-bot[bot]
authored andcommitted
fix: 修复没有计算offline cpu核
write 0 to file cpux/online , offline the cpux Log: 修复没有计算offline cpu核 Bug: https://pms.uniontech.com/bug-view-264471.html
1 parent e7ef979 commit b462768

1 file changed

Lines changed: 10 additions & 1 deletion

File tree

deepin-devicemanager/src/GenerateDevice/DeviceGenerator.cpp

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ void DeviceGenerator::generatorCpuDevice()
162162

163163

164164
// 获取逻辑数和core数 获取cpu个数 获取logical个数
165-
int coreNum = 0, logicalNum = 0;
165+
int coreNum = 0, coreNum_dmi = 0, logicalNum = 0, logicalNum_dmi = 0;
166166
const QList<QMap<QString, QString> > &lsCpu_num = DeviceManager::instance()->cmdInfo("lscpu_num");
167167
if (lsCpu_num.size() <= 0)
168168
return;
@@ -177,7 +177,16 @@ void DeviceGenerator::generatorCpuDevice()
177177
for (auto dd4 : dmidecode4) {
178178
if (dd4.contains("Socket Designation"))
179179
allCPUS.insert(dd4["Socket Designation"]);
180+
if (dd4.contains("Core Count"))
181+
coreNum_dmi += dd4["Core Count"].toInt();
182+
if (dd4.contains("Thread Count"))
183+
logicalNum_dmi += dd4["Thread Count"].toInt();
180184
}
185+
if(logicalNum_dmi > logicalNum && logicalNum_dmi < 1024) //due to offline policy
186+
logicalNum = logicalNum_dmi;
187+
if(coreNum_dmi > coreNum && coreNum_dmi <= 512) //due to offline policy
188+
coreNum = coreNum_dmi;
189+
181190
DeviceManager::instance()->setCpuNum(allCPUS.isEmpty() ? dmidecode4.size() : allCPUS.size());
182191

183192
// set cpu info

0 commit comments

Comments
 (0)