refactor: refactor the heap log with macros

PR-URL: #87 Reviewed-BY: hyj1991 <[email protected]>
X-Profiler · Sep 1, 2020 · 7e2c2cc · 7e2c2cc
1 parent 2c6c698
commit 7e2c2cc
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 83 deletions.
diff --git a/src/logbypass/heap.cc b/src/logbypass/heap.cc
@@ -70,47 +70,10 @@ void GetMemoryInfo() { uv_async_send(&memory_statistics_trigger); }
 void WriteMemoryInfoToLog(bool log_format_alinode) {
   if (log_format_alinode) {
     Info("heap",
-         "rss: %zu, "
-         "heap_used: %zu, "
-         "heap_available: %zu, "
-         "heap_total: %zu, "
-         "heap_limit: %zu, "
-         "heap_executeable: %zu, "
-         "total_physical_size: %zu, "
-         "malloced_memory: %zu, "
-         "amount_of_external_allocated_memory: %zu, "
-         "new_space_size: %zu, "
-         "new_space_used: %zu, "
-         "new_space_available: %zu, "
-         "new_space_committed: %zu, "
-         "old_space_size: %zu, "
-         "old_space_used: %zu, "
-         "old_space_available: %zu, "
-         "old_space_committed: %zu, "
-         "code_space_size: %zu, "
-         "code_space_used: %zu, "
-         "code_space_available: %zu, "
-         "code_space_committed: %zu, "
-         "map_space_size: %zu, "
-         "map_space_used: %zu, "
-         "map_space_available: %zu, "
-         "map_space_committed: %zu, "
-         "lo_space_size: %zu, "
-         "lo_space_used: %zu, "
-         "lo_space_available: %zu, "
-         "lo_space_committed: %zu, "
-         "read_only_space_size: %zu, "
-         "read_only_space_used: %zu, "
-         "read_only_space_available: %zu, "
-         "read_only_space_committed: %zu, "
-         "new_lo_space_size: %zu, "
-         "new_lo_space_used: %zu, "
-         "new_lo_space_available: %zu, "
-         "new_lo_space_committed: %zu, "
-         "code_lo_space_size: %zu, "
-         "code_lo_space_used: %zu, "
-         "code_lo_space_available: %zu, "
-         "code_lo_space_committed: %zu",
+         COMMON_INFO_FORMATTER SPACE_INFO_FORMATTER(new) SPACE_INFO_FORMATTER(
+             old) SPACE_INFO_FORMATTER(code) SPACE_INFO_FORMATTER(map)
+             SPACE_INFO_FORMATTER(lo) SPACE_INFO_FORMATTER(read_only)
+                 SPACE_INFO_FORMATTER(new_lo) SPACE_INFO_FORMATTER(code_lo),
          // rss
          rss,
          // heap statistics
@@ -127,48 +90,10 @@ void WriteMemoryInfoToLog(bool log_format_alinode) {
          LOG_SPACE_INFO(code_large_object));
   } else {
     Info("memory",
-         "memory_usage(byte) "
-         "rss: %zu, "
-         "heap_used: %zu, "
-         "heap_available: %zu, "
-         "heap_total: %zu, "
-         "heap_limit: %zu, "
-         "heap_executeable: %zu, "
-         "total_physical_size: %zu, "
-         "malloced_memory: %zu, "
-         "amount_of_external_allocated_memory: %zu, "
-         "new_space_size: %zu, "
-         "new_space_used: %zu, "
-         "new_space_available: %zu, "
-         "new_space_committed: %zu, "
-         "old_space_size: %zu, "
-         "old_space_used: %zu, "
-         "old_space_available: %zu, "
-         "old_space_committed: %zu, "
-         "code_space_size: %zu, "
-         "code_space_used: %zu, "
-         "code_space_available: %zu, "
-         "code_space_committed: %zu, "
-         "map_space_size: %zu, "
-         "map_space_used: %zu, "
-         "map_space_available: %zu, "
-         "map_space_committed: %zu, "
-         "lo_space_size: %zu, "
-         "lo_space_used: %zu, "
-         "lo_space_available: %zu, "
-         "lo_space_committed: %zu, "
-         "read_only_space_size: %zu, "
-         "read_only_space_used: %zu, "
-         "read_only_space_available: %zu, "
-         "read_only_space_committed: %zu, "
-         "new_lo_space_size: %zu, "
-         "new_lo_space_used: %zu, "
-         "new_lo_space_available: %zu, "
-         "new_lo_space_committed: %zu, "
-         "code_lo_space_size: %zu, "
-         "code_lo_space_used: %zu, "
-         "code_lo_space_available: %zu, "
-         "code_lo_space_committed: %zu",
+         COMMON_INFO_FORMATTERX SPACE_INFO_FORMATTER(new) SPACE_INFO_FORMATTER(
+             old) SPACE_INFO_FORMATTER(code) SPACE_INFO_FORMATTER(map)
+             SPACE_INFO_FORMATTER(lo) SPACE_INFO_FORMATTER(read_only)
+                 SPACE_INFO_FORMATTER(new_lo) SPACE_INFO_FORMATTER(code_lo),
          // rss
          rss,
          // heap statistics

diff --git a/src/logbypass/heap.h b/src/logbypass/heap.h
@@ -27,6 +27,23 @@ using v8::HeapStatistics;
       heap_space_statistics->name##_space_available, \
       heap_space_statistics->name##_space_committed
 
+#define COMMON_INFO_FORMATTER  \
+  "rss: %zu, "                 \
+  "heap_used: %zu, "           \
+  "heap_available: %zu, "      \
+  "heap_total: %zu, "          \
+  "heap_limit: %zu, "          \
+  "heap_executeable: %zu, "    \
+  "total_physical_size: %zu, " \
+  "malloced_memory: %zu, "     \
+  "amount_of_external_allocated_memory: %zu, "
+
+#define COMMON_INFO_FORMATTERX "memory_usage(byte) " COMMON_INFO_FORMATTER
+
+#define SPACE_INFO_FORMATTER(name)                            \
+#name "_space_size: %zu, " #name "_space_used: %zu, " #name \
+        "_space_available: %zu, " #name "_space_committed: %zu, "
+
 // heap statistics struct
 typedef struct XprofilerHeapStatistics {
  public: