From 1fe5e3c9f87f28ffbb7a7ecb91a36e68755380a1 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周日, 29 3月 2020 08:41:31 +0800
Subject: [PATCH] minor doc update
---
src/inspector/inspector.cpp | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/inspector/inspector.cpp b/src/inspector/inspector.cpp
index e5ee64d..af9e61c 100644
--- a/src/inspector/inspector.cpp
+++ b/src/inspector/inspector.cpp
@@ -9,10 +9,11 @@
using namespace std;
using namespace license::os;
-const map<int, string> stringByStrategyId = {{STRATEGY_DEFAULT, "DEFAULT"}, {STRATEGY_ETHERNET, "MAC"},
- {STRATEGY_IP_ADDRESS, "IP"}, {STRATEGY_DISK_NUM, "Disk1"},
- {STRATEGY_DISK_LABEL, "Disk2"}, {STRATEGY_NONE, "Custom"}};
-
+const map<int, string> stringByStrategyId = {{STRATEGY_DEFAULT, "DEFAULT"},
+ {STRATEGY_ETHERNET, "MAC"},
+ {STRATEGY_IP_ADDRESS, "IP"},
+ {STRATEGY_DISK_NUM, "Disk1"},
+ {STRATEGY_DISK_LABEL, "Disk2"}};
const unordered_map<int, string> descByVirtDetail = {{BARE_TO_METAL, "No virtualization"},
{VMWARE, "Vmware"},
@@ -53,10 +54,11 @@
int main(int argc, char* argv[]) {
license::os::CpuInfo cpu;
- cout << "CpuVendor :" << cpu.vendor() << endl;
- cout << "Virtual machine :" << cpu.cpu_virtual() << endl;
+ cout << "Cpu Vendor :" << cpu.vendor() << endl;
+ cout << "Cpu Brand :" << cpu.brand() << endl;
+ cout << "Cpu is hypervis.:" << cpu.cpu_virtual() << endl;
cout << "Cpu model :0x" << std::hex << ((long)cpu.model()) << std::dec << endl;
- cout << "Virt. detail cpu:" << descByVirtDetail.find(cpu.getVirtualizationDetail())->second << endl;
+ cout << "Virt. detail cpu:" << descByVirtDetail.find(cpu.virtualization_details())->second << endl <<endl;
ExecutionEnvironment execEnv;
cout << "Running in cloud:" << execEnv.is_cloud() << endl;
cout << "Docker :" << execEnv.is_docker() << endl;
@@ -65,12 +67,12 @@
cout << "Bios vendor :" << execEnv.bios_vendor() << endl;
cout << "Bios description:" << execEnv.bios_description() << endl;
- cout << "System vendor :" << execEnv.sys_vendor() << endl;
+ cout << "System vendor :" << execEnv.sys_vendor() << endl <<endl;
char hw_identifier[LCC_API_PC_IDENTIFIER_SIZE + 1];
size_t bufSize = LCC_API_PC_IDENTIFIER_SIZE + 1;
for (const auto& x : stringByStrategyId) {
- if (identify_pc(static_cast<LCC_API_IDENTIFICATION_STRATEGY>(x.first), hw_identifier, &bufSize)) {
+ if (identify_pc(static_cast<LCC_API_HW_IDENTIFICATION_STRATEGY>(x.first), hw_identifier, &bufSize)) {
std::cout << x.second << ':' << hw_identifier << std::endl;
} else {
std::cout << x.second << ": NA" << endl;
--
Gitblit v1.9.1