GeezerVison

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

GeezerVison is showing github.com — src: distinguish refed/unrefed threadsafe Immediates · nodejs/node@099f18e

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-inl.h‎`

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

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -727,9 +727,9 @@ void Environment::SetUnrefImmediate(Fn&& cb) {`
`727`	`727`	`}`
`728`	`728`
`729`	`729`	`template <typename Fn>`
`730`		`-void Environment::SetImmediateThreadsafe(Fn&& cb) {`
	`730`	`+void Environment::SetImmediateThreadsafe(Fn&& cb, bool refed) {`
`731`	`731`	`auto callback =`
`732`		`- native_immediates_threadsafe_.CreateCallback(std::move(cb), false);`
	`732`	`+ native_immediates_threadsafe_.CreateCallback(std::move(cb), refed);`
`733`	`733`	`{`
`734`	`734`	`Mutex::ScopedLock lock(native_immediates_threadsafe_mutex_);`
`735`	`735`	`native_immediates_threadsafe_.Push(std::move(callback));`

Collapse file

`‎src/env.cc‎`

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

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

Original file line number	Diff line number	Diff line change
`@@ -741,19 +741,10 @@ void Environment::RunAndClearNativeImmediates(bool only_refed) {`
`741`	`741`	`// exceptions, so we do not need to handle that.`
`742`	`742`	`RunAndClearInterrupts();`
`743`	`743`
`744`		`- // It is safe to check .size() first, because there is a causal relationship`
`745`		`- // between pushes to the threadsafe and this function being called.`
`746`		`- // For the common case, it's worth checking the size first before establishing`
`747`		`- // a mutex lock.`
`748`		`- if (native_immediates_threadsafe_.size() > 0) {`
`749`		`- Mutex::ScopedLock lock(native_immediates_threadsafe_mutex_);`
`750`		`- native_immediates_.ConcatMove(std::move(native_immediates_threadsafe_));`
`751`		`- }`
`752`		`-`
`753`		`- auto drain_list = [&]() {`
	`744`	`+ auto drain_list = [&](NativeImmediateQueue* queue) {`
`754`	`745`	`TryCatchScope try_catch(this);`
`755`	`746`	`DebugSealHandleScope seal_handle_scope(isolate());`
`756`		`- while (auto head = native_immediates_.Shift()) {`
	`747`	`+ while (auto head = queue->Shift()) {`
`757`	`748`	`if (head->is_refed())`
`758`	`749`	`ref_count++;`
`759`	`750`
`@@ -771,12 +762,26 @@ void Environment::RunAndClearNativeImmediates(bool only_refed) {`
`771`	`762`	`}`
`772`	`763`	`return false;`
`773`	`764`	`};`
`774`		`- while (drain_list()) {}`
	`765`	`+ while (drain_list(&native_immediates_)) {}`
`775`	`766`
`776`	`767`	`immediate_info()->ref_count_dec(ref_count);`
`777`	`768`
`778`	`769`	`if (immediate_info()->ref_count() == 0)`
`779`	`770`	`ToggleImmediateRef(false);`
	`771`	`+`
	`772`	`+ // It is safe to check .size() first, because there is a causal relationship`
	`773`	`+ // between pushes to the threadsafe immediate list and this function being`
	`774`	`+ // called. For the common case, it's worth checking the size first before`
	`775`	`+ // establishing a mutex lock.`
	`776`	+ // This is intentionally placed after the `ref_count` handling, because when
	`777`	`+ // refed threadsafe immediates are created, they are not counted towards the`
	`778`	`+ // count in immediate_info() either.`
	`779`	`+ NativeImmediateQueue threadsafe_immediates;`
	`780`	`+ if (native_immediates_threadsafe_.size() > 0) {`
	`781`	`+ Mutex::ScopedLock lock(native_immediates_threadsafe_mutex_);`
	`782`	`+ threadsafe_immediates.ConcatMove(std::move(native_immediates_threadsafe_));`
	`783`	`+ }`
	`784`	`+ while (drain_list(&threadsafe_immediates)) {}`
`780`	`785`	`}`
`781`	`786`
`782`	`787`	`void Environment::RequestInterruptFromV8() {`

Collapse file

`‎src/env.h‎`

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

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1167,7 +1167,7 @@ class Environment : public MemoryRetainer {`
`1167`	`1167`	`inline void SetUnrefImmediate(Fn&& cb);`
`1168`	`1168`	`template <typename Fn>`
`1169`	`1169`	`// This behaves like SetImmediate() but can be called from any thread.`
`1170`		`- inline void SetImmediateThreadsafe(Fn&& cb);`
	`1170`	`+ inline void SetImmediateThreadsafe(Fn&& cb, bool refed = true);`
`1171`	`1171`	`// This behaves like V8's Isolate::RequestInterrupt(), but also accounts for`
`1172`	`1172`	`// the event loop (i.e. combines the V8 function with SetImmediate()).`
`1173`	`1173`	`// The passed callback may not throw exceptions.`

Collapse file

`‎src/node_worker.cc‎`

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

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -759,7 +759,7 @@ void Worker::TakeHeapSnapshot(const FunctionCallbackInfo<Value>& args) {`
`759`	`759`	`env, std::move(snapshot));`
`760`	`760`	`Local<Value> args[] = { stream->object() };`
`761`	`761`	`taker->MakeCallback(env->ondone_string(), arraysize(args), args);`
`762`		`- });`
	`762`	`+ }, /* refed */ false);`
`763`	`763`	`});`
`764`	`764`	`args.GetReturnValue().Set(scheduled ? taker->object() : Local<Object>());`
`765`	`765`	`}`

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.