2 src/node_zlib.cc
View file
@@ -128,7 +128,7 @@ template <node_zlib_mode mode> class ZCtx : public ObjectWrap {
uv_work_t* work_req = new uv_work_t();
work_req->data = req_wrap;

uv_queue_work(uv_default_loop(),
uv_queue_work(NODE_LOOP(),
work_req,
ZCtx<mode>::Process,
ZCtx<mode>::After);
8 src/pipe_wrap.cc
View file
@@ -118,7 +118,7 @@ Handle<Value> PipeWrap::New(const Arguments& args) {

PipeWrap::PipeWrap(Handle<Object> object, bool ipc)
: StreamWrap(object, (uv_stream_t*) &handle_) {
int r = uv_pipe_init(uv_default_loop(), &handle_, ipc);
int r = uv_pipe_init(NODE_LOOP(), &handle_, ipc);
assert(r == 0); // How do we proxy this error up to javascript?
// Suggestion: uv_pipe_init() returns void.
handle_.data = reinterpret_cast<void*>(this);
@@ -136,7 +136,7 @@ Handle<Value> PipeWrap::Bind(const Arguments& args) {
int r = uv_pipe_bind(&wrap->handle_, *name);

// Error starting the pipe.
if (r) SetErrno(uv_last_error(uv_default_loop()));
if (r) SetErrno(uv_last_error(NODE_LOOP()));

return scope.Close(Integer::New(r));
}
@@ -152,7 +152,7 @@ Handle<Value> PipeWrap::Listen(const Arguments& args) {
int r = uv_listen((uv_stream_t*)&wrap->handle_, backlog, OnConnection);

// Error starting the pipe.
if (r) SetErrno(uv_last_error(uv_default_loop()));
if (r) SetErrno(uv_last_error(NODE_LOOP()));

return scope.Close(Integer::New(r));
}
@@ -205,7 +205,7 @@ void PipeWrap::AfterConnect(uv_connect_t* req, int status) {
assert(wrap->object_.IsEmpty() == false);

if (status) {
SetErrno(uv_last_error(uv_default_loop()));
SetErrno(uv_last_error(NODE_LOOP()));
}

Local<Value> argv[3] = {
6 src/process_wrap.cc
View file
@@ -175,7 +175,7 @@ class ProcessWrap : public HandleWrap {
Get(String::NewSymbol("windowsVerbatimArguments"))->IsTrue();
#endif

int r = uv_spawn(uv_default_loop(), &wrap->process_, options);
int r = uv_spawn(NODE_LOOP(), &wrap->process_, options);

wrap->SetHandle((uv_handle_t*)&wrap->process_);
assert(wrap->process_.data == wrap);
@@ -195,7 +195,7 @@ class ProcessWrap : public HandleWrap {
delete [] options.env;
}

if (r) SetErrno(uv_last_error(uv_default_loop()));
if (r) SetErrno(uv_last_error(NODE_LOOP()));

return scope.Close(Integer::New(r));
}
@@ -209,7 +209,7 @@ class ProcessWrap : public HandleWrap {

int r = uv_process_kill(&wrap->process_, signal);

if (r) SetErrno(uv_last_error(uv_default_loop()));
if (r) SetErrno(uv_last_error(NODE_LOOP()));

return scope.Close(Integer::New(r));
}
14 src/stream_wrap.cc
View file
@@ -129,7 +129,7 @@ Handle<Value> StreamWrap::ReadStart(const Arguments& args) {
}

// Error starting the tcp.
if (r) SetErrno(uv_last_error(uv_default_loop()));
if (r) SetErrno(uv_last_error(NODE_LOOP()));

return scope.Close(Integer::New(r));
}
@@ -143,7 +143,7 @@ Handle<Value> StreamWrap::ReadStop(const Arguments& args) {
int r = uv_read_stop(wrap->stream_);

// Error starting the tcp.
if (r) SetErrno(uv_last_error(uv_default_loop()));
if (r) SetErrno(uv_last_error(NODE_LOOP()));

return scope.Close(Integer::New(r));
}
@@ -222,7 +222,7 @@ void StreamWrap::OnReadCommon(uv_stream_t* handle, ssize_t nread,
slab_used -= buf.len;
}

SetErrno(uv_last_error(uv_default_loop()));
SetErrno(uv_last_error(NODE_LOOP()));
MakeCallback(wrap->object_, "onread", 0, NULL);
return;
}
@@ -335,7 +335,7 @@ Handle<Value> StreamWrap::Write(const Arguments& args) {
wrap->UpdateWriteQueueSize();

if (r) {
SetErrno(uv_last_error(uv_default_loop()));
SetErrno(uv_last_error(NODE_LOOP()));
delete req_wrap;
return scope.Close(v8::Null());
} else {
@@ -355,7 +355,7 @@ void StreamWrap::AfterWrite(uv_write_t* req, int status) {
assert(wrap->object_.IsEmpty() == false);

if (status) {
SetErrno(uv_last_error(uv_default_loop()));
SetErrno(uv_last_error(NODE_LOOP()));
}

wrap->UpdateWriteQueueSize();
@@ -385,7 +385,7 @@ Handle<Value> StreamWrap::Shutdown(const Arguments& args) {
req_wrap->Dispatched();

if (r) {
SetErrno(uv_last_error(uv_default_loop()));
SetErrno(uv_last_error(NODE_LOOP()));
delete req_wrap;
return scope.Close(v8::Null());
} else {
@@ -405,7 +405,7 @@ void StreamWrap::AfterShutdown(uv_shutdown_t* req, int status) {
HandleScope scope;

if (status) {
SetErrno(uv_last_error(uv_default_loop()));
SetErrno(uv_last_error(NODE_LOOP()));
}

Local<Value> argv[3] = {
26 src/tcp_wrap.cc
View file
@@ -151,7 +151,7 @@ Handle<Value> TCPWrap::New(const Arguments& args) {

TCPWrap::TCPWrap(Handle<Object> object)
: StreamWrap(object, (uv_stream_t*) &handle_) {
int r = uv_tcp_init(uv_default_loop(), &handle_);
int r = uv_tcp_init(NODE_LOOP(), &handle_);
assert(r == 0); // How do we proxy this error up to javascript?
// Suggestion: uv_tcp_init() returns void.
UpdateWriteQueueSize();
@@ -179,7 +179,7 @@ Handle<Value> TCPWrap::GetSockName(const Arguments& args) {

Local<Object> sockname = Object::New();
if (r != 0) {
SetErrno(uv_last_error(uv_default_loop()));
SetErrno(uv_last_error(NODE_LOOP()));
} else {
family = address.ss_family;

@@ -221,7 +221,7 @@ Handle<Value> TCPWrap::GetPeerName(const Arguments& args) {

Local<Object> sockname = Object::New();
if (r != 0) {
SetErrno(uv_last_error(uv_default_loop()));
SetErrno(uv_last_error(NODE_LOOP()));
} else {
family = address.ss_family;

@@ -254,7 +254,7 @@ Handle<Value> TCPWrap::SetNoDelay(const Arguments& args) {

int r = uv_tcp_nodelay(&wrap->handle_, 1);
if (r)
SetErrno(uv_last_error(uv_default_loop()));
SetErrno(uv_last_error(NODE_LOOP()));

return Undefined();
}
@@ -270,7 +270,7 @@ Handle<Value> TCPWrap::SetKeepAlive(const Arguments& args) {

int r = uv_tcp_keepalive(&wrap->handle_, enable, delay);
if (r)
SetErrno(uv_last_error(uv_default_loop()));
SetErrno(uv_last_error(NODE_LOOP()));

return Undefined();
}
@@ -286,7 +286,7 @@ Handle<Value> TCPWrap::SetSimultaneousAccepts(const Arguments& args) {

int r = uv_tcp_simultaneous_accepts(&wrap->handle_, enable ? 1 : 0);
if (r)
SetErrno(uv_last_error(uv_default_loop()));
SetErrno(uv_last_error(NODE_LOOP()));

return Undefined();
}
@@ -305,7 +305,7 @@ Handle<Value> TCPWrap::Bind(const Arguments& args) {
int r = uv_tcp_bind(&wrap->handle_, address);

// Error starting the tcp.
if (r) SetErrno(uv_last_error(uv_default_loop()));
if (r) SetErrno(uv_last_error(NODE_LOOP()));

return scope.Close(Integer::New(r));
}
@@ -323,7 +323,7 @@ Handle<Value> TCPWrap::Bind6(const Arguments& args) {
int r = uv_tcp_bind6(&wrap->handle_, address);

// Error starting the tcp.
if (r) SetErrno(uv_last_error(uv_default_loop()));
if (r) SetErrno(uv_last_error(NODE_LOOP()));

return scope.Close(Integer::New(r));
}
@@ -339,7 +339,7 @@ Handle<Value> TCPWrap::Listen(const Arguments& args) {
int r = uv_listen((uv_stream_t*)&wrap->handle_, backlog, OnConnection);

// Error starting the tcp.
if (r) SetErrno(uv_last_error(uv_default_loop()));
if (r) SetErrno(uv_last_error(NODE_LOOP()));

return scope.Close(Integer::New(r));
}
@@ -374,7 +374,7 @@ void TCPWrap::OnConnection(uv_stream_t* handle, int status) {
// Successful accept. Call the onconnection callback in JavaScript land.
argv[0] = client_obj;
} else {
SetErrno(uv_last_error(uv_default_loop()));
SetErrno(uv_last_error(NODE_LOOP()));
argv[0] = v8::Null();
}

@@ -393,7 +393,7 @@ void TCPWrap::AfterConnect(uv_connect_t* req, int status) {
assert(wrap->object_.IsEmpty() == false);

if (status) {
SetErrno(uv_last_error(uv_default_loop()));
SetErrno(uv_last_error(NODE_LOOP()));
}

Local<Value> argv[3] = {
@@ -429,7 +429,7 @@ Handle<Value> TCPWrap::Connect(const Arguments& args) {
req_wrap->Dispatched();

if (r) {
SetErrno(uv_last_error(uv_default_loop()));
SetErrno(uv_last_error(NODE_LOOP()));
delete req_wrap;
return scope.Close(v8::Null());
} else {
@@ -456,7 +456,7 @@ Handle<Value> TCPWrap::Connect6(const Arguments& args) {
req_wrap->Dispatched();

if (r) {
SetErrno(uv_last_error(uv_default_loop()));
SetErrno(uv_last_error(NODE_LOOP()));
delete req_wrap;
return scope.Close(v8::Null());
} else {
18 src/timer_wrap.cc
View file
@@ -91,19 +91,19 @@ class TimerWrap : public HandleWrap {
: HandleWrap(object, (uv_handle_t*) &handle_) {
active_ = false;

int r = uv_timer_init(uv_default_loop(), &handle_);
int r = uv_timer_init(NODE_LOOP(), &handle_);
assert(r == 0);

handle_.data = this;

// uv_timer_init adds a loop reference. (That is, it calls uv_ref.) This
// is not the behavior we want in Node. Timers should not increase the
// ref count of the loop except when active.
uv_unref(uv_default_loop());
uv_unref(NODE_LOOP());
}

~TimerWrap() {
if (!active_) uv_ref(uv_default_loop());
if (!active_) uv_ref(NODE_LOOP());
}

void StateChange() {
@@ -113,11 +113,11 @@ class TimerWrap : public HandleWrap {
if (!was_active && active_) {
// If our state is changing from inactive to active, we
// increase the loop's reference count.
uv_ref(uv_default_loop());
uv_ref(NODE_LOOP());
} else if (was_active && !active_) {
// If our state is changing from active to inactive, we
// decrease the loop's reference count.
uv_unref(uv_default_loop());
uv_unref(NODE_LOOP());
}
}

@@ -132,7 +132,7 @@ class TimerWrap : public HandleWrap {
int r = uv_timer_start(&wrap->handle_, OnTimeout, timeout, repeat);

// Error starting the timer.
if (r) SetErrno(uv_last_error(uv_default_loop()));
if (r) SetErrno(uv_last_error(NODE_LOOP()));

wrap->StateChange();

@@ -146,7 +146,7 @@ class TimerWrap : public HandleWrap {

int r = uv_timer_stop(&wrap->handle_);

if (r) SetErrno(uv_last_error(uv_default_loop()));
if (r) SetErrno(uv_last_error(NODE_LOOP()));

wrap->StateChange();

@@ -160,7 +160,7 @@ class TimerWrap : public HandleWrap {

int r = uv_timer_again(&wrap->handle_);

if (r) SetErrno(uv_last_error(uv_default_loop()));
if (r) SetErrno(uv_last_error(NODE_LOOP()));

wrap->StateChange();

@@ -186,7 +186,7 @@ class TimerWrap : public HandleWrap {

int64_t repeat = uv_timer_get_repeat(&wrap->handle_);

if (repeat < 0) SetErrno(uv_last_error(uv_default_loop()));
if (repeat < 0) SetErrno(uv_last_error(NODE_LOOP()));

return scope.Close(Integer::New(repeat));
}
6 src/tty_wrap.cc
View file
@@ -123,7 +123,7 @@ class TTYWrap : StreamWrap {
int r = uv_tty_get_winsize(&wrap->handle_, &width, &height);

if (r) {
SetErrno(uv_last_error(uv_default_loop()));
SetErrno(uv_last_error(NODE_LOOP()));
return v8::Undefined();
}

@@ -142,7 +142,7 @@ class TTYWrap : StreamWrap {
int r = uv_tty_set_mode(&wrap->handle_, args[0]->IsTrue());

if (r) {
SetErrno(uv_last_error(uv_default_loop()));
SetErrno(uv_last_error(NODE_LOOP()));
}

return scope.Close(Integer::New(r));
@@ -168,7 +168,7 @@ class TTYWrap : StreamWrap {

TTYWrap(Handle<Object> object, int fd, bool readable)
: StreamWrap(object, (uv_stream_t*)&handle_) {
uv_tty_init(uv_default_loop(), &handle_, fd, readable);
uv_tty_init(NODE_LOOP(), &handle_, fd, readable);
}

uv_tty_t handle_;
16 src/udp_wrap.cc
View file
@@ -103,7 +103,7 @@ class UDPWrap: public HandleWrap {

UDPWrap::UDPWrap(Handle<Object> object): HandleWrap(object,
(uv_handle_t*)&handle_) {
int r = uv_udp_init(uv_default_loop(), &handle_);
int r = uv_udp_init(NODE_LOOP(), &handle_);
assert(r == 0); // can't fail anyway
handle_.data = reinterpret_cast<void*>(this);
}
@@ -176,7 +176,7 @@ Handle<Value> UDPWrap::DoBind(const Arguments& args, int family) {
}

if (r)
SetErrno(uv_last_error(uv_default_loop()));
SetErrno(uv_last_error(NODE_LOOP()));

return scope.Close(Integer::New(r));
}
@@ -233,7 +233,7 @@ Handle<Value> UDPWrap::DoSend(const Arguments& args, int family) {
req_wrap->Dispatched();

if (r) {
SetErrno(uv_last_error(uv_default_loop()));
SetErrno(uv_last_error(NODE_LOOP()));
delete req_wrap;
return Null();
}
@@ -260,8 +260,8 @@ Handle<Value> UDPWrap::RecvStart(const Arguments& args) {

// UV_EALREADY means that the socket is already bound but that's okay
int r = uv_udp_recv_start(&wrap->handle_, OnAlloc, OnRecv);
if (r && uv_last_error(uv_default_loop()).code != UV_EALREADY) {
SetErrno(uv_last_error(uv_default_loop()));
if (r && uv_last_error(NODE_LOOP()).code != UV_EALREADY) {
SetErrno(uv_last_error(NODE_LOOP()));
return False();
}

@@ -297,7 +297,7 @@ Handle<Value> UDPWrap::GetSockName(const Arguments& args) {
return scope.Close(sockname);
}
else {
SetErrno(uv_last_error(uv_default_loop()));
SetErrno(uv_last_error(NODE_LOOP()));
return Null();
}
}
@@ -316,7 +316,7 @@ void UDPWrap::OnSend(uv_udp_send_t* req, int status) {
assert(wrap->object_.IsEmpty() == false);

if (status) {
SetErrno(uv_last_error(uv_default_loop()));
SetErrno(uv_last_error(NODE_LOOP()));
}

Local<Value> argv[4] = {
@@ -364,7 +364,7 @@ void UDPWrap::OnRecv(uv_udp_t* handle,
};

if (nread == -1) {
SetErrno(uv_last_error(uv_default_loop()));
SetErrno(uv_last_error(NODE_LOOP()));
}
else {
Local<Object> rinfo = Object::New();