1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

src: make watchdog async callback a lambda

Browse Source 
`Watchdog::Async` features only once for the
async callback, so make it a lambda.

PR-URL: https://github.com/nodejs/node/pull/25945
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
This commit is contained in:
Gireesh Punathil 2019-02-05 09:05:30 -05:00
parent 3a02d39df9
commit 7182aca108
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/node_watchdog.cc
View File

@ -39,7 +39,11 @@ Watchdog::Watchdog(v8::Isolate* isolate, uint64_t ms, bool* timed_out)
"Failed to initialize uv loop."); "Failed to initialize uv loop.");
} }
rc = uv_async_init(loop_, &async_, &Watchdog::Async); rc = uv_async_init(loop_, &async_, [](uv_async_t* signal) {
Watchdog* w = ContainerOf(&Watchdog::async_, signal);
uv_stop(w->loop_);
});
CHECK_EQ(0, rc); CHECK_EQ(0, rc);
rc = uv_timer_init(loop_, &timer_); rc = uv_timer_init(loop_, &timer_);
@ -80,13 +84,6 @@ void Watchdog::Run(void* arg) {
uv_close(reinterpret_cast<uv_handle_t*>(&wd->timer_), nullptr); uv_close(reinterpret_cast<uv_handle_t*>(&wd->timer_), nullptr);
} }
void Watchdog::Async(uv_async_t* async) {
Watchdog* w = ContainerOf(&Watchdog::async_, async);
uv_stop(w->loop_);
}
void Watchdog::Timer(uv_timer_t* timer) { void Watchdog::Timer(uv_timer_t* timer) {
Watchdog* w = ContainerOf(&Watchdog::timer_, timer); Watchdog* w = ContainerOf(&Watchdog::timer_, timer);
*w->timed_out_ = true; *w->timed_out_ = true;

1
src/node_watchdog.h
View File

@ -45,7 +45,6 @@ class Watchdog {
private: private:
static void Run(void* arg); static void Run(void* arg);
static void Async(uv_async_t* async);
static void Timer(uv_timer_t* timer); static void Timer(uv_timer_t* timer);
v8::Isolate* isolate_; v8::Isolate* isolate_;