GeezerVison

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

GeezerVison is showing github.com — src: add async context frame to AsyncResource · nodejs/node@58982d7

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

src
- api
  - async_resource.cc
- env-inl.h
- env.h
- node.h

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎src/api/async_resource.cc‎`

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

+8-17Lines changed: 8 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,28 +17,23 @@ AsyncResource::AsyncResource(Isolate* isolate,`
`17`	`17`	`const char* name,`
`18`	`18`	`async_id trigger_async_id)`
`19`	`19`	`: env_(Environment::GetCurrent(isolate)),`
`20`		`- resource_(isolate, resource) {`
	`20`	`+ resource_(isolate, resource),`
	`21`	`+ context_frame_(isolate, async_context_frame::current(isolate)) {`
`21`	`22`	`CHECK_NOT_NULL(env_);`
`22`		`- env_->SetAsyncResourceContextFrame(`
`23`		`- reinterpret_cast<std::uintptr_t>(this),`
`24`		`- {isolate, async_context_frame::current(isolate)});`
`25`	`23`	`async_context_ = EmitAsyncInit(isolate, resource, name, trigger_async_id);`
`26`	`24`	`}`
`27`	`25`
`28`	`26`	`AsyncResource::~AsyncResource() {`
`29`	`27`	`CHECK_NOT_NULL(env_);`
`30`	`28`	`EmitAsyncDestroy(env_, async_context_);`
`31`		`- env_->RemoveAsyncResourceContextFrame(reinterpret_cast<std::uintptr_t>(this));`
`32`	`29`	`}`
`33`	`30`
`34`	`31`	`MaybeLocal<Value> AsyncResource::MakeCallback(Local<Function> callback,`
`35`	`32`	`int argc,`
`36`	`33`	`Local<Value>* argv) {`
`37`	`34`	`auto isolate = env_->isolate();`
`38`		`- auto context_frame =`
`39`		`- env_->GetAsyncResourceContextFrame(reinterpret_cast<std::uintptr_t>(this))`
`40`		`- .Get(isolate);`
`41`		`- async_context_frame::Scope async_context_frame_scope(isolate, context_frame);`
	`35`	`+ async_context_frame::Scope async_context_frame_scope(`
	`36`	`+ isolate, context_frame_.Get(isolate));`
`42`	`37`
`43`	`38`	`return node::MakeCallback(`
`44`	`39`	`isolate, get_resource(), callback, argc, argv, async_context_);`
`@@ -48,10 +43,8 @@ MaybeLocal<Value> AsyncResource::MakeCallback(const char* method,`
`48`	`43`	`int argc,`
`49`	`44`	`Local<Value>* argv) {`
`50`	`45`	`auto isolate = env_->isolate();`
`51`		`- auto context_frame =`
`52`		`- env_->GetAsyncResourceContextFrame(reinterpret_cast<std::uintptr_t>(this))`
`53`		`- .Get(isolate);`
`54`		`- async_context_frame::Scope async_context_frame_scope(isolate, context_frame);`
	`46`	`+ async_context_frame::Scope async_context_frame_scope(`
	`47`	`+ isolate, context_frame_.Get(isolate));`
`55`	`48`
`56`	`49`	`return node::MakeCallback(`
`57`	`50`	`isolate, get_resource(), method, argc, argv, async_context_);`
`@@ -61,10 +54,8 @@ MaybeLocal<Value> AsyncResource::MakeCallback(Local<String> symbol,`
`61`	`54`	`int argc,`
`62`	`55`	`Local<Value>* argv) {`
`63`	`56`	`auto isolate = env_->isolate();`
`64`		`- auto context_frame =`
`65`		`- env_->GetAsyncResourceContextFrame(reinterpret_cast<std::uintptr_t>(this))`
`66`		`- .Get(isolate);`
`67`		`- async_context_frame::Scope async_context_frame_scope(isolate, context_frame);`
	`57`	`+ async_context_frame::Scope async_context_frame_scope(`
	`58`	`+ isolate, context_frame_.Get(isolate));`
