fix: use EnvironmentData::TryGetCurrent in report

PR-URL: #167
X-Profiler · Apr 26, 2022 · f2c1109 · f2c1109
1 parent 74b7090
commit f2c1109
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/commands/report/uv_statistics.cc b/src/commands/report/uv_statistics.cc
@@ -384,7 +384,7 @@ static void walkHandle(uv_handle_t* h, void* arg) {
 
 void NodeReport::SetUvStatistics(JSONWriter* writer) {
   writer->json_arraystart("libuvHandles");
-  EnvironmentData* env_data = EnvironmentData::GetCurrent(isolate_);
+  EnvironmentData* env_data = EnvironmentData::TryGetCurrent();
   if (env_data != nullptr) {
     uv_loop_t* loop = env_data->loop();
     uv_walk(loop, walkHandle, (void*)writer);

diff --git a/src/xpf_node.h b/src/xpf_node.h
@@ -10,7 +10,7 @@ namespace xprofiler {
  */
 
 inline void AtExit(v8::Isolate* isolate, void (*cb)(void* arg), void* arg) {
-#if NODE_MAJOR_VERSION >= 10
+#if NODE_MODULE_VERSION >= NODE_10_0_MODULE_VERSION
   // node::GetCurrentEnvironment is available since v10.x.
   // We don't need to support multiple environments before v10.x.
   node::Environment* env =

diff --git a/src/xpf_v8.h b/src/xpf_v8.h
@@ -35,7 +35,7 @@ class HandleScope {
 };
 
 inline v8::Isolate* TryGetCurrentIsolate() {
-#if NODE_MODULE_VERSION > NODE_16_0_MODULE_VERSION
+#if NODE_MODULE_VERSION >= NODE_16_0_MODULE_VERSION
   return v8::Isolate::TryGetCurrent();
 #else
   return v8::Isolate::GetCurrent();