GeezerVison

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

GeezerVison is showing github.com — src: add Cleanable class to Environment · nodejs/node@424bdc0

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎src/env.cc‎`

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

+5Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1290,6 +1290,11 @@ void Environment::RunCleanup() {`
`1290`	`1290`	`// Defer the BaseObject cleanup after handles are cleaned up.`
`1291`	`1291`	`CleanupHandles();`
`1292`	`1292`
	`1293`	`+ while (!cleanable_queue_.IsEmpty()) {`
	`1294`	`+ Cleanable* cleanable = cleanable_queue_.PopFront();`
	`1295`	`+ cleanable->Clean();`
	`1296`	`+ }`
	`1297`	`+`
`1293`	`1298`	`while (!cleanup_queue_.empty() \|\| principal_realm_->HasCleanupHooks() \|\|`
`1294`	`1299`	`native_immediates_.size() > 0 \|\|`
`1295`	`1300`	`native_immediates_threadsafe_.size() > 0 \|\|`

Collapse file

`‎src/env.h‎`

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

+17Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -598,6 +598,18 @@ void DefaultProcessExitHandlerInternal(Environment* env, ExitCode exit_code);`
`598`	`598`	`v8::Maybe<ExitCode> SpinEventLoopInternal(Environment* env);`
`599`	`599`	`v8::Maybe<ExitCode> EmitProcessExitInternal(Environment* env);`
`600`	`600`
	`601`	`+class Cleanable {`
	`602`	`+ public:`
	`603`	`+ virtual ~Cleanable() = default;`
	`604`	`+`
	`605`	`+ protected:`
	`606`	`+ ListNode<Cleanable> cleanable_queue_;`
	`607`	`+`
	`608`	`+ private:`
	`609`	`+ virtual void Clean() = 0;`
	`610`	`+ friend class Environment;`
	`611`	`+};`
	`612`	`+`
`601`	`613`	`/**`
`602`	`614`	`* Environment is a per-isolate data structure that represents an execution`
`603`	`615`	`* environment. Each environment has a principal realm. An environment can`
`@@ -906,8 +918,12 @@ class Environment final : public MemoryRetainer {`
`906`	`918`
`907`	`919`	`typedef ListHead<HandleWrap, &HandleWrap::handle_wrap_queue_> HandleWrapQueue;`
`908`	`920`	`typedef ListHead<ReqWrapBase, &ReqWrapBase::req_wrap_queue_> ReqWrapQueue;`
	`921`	`+ typedef ListHead<Cleanable, &Cleanable::cleanable_queue_> CleanableQueue;`
`909`	`922`
`910`	`923`	`inline HandleWrapQueue* handle_wrap_queue() { return &handle_wrap_queue_; }`
	`924`	`+ inline CleanableQueue* cleanable_queue() {`
	`925`	`+ return &cleanable_queue_;`
	`926`	`+ }`
`911`	`927`	`inline ReqWrapQueue* req_wrap_queue() { return &req_wrap_queue_; }`
`912`	`928`
`913`	`929`	`// https://w3c.github.io/hr-time/#dfn-time-origin`
`@@ -1196,6 +1212,7 @@ class Environment final : public MemoryRetainer {`
`1196`	`1212`	`// memory are predictable. For more information please refer to`
`1197`	`1213`	// `doc/contributing/node-postmortem-support.md`
`1198`	`1214`	`friend int GenDebugSymbols();`
	`1215`	`+ CleanableQueue cleanable_queue_;`
`1199`	`1216`	`HandleWrapQueue handle_wrap_queue_;`
`1200`	`1217`	`ReqWrapQueue req_wrap_queue_;`
`1201`	`1218`	`std::list<HandleCleanup> handle_cleanup_queue_;`

Collapse file

`‎src/node_buffer.cc‎`

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

+9-12Lines changed: 9 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ using v8::Value;`
`84`	`84`
`85`	`85`	`namespace {`
`86`	`86`
`87`		`-class CallbackInfo {`
	`87`	`+class CallbackInfo : public Cleanable {`
`88`	`88`	`public:`
`89`	`89`	`static inline Local<ArrayBuffer> CreateTrackedArrayBuffer(`
`90`	`90`	`Environment* env,`
`@@ -97,7 +97,7 @@ class CallbackInfo {`
`97`	`97`	`CallbackInfo& operator=(const CallbackInfo&) = delete;`
`98`	`98`
`99`	`99`	`private:`
`100`		`- static void CleanupHook(void* data);`
	`100`	`+ void Clean();`
`101`	`101`	`inline void OnBackingStoreFree();`
`102`	`102`	`inline void CallAndResetCallback();`
`103`	`103`	`inline CallbackInfo(Environment* env,`
`@@ -112,7 +112,6 @@ class CallbackInfo {`
`112`	`112`	`Environment* const env_;`
`113`	`113`	`};`
`114`	`114`
`115`		`-`
`116`	`115`	`Local<ArrayBuffer> CallbackInfo::CreateTrackedArrayBuffer(`
`117`	`116`	`Environment* env,`
`118`	`117`	`char* data,`
`@@ -152,25 +151,23 @@ CallbackInfo::CallbackInfo(Environment* env,`
`152`	`151`	`data_(data),`
`153`	`152`	`hint_(hint),`
`154`	`153`	`env_(env) {`
`155`		`- env->AddCleanupHook(CleanupHook, this);`
	`154`	`+ env->cleanable_queue()->PushFront(this);`
`156`	`155`	`env->isolate()->AdjustAmountOfExternalAllocatedMemory(sizeof(*this));`
`157`	`156`	`}`
`158`	`157`
`159`		`-void CallbackInfo::CleanupHook(void* data) {`
`160`		`- CallbackInfo* self = static_cast<CallbackInfo*>(data);`
`161`		`-`
	`158`	`+void CallbackInfo::Clean() {`
`162`	`159`	`{`
`163`		`- HandleScope handle_scope(self->env_->isolate());`
`164`		`- Local<ArrayBuffer> ab = self->persistent_.Get(self->env_->isolate());`
	`160`	`+ HandleScope handle_scope(env_->isolate());`
	`161`	`+ Local<ArrayBuffer> ab = persistent_.Get(env_->isolate());`
`165`	`162`	`if (!ab.IsEmpty() && ab->IsDetachable()) {`
`166`	`163`	`ab->Detach(Local<Value>()).Check();`
`167`		`- self->persistent_.Reset();`
	`164`	`+ persistent_.Reset();`
`168`	`165`	`}`
`169`	`166`	`}`
`170`	`167`
`171`	`168`	// Call the callback in this case, but don't delete `this` yet because the
`172`	`169`	`// BackingStore deleter callback will do so later.`
`173`		`- self->CallAndResetCallback();`
	`170`	`+ CallAndResetCallback();`
`174`	`171`	`}`
`175`	`172`
`176`	`173`	`void CallbackInfo::CallAndResetCallback() {`
`@@ -182,7 +179,7 @@ void CallbackInfo::CallAndResetCallback() {`
`182`	`179`	`}`
`183`	`180`	`if (callback != nullptr) {`
`184`	`181`	`// Clean up all Environment-related state and run the callback.`
`185`		`- env_->RemoveCleanupHook(CleanupHook, this);`
	`182`	`+ cleanable_queue_.Remove();`
`186`	`183`	`int64_t change_in_bytes = -static_cast<int64_t>(sizeof(*this));`
`187`	`184`	`env_->isolate()->AdjustAmountOfExternalAllocatedMemory(change_in_bytes);`
`188`	`185`

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.