fix: fix comment

4paradigm · Dec 5, 2023 · 69abfd6 · 69abfd6
1 parent af34cc0
commit 69abfd6
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 14 deletions.
diff --git a/src/base/sys_info.h b/src/base/sys_info.h
@@ -26,12 +26,17 @@
 namespace openmldb::base {
 
 constexpr const char* MEM_TOTAL = "MemTotal";
-constexpr const char* MEM_AVAILABLE = "MemAvailable";
+constexpr const char* MEM_BUFFERS = "Buffers";
+constexpr const char* MEM_CACHED = "Cached";
+constexpr const char* MEM_FREE = "MemFree";
+constexpr const char* SLAB = "Slab";
 
 struct SysInfo {
-    uint64_t mem_total = 0;       // unit is kB
-    uint64_t mem_used = 0;        // unit is kB
-    uint64_t mem_available = 0;   // unit is kB
+    uint64_t mem_total = 0;          // unit is kB
+    uint64_t mem_used = 0;           // unit is kB
+    uint64_t mem_free = 0;           // unit is kB
+    uint64_t mem_buffers = 0;        // unit is kB
+    uint64_t mem_cached = 0;         // unit is kB
 };
 
 base::Status GetSysMem(SysInfo* info) {
@@ -51,6 +56,7 @@ base::Status GetSysMem(SysInfo* info) {
         return {};
     };
     int parse_cnt = 0;
+    uint64_t slab = 0;
     while (fgets(line, sizeof(line), fd)) {
         absl::string_view str_view(line);
         str_view = absl::StripAsciiWhitespace(str_view);
@@ -59,20 +65,33 @@ base::Status GetSysMem(SysInfo* info) {
                 return status;
             }
             parse_cnt++;
-        } else if (absl::StartsWith(str_view, MEM_AVAILABLE)) {
-            if (auto status = parse(str_view, MEM_AVAILABLE, &info->mem_available); !status.OK()) {
+        } else if (absl::StartsWith(str_view, MEM_BUFFERS)) {
+            if (auto status = parse(str_view, MEM_BUFFERS, &info->mem_buffers); !status.OK()) {
+                return status;
+            }
+            parse_cnt++;
+        } else if (absl::StartsWith(str_view, MEM_CACHED)) {
+            if (auto status = parse(str_view, MEM_CACHED, &info->mem_cached); !status.OK()) {
+                return status;
+            }
+            parse_cnt++;
+        } else if (absl::StartsWith(str_view, MEM_FREE)) {
+            if (auto status = parse(str_view, MEM_FREE, &info->mem_free); !status.OK()) {
+                return status;
+            }
+            parse_cnt++;
+        } else if (absl::StartsWith(str_view, SLAB)) {
+            if (auto status = parse(str_view, SLAB, &slab); !status.OK()) {
                 return status;
             }
             parse_cnt++;
-        }
-        if (parse_cnt >= 2) {
-            break;
         }
     }
-    if (parse_cnt != 2) {
+    if (parse_cnt != 5) {
         return {ReturnCode::kError, "fail to parse meminfo"};
     }
-    info->mem_used = info->mem_total - info->mem_available;
+    info->mem_cached += slab;
+    info->mem_used = info->mem_total - info->mem_buffers - info->mem_cached - info->mem_free;
     fclose(fd);
 #endif
     return {};

diff --git a/src/base/sys_info_test.cc b/src/base/sys_info_test.cc
@@ -32,8 +32,13 @@ TEST_F(SystemInfoTest, GetMemory) {
     ASSERT_TRUE(status.OK());
     ASSERT_GT(info.mem_total, 0);
     ASSERT_GT(info.mem_used, 0);
-    ASSERT_GT(info.mem_available, 0);
-    ASSERT_EQ(info.mem_total, info.mem_used + info.mem_available);
+    ASSERT_GT(info.mem_free, 0);
+    ASSERT_EQ(info.mem_total, info.mem_used + info.mem_buffers + info.mem_free + info.mem_cached);
+    /*printf("total:%lu\n", info.mem_total);
+    printf("used:%lu\n", info.mem_used);
+    printf("free:%lu\n", info.mem_free);
+    printf("buffers:%lu\n", info.mem_buffers);
+    printf("cached:%lu\n", info.mem_cached);*/
 }
 
 }  // namespace base

diff --git a/src/client/tablet_client.cc b/src/client/tablet_client.cc
@@ -236,7 +236,8 @@ base::Status TabletClient::Put(uint32_t tid, uint32_t pid, uint64_t time, const
     return {response.code(), response.msg()};
 }
 
-base::Status TabletClient::Put(uint32_t tid, uint32_t pid, const std::string& pk, uint64_t time, const std::string& value) {
+base::Status TabletClient::Put(uint32_t tid, uint32_t pid, const std::string& pk, uint64_t time,
+        const std::string& value) {
     ::openmldb::api::PutRequest request;
     auto dim = request.add_dimensions();
     dim->set_key(pk);