From 8610af905ddf4d98409af6b72e60ea3ea29389d7 Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 9 Feb 2021 13:59:57 +0800 Subject: [PATCH 1/2] fix: bug-53921 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 当获取不到的是使用corenum Log: 【服务器企业版sp3】【测评1032】设备管理器处理器的逻辑处理器的数据错误 Bug: https://pms.uniontech.com/zentao/bug-view-53921.html Change-Id: I8cd2cecd210f197babaa4469f01cce24c3c91314 --- deepin-devicemanager/src/LoadInfo/DeviceGenerator.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/deepin-devicemanager/src/LoadInfo/DeviceGenerator.cpp b/deepin-devicemanager/src/LoadInfo/DeviceGenerator.cpp index 1fe724649..63ee6c6f5 100644 --- a/deepin-devicemanager/src/LoadInfo/DeviceGenerator.cpp +++ b/deepin-devicemanager/src/LoadInfo/DeviceGenerator.cpp @@ -123,6 +123,11 @@ void DeviceGenerator::generatorCpuDevice() logicalNum += (*itd)["Thread Count"].toInt(); } + // 如果获取不到逻辑数，就按照core算 bug53921 + if (logicalNum == 0) { + logicalNum = coreNum; + } + QList >::const_iterator it = lstCatCpu.begin(); for (; it != lstCatCpu.end(); ++it) { DeviceCpu *device = new DeviceCpu; From ecdd757446d1eb456428a1aac3b382d2e164c119 Mon Sep 17 00:00:00 2001 From: clcmj <86753262+clcmj@users.noreply.github.com> Date: Fri, 25 Feb 2022 15:55:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deepin-devicemanager-server/src/LoadInfo/ThreadPool.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deepin-devicemanager-server/src/LoadInfo/ThreadPool.cpp b/deepin-devicemanager-server/src/LoadInfo/ThreadPool.cpp index 253d44a19..d5dd912f9 100644 --- a/deepin-devicemanager-server/src/LoadInfo/ThreadPool.cpp +++ b/deepin-devicemanager-server/src/LoadInfo/ThreadPool.cpp @@ -156,7 +156,7 @@ void ThreadPool::initCmd() m_ListCmd.append(cmdHwinfoKeyboard); m_ListUpdate.append(cmdHwinfoKeyboard); - // 添加hwinfo --network命令 + // 添加hwinfo --cdrom命令 Cmd cmdHwinfoCdrom; cmdHwinfoCdrom.cmd = QString("%1 %2%3").arg("hwinfo --cdrom > ").arg(PATH).arg("hwinfo_cdrom.txt"); cmdHwinfoCdrom.file = "hwinfo_cdrom.txt";