From 538760b37cf128ba6056dcb720703010925660da Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 08 3月 2020 22:53:03 +0800
Subject: [PATCH] fix tests
---
src/library/os/windows/execution_environment.cpp | 61 +++++++++---------------------
1 files changed, 18 insertions(+), 43 deletions(-)
diff --git a/src/library/os/windows/execution_environment.cpp b/src/library/os/windows/execution_environment.cpp
index f5a0fb8..86513d5 100644
--- a/src/library/os/windows/execution_environment.cpp
+++ b/src/library/os/windows/execution_environment.cpp
@@ -1,64 +1,39 @@
-#include <paths.h>
+/*
+ * virtualization.cpp
+ *
+ * Created on: Dec 15, 2019
+ * Author: GC
+ */
#include <sys/stat.h>
-#include <unistd.h>
#include <fstream>
#include <iostream>
#include <stdio.h>
-#include <string.h>
-#include <dirent.h>
-#include <sys/utsname.h>
+#include <string>
#include "isvm/BIOSReader.h"
#include "isvm/Native.h"
#include "../../base/base.h"
+#include "../../base/StringUtils.h"
#include "../cpu_info.hpp"
#include "../execution_environment.hpp"
namespace license {
+namespace os {
using namespace std;
-
-
-VIRTUALIZATION ExecutionEnvironment::getVirtualization() {
- VIRTUALIZATION result;
- CpuInfo cpuInfo;
- bool isContainer = false;
- if (isContainer) {
- result = CONTAINER;
- } else if (cpuInfo.cpu_virtual() || is_cloud()) {
- result = VM;
- } else {
- result = NONE;
- }
- return result;
-}
-
-bool ExecutionEnvironment::is_cloud() { return getCloudProvider() != ON_PREMISE; }
-
-bool ExecutionEnvironment::is_docker() { return false; }
-
-CLOUD_PROVIDER ExecutionEnvironment::getCloudProvider() {
+ExecutionEnvironment::ExecutionEnvironment() {
if (InitEntryPoints()) {
BIOSReader reader;
SystemInformation info = reader.readSystemInfo();
-
- const char *vmVendors[] = {
- "VMware", "Microsoft Corporation", "Virtual Machine", "innotek GmbH", "PowerVM", "Bochs", "KVM"};
-
- const int count = _countof(vmVendors);
- for (int i = 0; i != count; ++i) {
- const char *vendor = vmVendors[i];
-
- if (std::string::npos != info.Manufacturer.find(vendor) ||
- std::string::npos != info.ProductName.find(vendor) ||
- std::string::npos != info.SerialNum.find(vendor)) {
- std::cout << "Inside virual machine!";
- return 1;
- }
- }
- } else {
- return -1;
+ sys_vendor = toupper_copy(info.Manufacturer);
+ bios_vendor = toupper_copy(info.ProductName);
+ bios_description = toupper_copy(info.SysVersion) + toupper_copy(info.family);
}
}
+//TODO
+bool ExecutionEnvironment::is_docker() const { return false; }
+//TODO
+bool ExecutionEnvironment::is_container() const { return is_docker(); }
+} // namespace os
} // namespace license
--
Gitblit v1.9.1