GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — diagnostics_channel: fix diagnostics channel memory leak · nodejs/node@1a47a7b

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

lib
- diagnostics_channel.js
src
- node_util.cc
- node_util.h
test/parallel
- test-diagnostics-channel-memory-leak.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎lib/diagnostics_channel.js‎`

Copy file name to clipboardExpand all lines: lib/diagnostics_channel.js

+3Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,9 @@ function unsubscribe(name, subscription) {`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`channels[name].decRef();`
	`125`	`+ if (channels[name].getRef() === 0) {`
	`126`	`+ delete channels[name];`
	`127`	`+ }`
`125`	`128`	`return true;`
`126`	`129`	`}`
`127`	`130`

Collapse file

`‎src/node_util.cc‎`

Copy file name to clipboardExpand all lines: src/node_util.cc

+9Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -294,6 +294,13 @@ void WeakReference::Get(const FunctionCallbackInfo<Value>& args) {`
`294`	`294`	`args.GetReturnValue().Set(weak_ref->target_.Get(isolate));`
`295`	`295`	`}`
`296`	`296`
	`297`	`+void WeakReference::GetRef(const FunctionCallbackInfo<Value>& args) {`
	`298`	`+ WeakReference* weak_ref = Unwrap<WeakReference>(args.Holder());`
	`299`	`+ Isolate* isolate = args.GetIsolate();`
	`300`	`+ args.GetReturnValue().Set(`
	`301`	`+ v8::Number::New(isolate, weak_ref->reference_count_));`
	`302`	`+}`
	`303`	`+`
`297`	`304`	`void WeakReference::IncRef(const FunctionCallbackInfo<Value>& args) {`
`298`	`305`	`WeakReference* weak_ref = Unwrap<WeakReference>(args.Holder());`
`299`	`306`	`weak_ref->reference_count_++;`
`@@ -391,6 +398,7 @@ void RegisterExternalReferences(ExternalReferenceRegistry* registry) {`
`391`	`398`	`registry->Register(ArrayBufferViewHasBuffer);`
`392`	`399`	`registry->Register(WeakReference::New);`
`393`	`400`	`registry->Register(WeakReference::Get);`
	`401`	`+ registry->Register(WeakReference::GetRef);`
`394`	`402`	`registry->Register(WeakReference::IncRef);`
`395`	`403`	`registry->Register(WeakReference::DecRef);`
`396`	`404`	`registry->Register(GuessHandleType);`
`@@ -464,6 +472,7 @@ void Initialize(Local<Object> target,`
`464`	`472`	`WeakReference::kInternalFieldCount);`
`465`	`473`	`weak_ref->Inherit(BaseObject::GetConstructorTemplate(env));`
`466`	`474`	`SetProtoMethod(isolate, weak_ref, "get", WeakReference::Get);`
	`475`	`+ SetProtoMethod(isolate, weak_ref, "getRef", WeakReference::GetRef);`
`467`	`476`	`SetProtoMethod(isolate, weak_ref, "incRef", WeakReference::IncRef);`
`468`	`477`	`SetProtoMethod(isolate, weak_ref, "decRef", WeakReference::DecRef);`
`469`	`478`	`SetConstructorFunction(context, target, "WeakReference", weak_ref);`

Collapse file

`‎src/node_util.h‎`

Copy file name to clipboardExpand all lines: src/node_util.h

+1Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ class WeakReference : public SnapshotableObject {`
`23`	`23`	`v8::Local<v8::Object> target);`
`24`	`24`	`static void New(const v8::FunctionCallbackInfo<v8::Value>& args);`
`25`	`25`	`static void Get(const v8::FunctionCallbackInfo<v8::Value>& args);`
	`26`	`+ static void GetRef(const v8::FunctionCallbackInfo<v8::Value>& args);`
`26`	`27`	`static void IncRef(const v8::FunctionCallbackInfo<v8::Value>& args);`
`27`	`28`	`static void DecRef(const v8::FunctionCallbackInfo<v8::Value>& args);`
`28`	`29`

Collapse file

`‎test/parallel/test-diagnostics-channel-memory-leak.js‎`

Copy file name to clipboard

+24Lines changed: 24 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,24 @@`
	`1`	`+// Flags: --expose-gc`
	`2`	`+'use strict';`
	`3`	`+`
	`4`	`+// This test ensures that diagnostic channel references aren't leaked.`
	`5`	`+`
	`6`	`+require('../common');`
	`7`	`+const { ok } = require('assert');`
	`8`	`+`
	`9`	`+const { subscribe, unsubscribe } = require('diagnostics_channel');`
	`10`	`+`
	`11`	`+function noop() {}`
	`12`	`+`
	`13`	`+const heapUsedBefore = process.memoryUsage().heapUsed;`
	`14`	`+`
	`15`	`+for (let i = 0; i < 1000; i++) {`
	`16`	`+ subscribe(String(i), noop);`
	`17`	`+ unsubscribe(String(i), noop);`
	`18`	`+}`
	`19`	`+`
	`20`	`+global.gc();`
	`21`	`+`
	`22`	`+const heapUsedAfter = process.memoryUsage().heapUsed;`
	`23`	`+`
	`24`	`+ok(heapUsedBefore >= heapUsedAfter);`

0 commit comments

Comments

0 (0)

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.