From 8d405b265285c368df2e9cf1c14acee7532e0ee7 Mon Sep 17 00:00:00 2001
From: nancy.liao <huihui.liao@greentest.com.cn>
Date: ćšć, 29 5æ 2025 18:14:38 +0800
Subject: [PATCH] Merge branch 'develop' of http://139.9.88.116:3000/r/module/open-license-manager into develop
---
src/library/os/linux/cpu_info.cpp | 45 ++++++++++++++++++++++++++++++++-------------
1 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/src/library/os/linux/cpu_info.cpp b/src/library/os/linux/cpu_info.cpp
index b052a03..cfb4efc 100644
--- a/src/library/os/linux/cpu_info.cpp
+++ b/src/library/os/linux/cpu_info.cpp
@@ -8,6 +8,7 @@
#include <cpuid.h>
#include <string>
#include <unordered_set>
+#include <memory.h>
#include "../cpu_info.hpp"
namespace license {
@@ -15,14 +16,39 @@
using namespace std;
struct CPUVendorID {
- unsigned int ebx;
- unsigned int edx;
- unsigned int ecx;
+ uint32_t ebx;
+ uint32_t edx;
+ uint32_t ecx;
string toString() const { return string(reinterpret_cast<const char *>(this), 12); }
};
-CpuInfo::CpuInfo() {}
+static string get_cpu_vendor() {
+ unsigned int level = 0, eax = 0, ebx = 0, ecx = 0, edx = 0;
+ // hypervisor flag false, try to get the vendor name, see if it's a virtual cpu
+ __get_cpuid(level, &eax, &ebx, &ecx, &edx);
+ CPUVendorID vendorID{.ebx = ebx, .edx = edx, .ecx = ecx};
+ return vendorID.toString();
+}
+
+// https://en.wikipedia.org/wiki/CPUID
+static string get_cpu_brand() {
+ string result;
+ uint32_t brand[0x10];
+
+ if (!__get_cpuid_max(0x80000004, NULL)) {
+ result = "NA";
+ } else {
+ memset(brand, 0, sizeof(brand));
+ __get_cpuid(0x80000002, brand + 0x0, brand + 0x1, brand + 0x2, brand + 0x3);
+ __get_cpuid(0x80000003, brand + 0x4, brand + 0x5, brand + 0x6, brand + 0x7);
+ __get_cpuid(0x80000004, brand + 0x8, brand + 0x9, brand + 0xa, brand + 0xb);
+ result = string(reinterpret_cast<char *>(brand));
+ }
+ return result;
+}
+
+CpuInfo::CpuInfo() : m_vendor(get_cpu_vendor()), m_brand(get_cpu_brand()) {}
CpuInfo::~CpuInfo() {}
/**
@@ -30,7 +56,7 @@
* @return true if the cpu hypervisor bit is set to 1
*/
bool CpuInfo::is_hypervisor_set() const {
- unsigned int level = 1, eax = 0, ebx = 0, ecx = 0, edx = 0;
+ uint32_t level = 1, eax = 0, ebx = 0, ecx = 0, edx = 0;
__get_cpuid(level, &eax, &ebx, &ecx, &edx);
bool is_virtual = (((ecx >> 31) & 1) == 1); // hypervisor flag
@@ -38,7 +64,7 @@
}
uint32_t CpuInfo::model() const {
- unsigned int level = 1, eax = 0, ebx = 0, ecx = 0, edx = 0;
+ uint32_t level = 1, eax = 0, ebx = 0, ecx = 0, edx = 0;
__get_cpuid(level, &eax, &ebx, &ecx, &edx);
// ax bits 0-3 stepping,4-7 model,8-11 family id,12-13 processor type
// 14-15 reserved, 16-19 extended model, 20-27 extended family, 27-31 reserved
@@ -46,12 +72,5 @@
return (eax & 0x3FFF) | (eax & 0x3FF8000) >> 2 | (ebx & 0xff) << 24;
}
-string CpuInfo::vendor() const {
- unsigned int level = 0, eax = 0, ebx = 0, ecx = 0, edx = 0;
- // hypervisor flag false, try to get the vendor name, see if it's a virtual cpu
- __get_cpuid(level, &eax, &ebx, &ecx, &edx);
- CPUVendorID vendorID{.ebx = ebx, .edx = edx, .ecx = ecx};
- return vendorID.toString();
-}
} // namespace os
} /* namespace license */
--
Gitblit v1.9.1