Skip to content

fix: 修复 DSysInfo 在 AArch64 架构下的线程安全问题 #540

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

Merged
18202781743 merged 1 commit into from
Feb 5, 2026
Merged

fix: 修复 DSysInfo 在 AArch64 架构下的线程安全问题 #540

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
9 changes: 9 additions & 0 deletions src/dsysinfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@
#include <QSettings>
#include <QStandardPaths>
#include <QDateTime>
#include <QRegularExpression>

Check warning on line 19 in src/dsysinfo.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QRegularExpression> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <QLoggingCategory>

Check warning on line 20 in src/dsysinfo.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QLoggingCategory> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <qmath.h>

Check warning on line 21 in src/dsysinfo.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <qmath.h> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <QMutex>

Check warning on line 22 in src/dsysinfo.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QMutex> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <QMutexLocker>

Check warning on line 23 in src/dsysinfo.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QMutexLocker> not found. Please note: Cppcheck does not need standard library headers to get proper results.

#ifdef Q_OS_LINUX
#include <sys/sysinfo.h>

Check warning on line 26 in src/dsysinfo.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <sys/sysinfo.h> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <sys/utsname.h>
#include <unistd.h>
#endif
Expand Down Expand Up @@ -49,6 +51,8 @@
public:
DSysInfoPrivate();

mutable QMutex mutex;

#ifdef Q_OS_LINUX
void ensureDeepinInfo();
bool ensureOsVersion();
Expand Down Expand Up @@ -167,6 +171,7 @@

void DSysInfoPrivate::ensureDeepinInfo()
{
QMutexLocker locker(&mutex);
if (static_cast<int>(deepinType) > 0 && !inTest())
return;

Expand Down Expand Up @@ -246,8 +251,11 @@

bool DSysInfoPrivate::ensureOsVersion()
{
QMutexLocker locker(&mutex);
#ifndef OS_VERSION_TEST_FILE // Always re-read the file when testing
if (osBuild.A > 0 && !inTest())
return true;
#endif

DDesktopEntry entry(OS_VERSION_FILE);
bool ok = false;
Expand Down Expand Up @@ -447,6 +455,7 @@

void DSysInfoPrivate::ensureReleaseInfo()
{
QMutexLocker locker(&mutex);
if (productType > 0 && !inTest()) {
return;
}
Expand Down