`68`	`59`
`69`	`60`	`return node::MakeCallback(`
`70`	`61`	`isolate, get_resource(), symbol, argc, argv, async_context_);`

Collapse file

`‎src/env-inl.h‎`

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

-20Lines changed: 0 additions & 20 deletions

Original file line number	Diff line number	Diff line change
`@@ -908,26 +908,6 @@ inline void Environment::RemoveHeapSnapshotNearHeapLimitCallback(`
`908`	`908`	`heap_limit);`
`909`	`909`	`}`
`910`	`910`
`911`		`-inline void Environment::SetAsyncResourceContextFrame(`
`912`		`- std::uintptr_t async_resource_handle,`
`913`		`- v8::Global<v8::Value>&& context_frame) {`
`914`		`- async_resource_context_frames_.emplace(`
`915`		`- std::make_pair(async_resource_handle, std::move(context_frame)));`
`916`		`-}`
`917`		`-`
`918`		`-inline const v8::Global<v8::Value>& Environment::GetAsyncResourceContextFrame(`
`919`		`- std::uintptr_t async_resource_handle) {`
`920`		`- auto&& async_resource_context_frame =`
`921`		`- async_resource_context_frames_.find(async_resource_handle);`
`922`		`- CHECK_NE(async_resource_context_frame, async_resource_context_frames_.end());`
`923`		`-`
`924`		`- return async_resource_context_frame->second;`
`925`		`-}`
`926`		`-`
`927`		`-inline void Environment::RemoveAsyncResourceContextFrame(`
`928`		`- std::uintptr_t async_resource_handle) {`
`929`		`- async_resource_context_frames_.erase(async_resource_handle);`
`930`		`-}`
`931`	`911`	`} // namespace node`
`932`	`912`
`933`	`913`	`// These two files depend on each other. Including base_object-inl.h after this`

Collapse file

`‎src/env.h‎`

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

-11Lines changed: 0 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -1070,14 +1070,6 @@ class Environment final : public MemoryRetainer {`
`1070`	`1070`
`1071`	`1071`	`v8::Global<v8::Module> temporary_required_module_facade_original;`
`1072`	`1072`
`1073`		`- void SetAsyncResourceContextFrame(std::uintptr_t async_resource_handle,`
`1074`		`- v8::Global<v8::Value>&&);`
`1075`		`-`
`1076`		`- const v8::Global<v8::Value>& GetAsyncResourceContextFrame(`
`1077`		`- std::uintptr_t async_resource_handle);`
`1078`		`-`
`1079`		`- void RemoveAsyncResourceContextFrame(std::uintptr_t async_resource_handle);`
`1080`		`-`
`1081`	`1073`	`private:`
`1082`	`1074`	`inline void ThrowError(v8::Local<v8::Value> (*fun)(v8::Local<v8::String>,`
`1083`	`1075`	`v8::Local<v8::Value>),`
`@@ -1252,9 +1244,6 @@ class Environment final : public MemoryRetainer {`
`1252`	`1244`	`// track of the BackingStore for a given pointer.`
`1253`	`1245`	`std::unordered_map<char*, std::unique_ptr<v8::BackingStore>>`
`1254`	`1246`	`released_allocated_buffers_;`
`1255`		`-`
`1256`		`- std::unordered_map<std::uintptr_t, v8::Global<v8::Value>>`
`1257`		`- async_resource_context_frames_;`
`1258`	`1247`	`};`
`1259`	`1248`
`1260`	`1249`	`} // namespace node`

Collapse file

`‎src/node.h‎`

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

+1Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1524,6 +1524,7 @@ class NODE_EXTERN AsyncResource {`
`1524`	`1524`	`private:`
`1525`	`1525`	`Environment* env_;`
`1526`	`1526`	`v8::Global<v8::Object> resource_;`
	`1527`	`+ v8::Global<v8::Value> context_frame_;`
`1527`	`1528`	`async_context async_context_;`
`1528`	`1529`	`};`
`1529`	`1530`

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.