Skip to content

fix: guard setFlags and fix arch typo in cpuinfo #923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
add-uos wants to merge 1 commit into from
+10 −10
Closed

fix: guard setFlags and fix arch typo in cpuinfo #923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions deepin-devicemanager-server/deepin-deviceinfo/src/loadinfo/cpu/cpuinfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
using namespace DDLog;

CpuInfo::CpuInfo()
: m_Arch("unknow")
: m_Arch("unknown")
{
}
CpuInfo::~CpuInfo()
Expand Down Expand Up @@ -207,7 +207,8 @@ LogicalCpu &CpuInfo::logicalCpu(int logical_id)

void CpuInfo::setProcCpuinfo(LogicalCpu &logical, const QMap<QString, QString> &mapInfo)
{
logical.setFlags(mapInfo["flags"]);
if (mapInfo.contains("flags") && !mapInfo["flags"].isEmpty())
logical.setFlags(mapInfo["flags"]);
logical.setModel(mapInfo["model"]);
logical.setModelName(mapInfo["model name"]);
logical.setVendor(mapInfo["vendor_id"]);
Expand Down
15 changes: 7 additions & 8 deletions deepin-devicemanager-server/tests/src/LoadInfo/ut_CpuInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,8 +320,8 @@ TEST_F(CpuInfo_UT, DefaultConstructor_Counters_AllZero)
const int phys = cpu.physicalNum();
const int cores = cpu.coreNum();
const int logicals = cpu.logicalNum();
// Assert — ctor 初始化 m_Arch 为 "unknow"（源码字面拼写）
EXPECT_EQ(cpu.arch(), QString("unknow"));
// Assert — ctor 初始化 m_Arch 为 "unknown"（源码字面拼写）
EXPECT_EQ(cpu.arch(), QString("unknown"));
EXPECT_EQ(phys, 0);
EXPECT_EQ(cores, 0);
EXPECT_EQ(logicals, 0);
Expand All @@ -342,14 +342,14 @@ TEST_F(CpuInfo_UT, ObjectLifecycle_ConstructDestruct_Clean)

// ===== arch =====

TEST_F(CpuInfo_UT, Arch_Default_IsUnknow)
TEST_F(CpuInfo_UT, Arch_Default_IsUnknown)
{
// Arrange
CpuInfo cpu;
// Act
const QString &value = cpu.arch();
// Assert
EXPECT_EQ(value, QString("unknow"));
EXPECT_EQ(value, QString("unknown"));
EXPECT_FALSE(value.isEmpty());
}

Expand All @@ -364,7 +364,7 @@ TEST_F(CpuInfo_UT, Arch_AfterReadCpuArchitecture_MatchesUname)
cpu.readCpuArchitecture();
// Assert
EXPECT_EQ(cpu.arch(), QString("loongarch64"));
EXPECT_NE(cpu.arch(), QString("unknow"));
EXPECT_NE(cpu.arch(), QString("unknown"));
}

// ===== readCpuArchitecture =====
Expand Down Expand Up @@ -1395,11 +1395,10 @@ TEST_F(CpuInfo_UT, SetProcCpuinfo_Loongarch64_FeaturesFallback)
info.insert("features", "lsx lasx");
// Act
cpu.setProcCpuinfo(lcpu, info);
// Assert — 源码先无条件 setFlags(mapInfo["flags"])（缺键→空），
// 预置 flags 被清空后走 isEmpty→features 兜底，最终为 features
// Assert — 修复后 mapInfo 无 "flags" 键时不覆盖，预置 flags 保留
EXPECT_EQ(lcpu.curFreq(), QString("1800"));
EXPECT_EQ(lcpu.model(), QString("3a5000"));
EXPECT_EQ(lcpu.flags(), QString("lsx lasx"));
EXPECT_EQ(lcpu.flags(), QString("pre-existing-flags"));
}

// ===== diagPrintInfo =====
Expand Down
Loading