fix: replace hex node module version with semantic version macros

PR-URL: #131 Reviewed-BY: hyj1991 <[email protected]>
X-Profiler · Feb 10, 2022 · c4ced63 · c4ced63
1 parent 3718573
commit c4ced63
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 20 deletions.
diff --git a/src/commands/cpuprofiler/cpu_profiler.cc b/src/commands/cpuprofiler/cpu_profiler.cc
@@ -14,7 +14,7 @@ using v8::String;
 Profiler::Profiler() {}
 Profiler::~Profiler() {}
 
-#if (NODE_MODULE_VERSION > 0x0039)
+#if (NODE_MODULE_VERSION > NODE_8_0_MODULE_VERSION)
 static int started_profiles_count = 0;
 static int sampling_interval = 0;
 static CpuProfiler* current_cpuprofiler = nullptr;
@@ -24,7 +24,7 @@ void Profiler::StartProfiling(std::string t) {
   HandleScope scope;
   Local<String> title = New<String>(t).ToLocalChecked();
 
-#if (NODE_MODULE_VERSION > 0x0039)
+#if (NODE_MODULE_VERSION > NODE_8_0_MODULE_VERSION)
   if (!started_profiles_count) {
     current_cpuprofiler = CpuProfiler::New(Isolate::GetCurrent());
   }
@@ -43,15 +43,15 @@ void Profiler::StopProfiling(string t, string filename) {
   HandleScope scope;
   Local<String> title = New<String>(t).ToLocalChecked();
 
-#if (NODE_MODULE_VERSION > 0x0039)
+#if (NODE_MODULE_VERSION > NODE_8_0_MODULE_VERSION)
   profile = current_cpuprofiler->StopProfiling(title);
 #else
   profile = Isolate::GetCurrent()->GetCpuProfiler()->StopProfiling(title);
 #endif
 
   Profile::Serialize(profile, filename);
 
-#if (NODE_MODULE_VERSION > 0x0039)
+#if (NODE_MODULE_VERSION > NODE_8_0_MODULE_VERSION)
   const_cast<CpuProfile*>(profile)->Delete();
   --started_profiles_count;
   if (!started_profiles_count) {
@@ -62,7 +62,7 @@ void Profiler::StopProfiling(string t, string filename) {
 }
 
 void Profiler::SetSamplingInterval(uint32_t sample) {
-#if (NODE_MODULE_VERSION > 0x0039)
+#if (NODE_MODULE_VERSION > NODE_8_0_MODULE_VERSION)
   sampling_interval = sample;
 #else
   Isolate::GetCurrent()->GetCpuProfiler()->SetSamplingInterval(sample);

diff --git a/src/commands/report/javascript_stack.cc b/src/commands/report/javascript_stack.cc
@@ -4,7 +4,7 @@
 #include "nan.h"
 
 static const unsigned kMaxFramesCount = 255;
-#if (NODE_MODULE_VERSION >= 0x003b)
+#if (NODE_MODULE_VERSION >= NODE_9_0_MODULE_VERSION)
 static const char* v8_states[] = {
     "JS",       "GC",    "PARSER",   "BYTECODE_COMPILER",
     "COMPILER", "OTHER", "EXTERNAL", "IDLE"};
@@ -106,4 +106,4 @@ void SetJavaScriptStack(JSONWriter* writer, bool fatal_error) {
   }
   writer->json_arrayend();
 }
-}  // namespace xprofiler
+}  // namespace xprofiler
diff --git a/src/logbypass/heap.cc b/src/logbypass/heap.cc
@@ -49,7 +49,7 @@ void GetRss(size_t* rss) {
 
 void SetHeapStatistics(XprofilerHeapStatistics* heap_statistics) {
   GetHeapStatistics(heap_statistics->handle());
-#if (NODE_MODULE_VERSION < 72)
+#if (NODE_MODULE_VERSION < NODE_12_0_MODULE_VERSION)
   Isolate* isolate = Isolate::GetCurrent();
   heap_statistics->external_memory() =
       isolate->AdjustAmountOfExternalAllocatedMemory(0);

diff --git a/src/logbypass/heap.h b/src/logbypass/heap.h
@@ -1,7 +1,7 @@
-#ifndef _SRC_LOGBYPASS_HEAP_H
-#define _SRC_LOGBYPASS_HEAP_H
+#ifndef XPROFILER_SRC_LOGBYPASS_HEAP_H
+#define XPROFILER_SRC_LOGBYPASS_HEAP_H
 
-#include "node_version.h"
+#include "nan.h"
 #include "v8.h"
 
 namespace xprofiler {
@@ -31,14 +31,14 @@ struct XprofilerHeapStatistics {
     return heap_statistics_.total_physical_size();
   }
   size_t malloced_memory() { return heap_statistics_.malloced_memory(); }
-#if (NODE_MODULE_VERSION >= 72)
+#if (NODE_MODULE_VERSION >= NODE_12_0_MODULE_VERSION)
   size_t external_memory() { return heap_statistics_.external_memory(); }
 #else
   size_t& external_memory() { return external_memory_; }
 #endif
 
  private:
-#if (NODE_MODULE_VERSION < 72)
+#if (NODE_MODULE_VERSION < NODE_12_0_MODULE_VERSION)
   // external memory
   size_t external_memory_ = 0;
 #endif
@@ -66,4 +66,4 @@ void CollectMemoryStatistics(EnvironmentData* env_data);
 void WriteMemoryInfoToLog(EnvironmentData* env_data, bool log_format_alinode);
 }  // namespace xprofiler
 
-#endif
+#endif /* XPROFILER_SRC_LOGBYPASS_HEAP_H */
diff --git a/src/platform/platform.h b/src/platform/platform.h
@@ -22,7 +22,7 @@ void SleepCrossPlatform(int seconds);
 string GetSep();
 int GetPid();
 // for node-v8.x & ndoe-v10.x
-#if (NODE_MODULE_VERSION < 72)
+#if (NODE_MODULE_VERSION < NODE_12_0_MODULE_VERSION)
 typedef struct {
   int64_t tv_sec;
   int32_t tv_usec;
@@ -42,4 +42,4 @@ void PrintLoadedLibraries(JSONWriter *writer);
 void CheckSocketPath(const FunctionCallbackInfo<Value> &info);
 }  // namespace xprofiler
 
-#endif
+#endif
diff --git a/src/platform/unix/utils.cc b/src/platform/unix/utils.cc
@@ -12,7 +12,7 @@ string GetSep() { return "/"; }
 
 int GetPid() { return getpid(); }
 
-#if (NODE_MODULE_VERSION < 72)
+#if (NODE_MODULE_VERSION < NODE_12_0_MODULE_VERSION)
 // from libuv: uv/src/unix
 int uv_gettimeofday(uv_timeval64_t *tv) {
   struct timeval time;
@@ -28,4 +28,4 @@ int uv_gettimeofday(uv_timeval64_t *tv) {
 #endif
 }  // namespace xprofiler
 
-#endif
+#endif
diff --git a/src/platform/win/utils_win.cc b/src/platform/win/utils_win.cc
@@ -11,7 +11,7 @@ string GetSep() { return "\\"; }
 
 int GetPid() { return getpid(); }
 
-#if (NODE_MODULE_VERSION < 72)
+#if (NODE_MODULE_VERSION < NODE_12_0_MODULE_VERSION)
 // from libuv: uv/src/unix
 int uv_gettimeofday(uv_timeval64_t *tv) {
   const uint64_t epoch = (uint64_t)116444736000000000ULL;
@@ -30,4 +30,4 @@ int uv_gettimeofday(uv_timeval64_t *tv) {
 #endif
 }  // namespace xprofiler
 
-#endif
+#endif