From e9dac7521f8bdb814595f63fdd97f2910736f980 Mon Sep 17 00:00:00 2001
From: yu yunfeng <yunfeng.yu@zilliz.com>
Date: Mon, 3 Jun 2019 15:50:04 +0800
Subject: [PATCH] fix CHANGELOG CONFLICTcqqq

Former-commit-id: da059eb1ab2c0d4dac31e698e47a345b9baf916c
---
 cpp/src/metrics/SystemInfo.cpp |  7 +++++++
 cpp/src/metrics/SystemInfo.h   | 35 ++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 cpp/src/metrics/SystemInfo.cpp
 create mode 100644 cpp/src/metrics/SystemInfo.h

diff --git a/cpp/src/metrics/SystemInfo.cpp b/cpp/src/metrics/SystemInfo.cpp
new file mode 100644
index 0000000000..ae3884fb1e
--- /dev/null
+++ b/cpp/src/metrics/SystemInfo.cpp
@@ -0,0 +1,7 @@
+/*******************************************************************************
+ * Copyright 上海赜睿信息科技有限公司(Zilliz) - All Rights Reserved
+ * Unauthorized copying of this file, via any medium is strictly prohibited.
+ * Proprietary and confidential.
+ ******************************************************************************/
+
+#include "SystemInfo.h"
diff --git a/cpp/src/metrics/SystemInfo.h b/cpp/src/metrics/SystemInfo.h
new file mode 100644
index 0000000000..78ae1a5672
--- /dev/null
+++ b/cpp/src/metrics/SystemInfo.h
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright 上海赜睿信息科技有限公司(Zilliz) - All Rights Reserved
+ * Unauthorized copying of this file, via any medium is strictly prohibited.
+ * Proprietary and confidential.
+ ******************************************************************************/
+
+#pragma once
+
+#include "sys/types.h"
+#include "sys/sysinfo.h"
+
+
+namespace zilliz {
+namespace vecwise {
+namespace server {
+
+class SystemInfo {
+ private:
+
+ public:
+    static SystemInfo &
+    GetInstance(){
+        static SystemInfo instance;
+        return instance;
+    }
+
+    long long GetPhysicalMemory();
+
+
+
+};
+
+}
+}
+}