--wip-- [skip ci]

Author: GuillaumeLagrange

packages/core/src/native_core/instruments/hooks_wrapper.cc

@@ -6,52 +6,33 @@ namespace codspeed_native {
 namespace instruments {
 namespace hooks_wrapper {
 
-// Global instance to maintain state across calls
-static std::unique_ptr<InstrumentHooks, decltype(&instrument_hooks_deinit)>
-    g_hooks{nullptr, &instrument_hooks_deinit};
-
-// Initialize instrument hooks if not already done
-static InstrumentHooks *ensureInitialized() {
-  if (!g_hooks) {
-    InstrumentHooks *hooks = instrument_hooks_init();
-    if (hooks) {
-      g_hooks.reset(hooks);
-    }
+static InstrumentHooks *hooks = nullptr;
+
+void InitializeGlobal() {
+  printf("In InitializeGlobal\n");
+  if (!hooks) {
+    printf("Foo\n");
+    hooks = instrument_hooks_init();
+    printf("Bar\n");
   }
-  return g_hooks.get();
 }
 
 Napi::Boolean IsInstrumented(const Napi::CallbackInfo &info) {
   Napi::Env env = info.Env();
-  InstrumentHooks *hooks = ensureInitialized();
-
-  if (!hooks) {
-    return Napi::Boolean::New(env, false);
-  }
 
   bool instrumented = instrument_hooks_is_instrumented(hooks);
   return Napi::Boolean::New(env, instrumented);
 }
 
 Napi::Number StartBenchmark(const Napi::CallbackInfo &info) {
   Napi::Env env = info.Env();
-  InstrumentHooks *hooks = ensureInitialized();
-
-  if (!hooks) {
-    return Napi::Number::New(env, 1); // Return error code
-  }
 
   uint8_t result = instrument_hooks_start_benchmark(hooks);
   return Napi::Number::New(env, result);
 }
 
 Napi::Number StopBenchmark(const Napi::CallbackInfo &info) {
   Napi::Env env = info.Env();
-  InstrumentHooks *hooks = ensureInitialized();
-
-  if (!hooks) {
-    return Napi::Number::New(env, 1); // Return error code
-  }
 
   uint8_t result = instrument_hooks_stop_benchmark(hooks);
   return Napi::Number::New(env, result);
@@ -72,11 +53,6 @@ Napi::Number SetExecutedBenchmark(const Napi::CallbackInfo &info) {
     return Napi::Number::New(env, 1);
   }
 
-  InstrumentHooks *hooks = ensureInitialized();
-  if (!hooks) {
-    return Napi::Number::New(env, 1);
-  }
-
   uint32_t pid = info[0].As<Napi::Number>().Uint32Value();
   std::string uri = info[1].As<Napi::String>().Utf8Value();
 
@@ -100,11 +76,6 @@ Napi::Number SetIntegration(const Napi::CallbackInfo &info) {
     return Napi::Number::New(env, 1);
   }
 
-  InstrumentHooks *hooks = ensureInitialized();
-  if (!hooks) {
-    return Napi::Number::New(env, 1);
-  }
-
   std::string name = info[0].As<Napi::String>().Utf8Value();
   std::string version = info[1].As<Napi::String>().Utf8Value();
 
@@ -116,6 +87,10 @@ Napi::Number SetIntegration(const Napi::CallbackInfo &info) {
 Napi::Object Initialize(Napi::Env env, Napi::Object exports) {
   Napi::Object instrumentHooksObj = Napi::Object::New(env);
 
+  printf("In instrument hooks init\n");
+  InitializeGlobal();
+  printf("1\n");
+
   instrumentHooksObj.Set(Napi::String::New(env, "isInstrumented"),
                          Napi::Function::New(env, IsInstrumented));
   instrumentHooksObj.Set(Napi::String::New(env, "startBenchmark"),
@@ -127,8 +102,11 @@ Napi::Object Initialize(Napi::Env env, Napi::Object exports) {
   instrumentHooksObj.Set(Napi::String::New(env, "setIntegration"),
                          Napi::Function::New(env, SetIntegration));
 
+  printf("2\n");
+
   exports.Set(Napi::String::New(env, "InstrumentHooks"), instrumentHooksObj);
 
+  printf("3\n");
   return exports;
 }
 

packages/core/src/native_core/instruments/hooks_wrapper.h

@@ -7,6 +7,11 @@ namespace codspeed_native {
 namespace instruments {
 namespace hooks_wrapper {
 
+// Global initialization
+// WARNING: InitializeGlobal() must be called before using any other functions
+// All API functions assume the global instance is already initialized
+void InitializeGlobal();
+
 Napi::Boolean IsInstrumented(const Napi::CallbackInfo &info);
 Napi::Number StartBenchmark(const Napi::CallbackInfo &info);
 Napi::Number StopBenchmark(const Napi::CallbackInfo &info);

packages/core/src/native_core/native_core.cc

@@ -5,9 +5,12 @@
 namespace codspeed_native {
 
 Napi::Object Initialize(Napi::Env env, Napi::Object exports) {
+  printf("Initializing native core module...\n");
   codspeed_native::LinuxPerf::Initialize(env, exports);
   codspeed_native::instruments::hooks_wrapper::Initialize(env, exports);
 
+  printf("Native core module init done.\n");
+
   return exports;
 }