Skip to content

Backport 5786 to v4.x (memory growth with 'vm' module) #6871

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
rvagg merged 5 commits into from
May 20, 2016
Merged

Backport 5786 to v4.x (memory growth with 'vm' module) #6871

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
faa94ff
contextify: cleanup weak ref for global proxy
ofrobots Feb 23, 2016
3d56671
contextify: cleanup weak ref for sandbox
ofrobots Feb 23, 2016
ab00cf5
contextify: replace deprecated SetWeak usage
ofrobots Feb 23, 2016
4d48400
contextify: cache sandbox and context in locals
ofrobots Feb 24, 2016
c6db822
contextify: tie lifetimes of context & sandbox
ofrobots Mar 18, 2016
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
Prev Previous commit
Next Next commit
contextify: cache sandbox and context in locals 
PR-URL: #5392
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
  • Loading branch information
@ofrobots @rvagg
ofrobots authored and rvagg committed May 20, 2016
commit 4d484008816f91c665373d2d471118763c12728d
24 changes: 13 additions & 11 deletions src/node_contextify.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ class ContextifyContext {
Persistent<Context> context_;

public:
explicit ContextifyContext(Environment* env, Local<Object> sandbox_obj)
: env_(env) {
ContextifyContext(Environment* env, Local<Object> sandbox_obj) : env_(env) {
Local<Context> v8_context = CreateV8Context(env, sandbox_obj);
context_.Reset(env->isolate(), v8_context);

Expand Down Expand Up @@ -120,14 +119,15 @@ class ContextifyContext {
Local<Context> context = PersistentToLocal(env()->isolate(), context_);
Local<Object> global =
context->Global()->GetPrototype()->ToObject(env()->isolate());
Local<Object> sandbox_obj = sandbox();

Local<Function> clone_property_method;

Local<Array> names = global->GetOwnPropertyNames();
int length = names->Length();
for (int i = 0; i < length; i++) {
Local<String> key = names->Get(i)->ToString(env()->isolate());
bool has = sandbox()->HasOwnProperty(context, key).FromJust();
bool has = sandbox_obj->HasOwnProperty(context, key).FromJust();
if (!has) {
// Could also do this like so:
//
Expand Down Expand Up @@ -160,7 +160,7 @@ class ContextifyContext {
clone_property_method = Local<Function>::Cast(script->Run());
CHECK(clone_property_method->IsFunction());
}
Local<Value> args[] = { global, key, sandbox() };
Local<Value> args[] = { global, key, sandbox_obj };
clone_property_method->Call(global, ARRAY_SIZE(args), args);
}
}
Expand Down Expand Up @@ -333,16 +333,18 @@ class ContextifyContext {
if (ctx->context_.IsEmpty())
return;

Local<Context> context = ctx->context();
Local<Object> sandbox = ctx->sandbox();
MaybeLocal<Value> maybe_rv =
ctx->sandbox()->GetRealNamedProperty(ctx->context(), property);
sandbox->GetRealNamedProperty(context, property);
if (maybe_rv.IsEmpty()) {
maybe_rv =
ctx->global_proxy()->GetRealNamedProperty(ctx->context(), property);
ctx->global_proxy()->GetRealNamedProperty(context, property);
}

Local<Value> rv;
if (maybe_rv.ToLocal(&rv)) {
if (rv == ctx->sandbox())
if (rv == sandbox)
rv = ctx->global_proxy();

args.GetReturnValue().Set(rv);
Expand Down Expand Up @@ -375,14 +377,14 @@ class ContextifyContext {
if (ctx->context_.IsEmpty())
return;

Local<Context> context = ctx->context();
Maybe<PropertyAttribute> maybe_prop_attr =
ctx->sandbox()->GetRealNamedPropertyAttributes(ctx->context(),
property);
ctx->sandbox()->GetRealNamedPropertyAttributes(context, property);

if (maybe_prop_attr.IsNothing()) {
maybe_prop_attr =
ctx->global_proxy()->GetRealNamedPropertyAttributes(ctx->context(),
property);
ctx->global_proxy()->GetRealNamedPropertyAttributes(context,
property);
}

if (maybe_prop_attr.IsJust()) {
Expand Down