From 1d1a6f579bcc318305e774a766f43142106e6d17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Sun, 1 Nov 2026 21:39:27 +0100 Subject: [PATCH] [Oracle] Apply clang-format to the memory querier --- .../utility/system_memory_querier.cpp | 65 +++---------------- .../utility/system_memory_querier.h | 1 - 2 files changed, 8 insertions(+), 58 deletions(-) diff --git a/libcockatrice_utility/libcockatrice/utility/system_memory_querier.cpp b/libcockatrice_utility/libcockatrice/utility/system_memory_querier.cpp index b4553f8d2..cdb987985 100644 --- a/libcockatrice_utility/libcockatrice/utility/system_memory_querier.cpp +++ b/libcockatrice_utility/libcockatrice/utility/system_memory_querier.cpp @@ -11,10 +11,8 @@ #endif #ifdef Q_OS_MACOS -#include #include #include -#include #endif qulonglong SystemMemoryQuerier::totalMemoryBytes() @@ -23,15 +21,17 @@ qulonglong SystemMemoryQuerier::totalMemoryBytes() MEMORYSTATUSEX statex; statex.dwLength = sizeof(statex); - if (GlobalMemoryStatusEx(&statex)) + if (GlobalMemoryStatusEx(&statex)) { return statex.ullTotalPhys; + } return 0; #elif defined(Q_OS_LINUX) QFile file("/proc/meminfo"); - if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) + if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { return 0; + } QTextStream in(&file); while (!in.atEnd()) { @@ -42,8 +42,9 @@ qulonglong SystemMemoryQuerier::totalMemoryBytes() #else QStringList parts = line.split(QRegularExpression("\\s+"), Qt::SkipEmptyParts); #endif - if (parts.size() >= 2) + if (parts.size() >= 2) { return parts[1].toULongLong() * 1024; // kB → bytes + } } } return 0; @@ -54,62 +55,12 @@ qulonglong SystemMemoryQuerier::totalMemoryBytes() qulonglong memsize = 0; size_t len = sizeof(memsize); - if (sysctl(mib, 2, &memsize, &len, nullptr, 0) == 0) + if (sysctl(mib, 2, &memsize, &len, nullptr, 0) == 0) { return memsize; - - return 0; - -#else - return 0; -#endif -} - -qulonglong SystemMemoryQuerier::availableMemoryBytes() -{ -#if defined(Q_OS_WIN) - - MEMORYSTATUSEX statex; - statex.dwLength = sizeof(statex); - if (GlobalMemoryStatusEx(&statex)) - return statex.ullAvailPhys; - return 0; - -#elif defined(Q_OS_LINUX) - - QFile file("/proc/meminfo"); - if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) - return 0; - - QTextStream in(&file); - while (!in.atEnd()) { - QString line = in.readLine(); - if (line.startsWith("MemAvailable:")) { -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - QStringList parts = line.split(QRegExp("\\s+"), QString::SkipEmptyParts); -#else - QStringList parts = line.split(QRegularExpression("\\s+"), Qt::SkipEmptyParts); -#endif - if (parts.size() >= 2) - return parts[1].toULongLong() * 1024; - } } + return 0; -#elif defined(Q_OS_MACOS) - - vm_size_t pageSize; - host_page_size(mach_host_self(), &pageSize); - - mach_msg_type_number_t count = HOST_VM_INFO_COUNT; - vm_statistics64_data_t vmstat; - - if (host_statistics64(mach_host_self(), HOST_VM_INFO, (host_info64_t)&vmstat, &count) != KERN_SUCCESS) - return 0; - - qulonglong freeBytes = (qulonglong)vmstat.free_count * (qulonglong)pageSize; - - return freeBytes; - #else return 0; #endif diff --git a/libcockatrice_utility/libcockatrice/utility/system_memory_querier.h b/libcockatrice_utility/libcockatrice/utility/system_memory_querier.h index 8a15fecdd..eb1906822 100644 --- a/libcockatrice_utility/libcockatrice/utility/system_memory_querier.h +++ b/libcockatrice_utility/libcockatrice/utility/system_memory_querier.h @@ -7,7 +7,6 @@ class SystemMemoryQuerier { public: static qulonglong totalMemoryBytes(); - static qulonglong availableMemoryBytes(); static bool hasAtLeastGiB(int gib) {