Merge pull request #1275 from quanweiZhou/add-meminfo-fields

[mem][linux] added additional meminfo fields

mem/mem.go

@@ -75,6 +75,8 @@ type VirtualMemoryStat struct {
 	VmallocChunk   uint64 `json:"vmallocChunk"`
 	HugePagesTotal uint64 `json:"hugePagesTotal"`
 	HugePagesFree  uint64 `json:"hugePagesFree"`
+	HugePagesRsvd  uint64 `json:"hugePagesRsvd"`
+	HugePagesSurp  uint64 `json:"hugePagesSurp"`
 	HugePageSize   uint64 `json:"hugePageSize"`
 }
 

mem/mem_linux.go

@@ -292,6 +292,18 @@ func fillFromMeminfoWithContext() (*VirtualMemoryStat, *VirtualMemoryExStat, err
 				return ret, retEx, err
 			}
 			ret.HugePagesFree = t
+		case "HugePages_Rsvd":
+			t, err := strconv.ParseUint(value, 10, 64)
+			if err != nil {
+				return ret, retEx, err
+			}
+			ret.HugePagesRsvd = t
+		case "HugePages_Surp":
+			t, err := strconv.ParseUint(value, 10, 64)
+			if err != nil {
+				return ret, retEx, err
+			}
+			ret.HugePagesSurp = t
 		case "Hugepagesize":
 			t, err := strconv.ParseUint(value, 10, 64)
 			if err != nil {

mem/mem_linux_test.go

@@ -62,6 +62,8 @@ var virtualMemoryTests = []struct {
 			VmallocChunk:   0,
 			HugePagesTotal: 0,
 			HugePagesFree:  0,
+			HugePagesRsvd:  0,
+			HugePagesSurp:  0,
 			HugePageSize:   2097152,
 		},
 	},
@@ -101,6 +103,8 @@ var virtualMemoryTests = []struct {
 			VmallocChunk:   0,
 			HugePagesTotal: 0,
 			HugePagesFree:  0,
+			HugePagesRsvd:  0,
+			HugePagesSurp:  0,
 			HugePageSize:   0,
 		},
 	},