From 0921850a79b067627beaa9c7e46d4216979f8211 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Sat, 27 Feb 2021 01:29:29 +0900
Subject: [PATCH] Fix #7067 (#7267)

---
 src/client/widgets/server-metric/cpu-mem.vue | 4 ++--
 src/client/widgets/server-metric/mem.vue     | 6 +++---
 src/daemons/server-stats.ts                  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/client/widgets/server-metric/cpu-mem.vue b/src/client/widgets/server-metric/cpu-mem.vue
index f1c31d7cdf..ad9e6a8b0f 100644
--- a/src/client/widgets/server-metric/cpu-mem.vue
+++ b/src/client/widgets/server-metric/cpu-mem.vue
@@ -120,7 +120,7 @@ export default defineComponent({
 			if (this.stats.length > 50) this.stats.shift();
 
 			const cpuPolylinePoints = this.stats.map((s, i) => [this.viewBoxX - ((this.stats.length - 1) - i), (1 - s.cpu) * this.viewBoxY]);
-			const memPolylinePoints = this.stats.map((s, i) => [this.viewBoxX - ((this.stats.length - 1) - i), (1 - (s.mem.used / this.meta.mem.total)) * this.viewBoxY]);
+			const memPolylinePoints = this.stats.map((s, i) => [this.viewBoxX - ((this.stats.length - 1) - i), (1 - (s.mem.active / this.meta.mem.total)) * this.viewBoxY]);
 			this.cpuPolylinePoints = cpuPolylinePoints.map(xy => `${xy[0]},${xy[1]}`).join(' ');
 			this.memPolylinePoints = memPolylinePoints.map(xy => `${xy[0]},${xy[1]}`).join(' ');
 
@@ -133,7 +133,7 @@ export default defineComponent({
 			this.memHeadY = memPolylinePoints[memPolylinePoints.length - 1][1];
 
 			this.cpuP = (stats.cpu * 100).toFixed(0);
-			this.memP = (stats.mem.used / this.meta.mem.total * 100).toFixed(0);
+			this.memP = (stats.mem.active / this.meta.mem.total * 100).toFixed(0);
 		},
 		onStatsLog(statsLog) {
 			for (const stats of [...statsLog].reverse()) {
diff --git a/src/client/widgets/server-metric/mem.vue b/src/client/widgets/server-metric/mem.vue
index eab23c1be2..83aa71aa09 100644
--- a/src/client/widgets/server-metric/mem.vue
+++ b/src/client/widgets/server-metric/mem.vue
@@ -45,10 +45,10 @@ export default defineComponent({
 	},
 	methods: {
 		onStats(stats) {
-			this.usage = stats.mem.used / this.meta.mem.total;
+			this.usage = stats.mem.active / this.meta.mem.total;
 			this.total = this.meta.mem.total;
-			this.used = stats.mem.used;
-			this.free = this.meta.mem.total - stats.mem.used;
+			this.used = stats.mem.active;
+			this.free = this.meta.mem.total - stats.mem.active;
 		},
 		bytes
 	}
diff --git a/src/daemons/server-stats.ts b/src/daemons/server-stats.ts
index 57691fbc00..bc1da5eef6 100644
--- a/src/daemons/server-stats.ts
+++ b/src/daemons/server-stats.ts
@@ -28,7 +28,7 @@ export default function() {
 		const stats = {
 			cpu: roundCpu(cpu),
 			mem: {
-				used: round(memStats.used),
+				used: round(memStats.used - memStats.buffers - memStats.cached),
 				active: round(memStats.active),
 			},
 			net: {