refactor jsapi - platform

X-Profiler · Oct 27, 2022 · b87afdc · b87afdc
1 parent 5ed0399
commit b87afdc
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 27 deletions.
diff --git a/binding.gyp b/binding.gyp
@@ -50,6 +50,7 @@
                 "src/jsapi/export_hooks.cc",
                 "src/jsapi/export_http.cc",
                 "src/jsapi/export_thread_logbypass.cc",
+                "src/jsapi/export_thread_listener.cc",
             ],
             "include_dirs": [
                 'src',

diff --git a/src/commands/send.cc b/src/commands/send.cc
@@ -1,5 +1,5 @@
-#include "../library/json.hpp"
-#include "../platform/platform.h"
+#include "library/json.hpp"
+#include "platform/platform.h"
 
 namespace xprofiler {
 using nlohmann::json;

diff --git a/src/jsapi/include/export_thread_logbypass.h b/src/jsapi/include/export_thread_logbypass.h
@@ -4,7 +4,7 @@
 #include "nan.h"
 
 namespace xprofiler {
-void RunLogBypass(const Nan::FunctionCallbackInfo<v8::Value>& info);
+void CheckSocketPath(const Nan::FunctionCallbackInfo<v8::Value>& info);
 }
 
 #endif /* XPROFILER_SRC_JSAPI_THREAD_LOGBYPASS_H */
diff --git a/src/jsapi/include/export_utils.h b/src/jsapi/include/export_utils.h
@@ -0,0 +1,10 @@
+#ifndef XPROFILER_SRC_JSAPI_UTILS_H
+#define XPROFILER_SRC_JSAPI_UTILS_H
+
+#include "nan.h"
+
+namespace xprofiler {
+void RunLogBypass(const Nan::FunctionCallbackInfo<v8::Value>& info);
+}
+
+#endif /* XPROFILER_SRC_JSAPI_UTILS_H */
diff --git a/src/logbypass/cpu.cc b/src/logbypass/cpu.cc
@@ -1,5 +1,5 @@
-#include "../logger.h"
-#include "../platform/platform.h"
+#include "logger.h"
+#include "platform/platform.h"
 
 namespace xprofiler {
 #define EXTRA_SYMBOL

diff --git a/src/platform/platform.h b/src/platform/platform.h
@@ -3,7 +3,6 @@
 #include <string>
 
 #include "library/writer.h"
-#include "nan.h"
 
 namespace xprofiler {
 
@@ -29,9 +28,6 @@ void PrintLoadedLibraries(JSONWriter* writer);
 
 // coredumper
 void WriteCore(std::string filename);
-
-// js binding
-void CheckSocketPath(const Nan::FunctionCallbackInfo<v8::Value>& info);
 }  // namespace xprofiler
 
 #endif /* XPROFILER_SRC_PLATFORM_PLATFORM_H */
diff --git a/src/platform/unix/ipc.cc b/src/platform/unix/ipc.cc
@@ -4,7 +4,7 @@
 #include <sys/un.h>
 #include <unistd.h>
 
-#include "../../logger.h"
+#include "logger.h"
 #include "configure-inl.h"
 
 namespace xprofiler {

diff --git a/src/platform/unix/report.cc b/src/platform/unix/report.cc
@@ -32,7 +32,7 @@
 #include <mach-o/dyld.h>
 #endif
 
-#include "../../library/writer.h"
+#include "library/writer.h"
 
 extern char** environ;
 

diff --git a/src/platform/unix/utils.cc b/src/platform/unix/utils.cc
@@ -2,8 +2,7 @@
 #include <sys/time.h>
 #include <unistd.h>
 
-#include "../platform.h"
-#include "uv.h"
+#include "platform/platform.h"
 
 namespace xprofiler {
 void SleepCrossPlatform(int seconds) { sleep(seconds); }

diff --git a/src/platform/win/ipc_win.cc b/src/platform/win/ipc_win.cc
@@ -1,7 +1,7 @@
 #ifdef _WIN32
 #include <windows.h>
 
-#include "../../logger.h"
+#include "logger.h"
 #include "configure-inl.h"
 #include "uv.h"
 

diff --git a/src/platform/win/report_win.cc b/src/platform/win/report_win.cc
@@ -7,7 +7,7 @@
 #include <sstream>
 #include <string>
 
-#include "../../library/writer.h"
+#include "library/writer.h"
 
 namespace xprofiler {
 using std::ostringstream;

diff --git a/src/platform/win/utils_win.cc b/src/platform/win/utils_win.cc
@@ -1,7 +1,7 @@
 #ifdef _WIN32
 #include <windows.h>
 
-#include "../platform.h"
+#include "platform/platform.h"
 #include "uv.h"
 
 namespace xprofiler {

diff --git a/src/xprofiler.cc b/src/xprofiler.cc
@@ -5,9 +5,9 @@
 #include "jsapi/include/export_logger.h"
 #include "jsapi/include/export_thread_listener.h"
 #include "jsapi/include/export_thread_logbypass.h"
+#include "jsapi/include/export_utils.h"
 #include "library/common.h"
 #include "nan.h"
-#include "platform/platform.h"
 #include "process_data.h"
 
 namespace xprofiler {
@@ -34,31 +34,31 @@ NAN_MODULE_INIT(Initialize) {
   // environment
   CREATE_JS_BINDING(setup, JsSetupEnvironmentData);
 
+  // set hooks
+  CREATE_JS_BINDING(setHooks, SetHooks);
+
+  // utils
+  CREATE_JS_BINDING(checkSocketPath, CheckSocketPath);
+
   // config
   CREATE_JS_BINDING(configure, Configure);
   CREATE_JS_BINDING(getConfig, GetConfig);
 
+  // uv thread
+  CREATE_JS_BINDING(runLogBypass, RunLogBypass);
+  CREATE_JS_BINDING(runCommandsListener, RunCommandsListener);
+
   // logger
   CREATE_JS_BINDING(info, JsInfo);
   CREATE_JS_BINDING(error, JsError);
   CREATE_JS_BINDING(debug, JsDebug);
 
-  // set hooks
-  CREATE_JS_BINDING(setHooks, SetHooks);
-
   // http status
   CREATE_JS_BINDING(addLiveRequest, AddLiveRequest);
   CREATE_JS_BINDING(addCloseRequest, AddCloseRequest);
   CREATE_JS_BINDING(addSentRequest, AddSentRequest);
   CREATE_JS_BINDING(addRequestTimeout, AddRequestTimeout);
   CREATE_JS_BINDING(addHttpStatusCode, AddHttpStatusCode);
-
-  // performance log
-  CREATE_JS_BINDING(runLogBypass, RunLogBypass);
-
-  // commands listener
-  CREATE_JS_BINDING(checkSocketPath, CheckSocketPath);
-  CREATE_JS_BINDING(runCommandsListener, RunCommandsListener);
 }
 
 NODE_MODULE_CONTEXT_AWARE(xprofiler, Initialize)