Skip to content

Fix gc stats race condition and add timestamp of the gc run #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
schleyfox merged 1 commit into from
May 22, 2018
Merged

Fix gc stats race condition and add timestamp of the gc run #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 37 additions & 23 deletions src/memwatch.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

#include <math.h> // for pow
#include <time.h> // for time
#include <sys/time.h>

using namespace v8;
using namespace node;
Expand All @@ -42,6 +43,21 @@ class UponGCCallback : public Nan::AsyncResource {

UponGCCallback *uponGCCallback = NULL;

struct GCStats {
// counts of different types of gc events
size_t gcScavengeCount;
uint64_t gcScavengeTime;

size_t gcMarkSweepCompactCount;
uint64_t gcMarkSweepCompactTime;

size_t gcIncrementalMarkingCount;
uint64_t gcIncrementalMarkingTime;

size_t gcProcessWeakCallbacksCount;
uint64_t gcProcessWeakCallbacksTime;
};

struct Baton {
uv_work_t req;
size_t total_heap_size;
Expand All @@ -53,28 +69,18 @@ struct Baton {
size_t malloced_memory;
size_t peak_malloced_memory;

GCStats stats;

uint64_t gc_time;

uint64_t gc_ts;

GCType type;
GCCallbackFlags flags;
};

static uint64_t currentGCStartTime = 0;
static struct
{
// counts of different types of gc events
size_t gcScavengeCount;
uint64_t gcScavengeTime;

size_t gcMarkSweepCompactCount;
uint64_t gcMarkSweepCompactTime;

size_t gcIncrementalMarkingCount;
uint64_t gcIncrementalMarkingTime;

size_t gcProcessWeakCallbacksCount;
uint64_t gcProcessWeakCallbacksTime;
} s_stats;
static GCStats s_stats = {0, 0, 0, 0, 0, 0, 0, 0};

static v8::Local<v8::Number> javascriptNumber(uint64_t n) {
if (n < pow(2, 32)) {
Expand All @@ -98,14 +104,16 @@ static void AsyncMemwatchAfter(uv_work_t* request) {

Local<Object> stats = Nan::New<v8::Object>();

stats->Set(Nan::New("gcScavengeCount").ToLocalChecked(), javascriptNumberSize(s_stats.gcScavengeCount));
stats->Set(Nan::New("gcScavengeTime").ToLocalChecked(), javascriptNumber(s_stats.gcScavengeTime));
stats->Set(Nan::New("gcMarkSweepCompactCount").ToLocalChecked(), javascriptNumberSize(s_stats.gcMarkSweepCompactCount));
stats->Set(Nan::New("gcMarkSweepCompactTime").ToLocalChecked(), javascriptNumber(s_stats.gcMarkSweepCompactTime));
stats->Set(Nan::New("gcIncrementalMarkingCount").ToLocalChecked(), javascriptNumberSize(s_stats.gcIncrementalMarkingCount));
stats->Set(Nan::New("gcIncrementalMarkingTime").ToLocalChecked(), javascriptNumber(s_stats.gcIncrementalMarkingTime));
stats->Set(Nan::New("gcProcessWeakCallbacksCount").ToLocalChecked(), javascriptNumberSize(s_stats.gcProcessWeakCallbacksCount));
stats->Set(Nan::New("gcProcessWeakCallbacksTime").ToLocalChecked(), javascriptNumber(s_stats.gcProcessWeakCallbacksTime));
stats->Set(Nan::New("gc_ts").ToLocalChecked(), javascriptNumber(b->gc_ts));

stats->Set(Nan::New("gcScavengeCount").ToLocalChecked(), javascriptNumberSize(b->stats.gcScavengeCount));
stats->Set(Nan::New("gcScavengeTime").ToLocalChecked(), javascriptNumber(b->stats.gcScavengeTime));
stats->Set(Nan::New("gcMarkSweepCompactCount").ToLocalChecked(), javascriptNumberSize(b->stats.gcMarkSweepCompactCount));
stats->Set(Nan::New("gcMarkSweepCompactTime").ToLocalChecked(), javascriptNumber(b->stats.gcMarkSweepCompactTime));
stats->Set(Nan::New("gcIncrementalMarkingCount").ToLocalChecked(), javascriptNumberSize(b->stats.gcIncrementalMarkingCount));
stats->Set(Nan::New("gcIncrementalMarkingTime").ToLocalChecked(), javascriptNumber(b->stats.gcIncrementalMarkingTime));
stats->Set(Nan::New("gcProcessWeakCallbacksCount").ToLocalChecked(), javascriptNumberSize(b->stats.gcProcessWeakCallbacksCount));
stats->Set(Nan::New("gcProcessWeakCallbacksTime").ToLocalChecked(), javascriptNumber(b->stats.gcProcessWeakCallbacksTime));

stats->Set(Nan::New("total_heap_size").ToLocalChecked(), javascriptNumberSize(b->total_heap_size));
stats->Set(Nan::New("total_heap_size_executable").ToLocalChecked(), javascriptNumberSize(b->total_heap_size_executable));
Expand Down Expand Up @@ -168,6 +176,11 @@ NAN_GC_CALLBACK(memwatch::after_gc) {

Nan::GetHeapStatistics(&hs);

timeval tv;
gettimeofday(&tv, NULL);

baton->gc_ts = (tv.tv_sec * 1000000) + tv.tv_usec;

baton->total_heap_size = hs.total_heap_size();
baton->total_heap_size_executable = hs.total_heap_size_executable();
baton->total_physical_size = hs.total_physical_size();
Expand All @@ -179,6 +192,7 @@ NAN_GC_CALLBACK(memwatch::after_gc) {
baton->gc_time = gcTime;
baton->type = type;
baton->flags = flags;
baton->stats = s_stats;
baton->req.data = (void *) baton;

// schedule our work to run in a moment, once gc has fully completed.
Expand Down