Skip to content
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

Jump to bottom

False positive on OOM error #212

Merged
merged 3 commits into from Jul 6, 2021
Merged

False positive on OOM error #212

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1881bb
gc callback can happen between init and set
seanmakesgames Jul 5, 2021
46dd270
rem printf
seanmakesgames Jul 5, 2021
cdbdbc2
Update ext/mini_racer_extension/mini_racer_extension.cc
seanmakesgames Jul 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions ext/mini_racer_extension/mini_racer_extension.cc
View file
Open in desktop
Expand Up @@ -467,6 +467,14 @@ nogvl_context_eval(void* arg) {

IsolateData::Init(isolate);

if (eval_params->max_memory > 0) {
IsolateData::Set(isolate, IsolateData::MEM_SOFTLIMIT_MAX, eval_params->max_memory);
if (!isolate_info->added_gc_cb) {
isolate->AddGCEpilogueCallback(gc_callback);
seanmakesgames marked this conversation as resolved.
Show resolved Hide resolved
isolate_info->added_gc_cb = true;
}
}

MaybeLocal<Script> parsed_script;

if (eval_params->filename) {
Expand All @@ -491,14 +499,6 @@ nogvl_context_eval(void* arg) {
result->message->Reset(isolate, trycatch.Exception());
} else {
// parsing successful
if (eval_params->max_memory > 0) {
IsolateData::Set(isolate, IsolateData::MEM_SOFTLIMIT_MAX, eval_params->max_memory);
if (!isolate_info->added_gc_cb) {
isolate->AddGCEpilogueCallback(gc_callback);
isolate_info->added_gc_cb = true;
}
}

if (eval_params->marshal_stackdepth > 0) {
StackCounter::SetMax(isolate, eval_params->marshal_stackdepth);
}
Expand Down