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

vm: remove Watchdog dependency on Environment

Browse Source 
Remove the Watchdog class' dependency on Environment.
No functional changes, only code cleanup.

PR-URL: https://github.com/nodejs/node/pull/3274
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
This commit is contained in:
Ido Ben-Yair 2015-10-07 18:59:15 +03:00 committed by Ben Noordhuis
parent 9adc6a6bd0
commit b244f139bf
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/node_contextify.cc
View File

@ -693,7 +693,7 @@ class ContextifyScript : public BaseObject {
Local<Value> result;
if (timeout != -1) {
Watchdog wd(env, timeout);
Watchdog wd(env->isolate(), timeout);
result = script->Run();
} else {
result = script->Run();

9
src/node_watchdog.cc
View File

@ -1,15 +1,14 @@
#include "node_watchdog.h"
#include "env.h"
#include "env-inl.h"
#include "util.h"
#include "util-inl.h"
namespace node {
using v8::V8;
Watchdog::Watchdog(Environment* env, uint64_t ms) : env_(env),
destroyed_(false) {
Watchdog::Watchdog(v8::Isolate* isolate, uint64_t ms) : isolate_(isolate),
destroyed_(false) {
int rc;
loop_ = new uv_loop_t;
CHECK(loop_);
@ -84,7 +83,7 @@ void Watchdog::Async(uv_async_t* async) {
void Watchdog::Timer(uv_timer_t* timer) {
Watchdog* w = ContainerOf(&Watchdog::timer_, timer);
uv_stop(w->loop_);
V8::TerminateExecution(w->env()->isolate());
V8::TerminateExecution(w->isolate());
}

8
src/node_watchdog.h
View File

@ -4,18 +4,16 @@
#include "v8.h"
#include "uv.h"
#include "env.h"
namespace node {
class Watchdog {
public:
explicit Watchdog(Environment* env, uint64_t ms);
explicit Watchdog(v8::Isolate* isolate, uint64_t ms);
~Watchdog();
void Dispose();
inline Environment* env() const { return env_; }
v8::Isolate* isolate() { return isolate_; }
private:
void Destroy();
@ -24,7 +22,7 @@ class Watchdog {
static void Async(uv_async_t* async);
static void Timer(uv_timer_t* timer);
Environment* env_;
v8::Isolate* isolate_;
uv_thread_t thread_;
uv_loop_t* loop_;
uv_async_t async_;