Skip to content

stream_wrap: add HandleScope's in uv callbacks#1078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
indutny wants to merge 4 commits into from
Closed

stream_wrap: add HandleScope's in uv callbacks #1078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b85f945
stream_wrap: add HandleScope's in uv callbacks
indutny Mar 5, 2015
6866719
js_stream: fix leak of instances
indutny Mar 6, 2015
6879b05
tls_wrap: do not hold persistent ref to parent
indutny Mar 6, 2015
2879b03
tls_wrap: hold `secureContext` ref in JS-land
indutny Mar 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/_tls_wrap.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -286,6 +286,7 @@ TLSSocket.prototype._wrapHandle = function(handle) {
tls.createSecureContext();
res = tls_wrap.wrap(handle, context.context, options.isServer);
res._parent = handle;
res._secureContext = context;
res.reading = handle.reading;
Object.defineProperty(handle, 'reading', {
get: function readingGetter() {
Expand Down
1 change: 1 addition & 0 deletions src/js_stream.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ JSStream::JSStream(Environment* env, Handle<Object> obj, AsyncWrap* parent)
: StreamBase(env),
AsyncWrap(env, obj, AsyncWrap::PROVIDER_JSSTREAM, parent) {
node::Wrap(obj, this);
MakeWeak<JSStream>(this);
}


Expand Down
3 changes: 2 additions & 1 deletion src/js_stream.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ class JSStream : public StreamBase, public AsyncWrap {
v8::Handle<v8::Value> unused,
v8::Handle<v8::Context> context);

~JSStream();

void* Cast() override;
bool IsAlive() override;
bool IsClosing() override;
Expand All@@ -28,7 +30,6 @@ class JSStream : public StreamBase, public AsyncWrap {

protected:
JSStream(Environment* env, v8::Handle<v8::Object> obj, AsyncWrap* parent);
~JSStream();

AsyncWrap* GetAsyncWrap() override;

Expand Down
7 changes: 7 additions & 0 deletions src/stream_wrap.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -145,6 +145,9 @@ void StreamWrap::OnAlloc(uv_handle_t* handle,
size_t suggested_size,
uv_buf_t* buf) {
StreamWrap* wrap = static_cast<StreamWrap*>(handle->data);
HandleScope scope(wrap->env()->isolate());
Context::Scope context_scope(wrap->env()->context());

CHECK_EQ(wrap->stream(), reinterpret_cast<uv_stream_t*>(handle));

return static_cast<StreamBase*>(wrap)->OnAlloc(suggested_size, buf);
Expand DownExpand Up@@ -229,6 +232,7 @@ void StreamWrap::OnReadCommon(uv_stream_t* handle,
const uv_buf_t* buf,
uv_handle_type pending) {
StreamWrap* wrap = static_cast<StreamWrap*>(handle->data);
HandleScope scope(wrap->env()->isolate());

@bnoordhuisbnoordhuisMar 6, 2015

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does this HandleScope do?

@indutnyindutnyMar 6, 2015

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Captures all handles in this libuv callback? OnReadCommon calls OnRead() which might create handles.


// We should not be getting this callback if someone as already called
// uv_close() on the handle.
Expand DownExpand Up@@ -280,6 +284,7 @@ int StreamWrap::DoShutdown(ShutdownWrap* req_wrap) {

void StreamWrap::AfterShutdown(uv_shutdown_t* req, int status) {
ShutdownWrap* req_wrap = ContainerOf(&ShutdownWrap::req_, req);
HandleScope scope(req_wrap->env()->isolate());

@bnoordhuisbnoordhuisMar 6, 2015

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this have a Context::Scope as well?

@indutnyindutnyMar 6, 2015

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should, thanks!

req_wrap->Done(status);
}

Expand DownExpand Up@@ -354,6 +359,8 @@ int StreamWrap::DoWrite(WriteWrap* w,

void StreamWrap::AfterWrite(uv_write_t* req, int status) {
WriteWrap* req_wrap = ContainerOf(&WriteWrap::req_, req);
HandleScope scope(req_wrap->env()->isolate());
Context::Scope context_scope(req_wrap->env()->context());
req_wrap->Done(status);
}

Expand Down
30 changes: 5 additions & 25 deletions src/tls_wrap.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@ using v8::Function;
using v8::FunctionCallbackInfo;
using v8::FunctionTemplate;
using v8::Handle;
using v8::HandleScope;
using v8::Integer;
using v8::Local;
using v8::Null;
Expand All@@ -38,17 +37,14 @@ using v8::Value;
TLSWrap::TLSWrap(Environment* env,
Kind kind,
StreamBase* stream,
Handle<Object> stream_obj,
Handle<Object> sc)
: SSLWrap<TLSWrap>(env, Unwrap<SecureContext>(sc), kind),
SecureContext* sc)
: SSLWrap<TLSWrap>(env, sc, kind),
StreamBase(env),
AsyncWrap(env,
env->tls_wrap_constructor_function()->NewInstance(),
AsyncWrap::PROVIDER_TLSWRAP),
sc_(Unwrap<SecureContext>(sc)),
sc_handle_(env->isolate(), sc),
sc_(sc),
stream_(stream),
stream_handle_(env->isolate(), stream_obj),
enc_in_(nullptr),
enc_out_(nullptr),
clear_in_(nullptr),
Expand DownExpand Up@@ -85,9 +81,6 @@ TLSWrap::~TLSWrap() {
clear_in_ = nullptr;

sc_ = nullptr;
sc_handle_.Reset();
stream_handle_.Reset();
persistent().Reset();

#ifdef SSL_CTRL_SET_TLSEXT_SERVERNAME_CB
sni_context_.Reset();
Expand DownExpand Up@@ -197,9 +190,9 @@ void TLSWrap::Wrap(const FunctionCallbackInfo<Value>& args) {
});
CHECK_NE(stream, nullptr);

TLSWrap* res = new TLSWrap(env, kind, stream, stream_obj, sc);
TLSWrap* res = new TLSWrap(env, kind, stream, Unwrap<SecureContext>(sc));

args.GetReturnValue().Set(res->persistent());
args.GetReturnValue().Set(res->object());
}


Expand DownExpand Up@@ -251,8 +244,6 @@ void TLSWrap::SSLInfoCallback(const SSL* ssl_, int where, int ret) {
SSL* ssl = const_cast<SSL*>(ssl_);
TLSWrap* c = static_cast<TLSWrap*>(SSL_get_app_data(ssl));
Environment* env = c->env();
HandleScope handle_scope(env->isolate());
Context::Scope context_scope(env->context());
Local<Object> object = c->object();

if (where & SSL_CB_HANDSHAKE_START) {
Expand DownExpand Up@@ -395,9 +386,6 @@ void TLSWrap::ClearOut() {
if (eof_)
return;

HandleScope handle_scope(env()->isolate());
Context::Scope context_scope(env()->context());

CHECK_NE(ssl_, nullptr);

char out[kClearOutChunkSize];
Expand DownExpand Up@@ -470,9 +458,6 @@ bool TLSWrap::ClearIn() {
return true;
}

HandleScope handle_scope(env()->isolate());
Context::Scope context_scope(env()->context());

// Error or partial write
int err;
Local<Value> arg = GetSSLError(written, &err, &error_);
Expand DownExpand Up@@ -588,8 +573,6 @@ int TLSWrap::DoWrite(WriteWrap* w,

if (i != count) {
int err;
HandleScope handle_scope(env()->isolate());
Context::Scope context_scope(env()->context());
Local<Value> arg = GetSSLError(written, &err, &error_);
if (!arg.IsEmpty())
return UV_EPROTO;
Expand DownExpand Up@@ -662,8 +645,6 @@ void TLSWrap::DoRead(ssize_t nread,
eof_ = true;
}

HandleScope handle_scope(env()->isolate());
Context::Scope context_scope(env()->context());
OnRead(nread, nullptr);
return;
}
Expand DownExpand Up@@ -796,7 +777,6 @@ int TLSWrap::SelectSNIContextCallback(SSL* s, int* ad, void* arg) {
if (servername == nullptr)
return SSL_TLSEXT_ERR_OK;

HandleScope scope(env->isolate());
// Call the SNI callback and use its return value as context
Local<Object> object = p->object();
Local<Value> ctx = object->Get(env->sni_context_string());
Expand Down
5 changes: 1 addition & 4 deletions src/tls_wrap.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,8 +78,7 @@ class TLSWrap : public crypto::SSLWrap<TLSWrap>,
TLSWrap(Environment* env,
Kind kind,
StreamBase* stream,
v8::Handle<v8::Object> stream_obj,
v8::Handle<v8::Object> sc);
crypto::SecureContext* sc);

static void SSLInfoCallback(const SSL* ssl_, int where, int ret);
void InitSSL();
Expand DownExpand Up@@ -141,9 +140,7 @@ class TLSWrap : public crypto::SSLWrap<TLSWrap>,
#endif // SSL_CTRL_SET_TLSEXT_SERVERNAME_CB

crypto::SecureContext* sc_;
v8::Persistent<v8::Object> sc_handle_;
StreamBase* stream_;
v8::Persistent<v8::Object> stream_handle_;
BIO* enc_in_;
BIO* enc_out_;
NodeBIO* clear_in_;
Expand Down