Skip to content
This repository has been archived by the owner on Sep 17, 2024. It is now read-only.

Commit

Permalink
fix: cleanup timer and reuse exports (#229)
Browse files Browse the repository at this point in the history 
* fix: cleanup timer and reuse exports

* fix: use empty instead of size

* fix: specify lint input
  • Loading branch information
@JonasBa
JonasBa authored Jan 8, 2024
1 parent d6b8891 commit 779867d
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 62 deletions.
121 changes: 60 additions & 61 deletions bindings/cpu_profiler.cc
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@

#include <node_api.h>

#include <assert.h>
#include <math.h>
#include <node_api.h>
#include <string.h>
#include <uv.h>
#include <v8-profiler.h>
#include <v8.h>

#include <functional>
#include <string>
#include <unordered_map>

#include <v8-profiler.h>
#include <v8.h>

#include <uv.h>

#define FORMAT_SAMPLED 2
#define FORMAT_RAW 1

Expand All @@ -26,13 +23,13 @@
#endif

static const uint8_t kMaxStackDepth(128);
static const float kSamplingFrequency(99.0); // 99 to avoid lockstep sampling
static const float kSamplingFrequency(99.0); // 99 to avoid lockstep sampling
static const float kSamplingHz(1 / kSamplingFrequency);
static const int kSamplingInterval(kSamplingHz * 1e6);
static const v8::CpuProfilingNamingMode
kNamingMode(v8::CpuProfilingNamingMode::kDebugNaming);
static const v8::CpuProfilingLoggingMode
kDefaultLoggingMode(v8::CpuProfilingLoggingMode::kEagerLogging);
static const v8::CpuProfilingNamingMode kNamingMode(
v8::CpuProfilingNamingMode::kDebugNaming);
static const v8::CpuProfilingLoggingMode kDefaultLoggingMode(
v8::CpuProfilingLoggingMode::kEagerLogging);

// Allow users to override the default logging mode via env variable. This is
// useful because sometimes the flow of the profiled program can be to execute
Expand All @@ -54,8 +51,7 @@ v8::CpuProfilingLoggingMode GetLoggingMode() {
// other times it'll likely be set to lazy as eager is the default
if (strcmp(logging_mode, kLazyLoggingMode) == 0) {
return v8::CpuProfilingLoggingMode::kLazyLogging;
}
else if (strcmp(logging_mode, kEagerLoggingMode) == 0) {
} else if (strcmp(logging_mode, kEagerLoggingMode) == 0) {
return v8::CpuProfilingLoggingMode::kEagerLogging;
}

Expand All @@ -72,7 +68,7 @@ enum class ProfileStatus {
};

class MeasurementsTicker {
private:
private:
uv_timer_t timer;
uint64_t period_ms;
std::unordered_map<std::string,
Expand All @@ -84,7 +80,7 @@ class MeasurementsTicker {
v8::HeapStatistics heap_stats;
uv_cpu_info_t cpu_stats;

public:
public:
MeasurementsTicker(uv_loop_t *loop)
: period_ms(100), isolate(v8::Isolate::GetCurrent()) {
uv_timer_init(loop, &timer);
Expand All @@ -109,6 +105,11 @@ class MeasurementsTicker {
const std::function<bool(uint64_t, double)> &cb);

size_t listener_count();

~MeasurementsTicker() {
uv_timer_stop(&timer);
uv_close(reinterpret_cast<uv_handle_t *>(&timer), nullptr);
}
};

size_t MeasurementsTicker::listener_count() {
Expand Down Expand Up @@ -222,7 +223,7 @@ void MeasurementsTicker::remove_cpu_listener(
};

class Profiler {
public:
public:
std::unordered_map<std::string, SentryProfile *> active_profiles;

MeasurementsTicker measurements_ticker;
Expand All @@ -231,15 +232,11 @@ class Profiler {
explicit Profiler(const napi_env &env, v8::Isolate *isolate)
: measurements_ticker(uv_default_loop()),
cpu_profiler(
v8::CpuProfiler::New(isolate, kNamingMode, GetLoggingMode())) {
napi_add_env_cleanup_hook(env, DeleteInstance, this);
}

static void DeleteInstance(void *data);
v8::CpuProfiler::New(isolate, kNamingMode, GetLoggingMode())) {}
};

class SentryProfile {
private:
private:
uint64_t started_at;
uint16_t heap_write_index = 0;
uint16_t cpu_write_index = 0;
Expand All @@ -256,7 +253,7 @@ class SentryProfile {
ProfileStatus status = ProfileStatus::kNotStarted;
std::string id;

public:
public:
explicit SentryProfile(const char *id)
: started_at(uv_hrtime()),
memory_sampler_cb([this](uint64_t ts, v8::HeapStatistics &stats) {
Expand Down Expand Up @@ -288,7 +285,8 @@ class SentryProfile {
return false;
}),

status(ProfileStatus::kNotStarted), id(id) {
status(ProfileStatus::kNotStarted),
id(id) {
heap_stats_ts.reserve(300);
heap_stats_usage.reserve(300);
cpu_stats_ts.reserve(300);
Expand Down Expand Up @@ -335,21 +333,11 @@ static void CleanupSentryProfile(Profiler *profiler,
return;
}

sentry_profile->Stop(profiler);
profiler->active_profiles.erase(profile_id);
delete sentry_profile;
};

void Profiler::DeleteInstance(void *data) {
Profiler *profiler = static_cast<Profiler *>(data);

for (auto &profile : profiler->active_profiles) {
CleanupSentryProfile(profiler, profile.second, profile.first);
}

profiler->cpu_profiler->Dispose();
delete profiler;
}

v8::CpuProfile *SentryProfile::Stop(Profiler *profiler) {
// Stop the CPU Profiler
v8::CpuProfile *profile = profiler->cpu_profiler->StopProfiling(
Expand Down Expand Up @@ -470,10 +458,10 @@ static napi_value GetFrameModuleWrapped(napi_env env, napi_callback_info info) {
return napi_module;
}

napi_value
CreateFrameNode(const napi_env &env, const v8::CpuProfileNode &node,
std::unordered_map<std::string, std::string> &module_cache,
napi_value &resources) {
napi_value CreateFrameNode(
const napi_env &env, const v8::CpuProfileNode &node,
std::unordered_map<std::string, std::string> &module_cache,
napi_value &resources) {
napi_value js_node;
napi_create_object(env, &js_node);

Expand Down Expand Up @@ -681,11 +669,10 @@ static void GetSamples(const napi_env &env, const v8::CpuProfile *profile,
}
}

static napi_value
TranslateMeasurementsDouble(const napi_env &env, const char *unit,
const uint16_t size,
const std::vector<double> &values,
const std::vector<uint64_t> &timestamps) {
static napi_value TranslateMeasurementsDouble(
const napi_env &env, const char *unit, const uint16_t size,
const std::vector<double> &values,
const std::vector<uint64_t> &timestamps) {
if (size > values.size() || size > timestamps.size()) {
napi_throw_range_error(env, "NAPI_ERROR",
"CPU measurement size is larger than the number of "
Expand Down Expand Up @@ -736,10 +723,10 @@ TranslateMeasurementsDouble(const napi_env &env, const char *unit,
return measurement;
}

static napi_value
TranslateMeasurements(const napi_env &env, const char *unit,
const uint16_t size, const std::vector<uint64_t> &values,
const std::vector<uint64_t> &timestamps) {
static napi_value TranslateMeasurements(
const napi_env &env, const char *unit, const uint16_t size,
const std::vector<uint64_t> &values,
const std::vector<uint64_t> &timestamps) {
if (size > values.size() || size > timestamps.size()) {
napi_throw_range_error(env, "NAPI_ERROR",
"Memory measurement size is larger than the number "
Expand Down Expand Up @@ -1049,6 +1036,26 @@ static napi_value StopProfiling(napi_env env, napi_callback_info info) {
return js_profile;
};

void FreeAddonData(napi_env env, void *data, void *hint) {
Profiler *profiler = static_cast<Profiler *>(data);

if (profiler == nullptr) {
return;
}

if (!profiler->active_profiles.empty()) {
for (auto &profile : profiler->active_profiles) {
CleanupSentryProfile(profiler, profile.second, profile.first);
}
}

if (profiler->cpu_profiler != nullptr) {
profiler->cpu_profiler->Dispose();
}

delete profiler;
}

napi_value Init(napi_env env, napi_value exports) {
v8::Isolate *isolate = v8::Isolate::GetCurrent();

Expand All @@ -1060,22 +1067,14 @@ napi_value Init(napi_env env, napi_value exports) {

Profiler *profiler = new Profiler(env, isolate);

if (napi_set_instance_data(env, profiler, NULL, NULL) != napi_ok) {
if (napi_set_instance_data(env, profiler, FreeAddonData, NULL) != napi_ok) {
napi_throw_error(env, nullptr, "Failed to set instance data for profiler.");
return NULL;
}

napi_value external;
if (napi_create_external(env, profiler, nullptr, nullptr, &external) !=
napi_ok) {
napi_throw_error(env, nullptr,
"Failed to create external for profiler instance.");
return NULL;
}

napi_value start_profiling;
if (napi_create_function(env, "startProfiling", NAPI_AUTO_LENGTH,
StartProfiling, external,
StartProfiling, exports,
&start_profiling) != napi_ok) {
napi_throw_error(env, nullptr, "Failed to create startProfiling function.");
return NULL;
Expand All @@ -1090,7 +1089,7 @@ napi_value Init(napi_env env, napi_value exports) {

napi_value stop_profiling;
if (napi_create_function(env, "stopProfiling", NAPI_AUTO_LENGTH,
StopProfiling, external,
StopProfiling, exports,
&stop_profiling) != napi_ok) {
napi_throw_error(env, nullptr, "Failed to create stopProfiling function.");
return NULL;
Expand All @@ -1105,7 +1104,7 @@ napi_value Init(napi_env env, napi_value exports) {

napi_value get_frame_module;
if (napi_create_function(env, "getFrameModule", NAPI_AUTO_LENGTH,
GetFrameModuleWrapped, external,
GetFrameModuleWrapped, exports,
&get_frame_module) != napi_ok) {
napi_throw_error(env, nullptr, "Failed to create getFrameModule function.");
return NULL;
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"clean": "rm -rf ./lib && rm -rf build",
"lint": "npm run lint:eslint && npm run lint:clang",
"lint:eslint": "eslint . --format stylish",
"lint:clang": "./node_modules/.bin/check-clang-format --style=file",
"lint:clang": "./node_modules/.bin/check-clang-format --style=file -i ./**/*.cc",
"fix": "npm run fix:eslint && npm run fix:clang",
"fix:eslint": "eslint . --format stylish --fix",
"fix:clang": "./node_modules/.bin/clang-format --style=file -i ./**/*.cc ",
Expand Down

0 comments on commit 779867d

Please sign in to comment.