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

src: make StreamBase::GetAsyncWrap pure virtual

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/13174
Reviewed-By: Andreas Madsen <amwebdk@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
This commit is contained in:
Anna Henningsen 2017-05-21 19:29:26 +02:00
parent 06757cd0dc
commit 169c07dae1
No known key found for this signature in database
GPG Key ID: D8B9F5AEAE84E4CF
2 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/stream_base.cc
View File

@ -54,8 +54,8 @@ int StreamBase::Shutdown(const FunctionCallbackInfo<Value>& args) {
Local<Object> req_wrap_obj = args[0].As<Object>(); Local<Object> req_wrap_obj = args[0].As<Object>();
AsyncWrap* wrap = GetAsyncWrap(); AsyncWrap* wrap = GetAsyncWrap();
if (wrap != nullptr) CHECK_NE(wrap, nullptr);
env->set_init_trigger_id(wrap->get_id()); env->set_init_trigger_id(wrap->get_id());
ShutdownWrap* req_wrap = new ShutdownWrap(env, ShutdownWrap* req_wrap = new ShutdownWrap(env,
req_wrap_obj, req_wrap_obj,
this, this,
@ -133,8 +133,6 @@ int StreamBase::Writev(const FunctionCallbackInfo<Value>& args) {
return UV_ENOBUFS; return UV_ENOBUFS;
AsyncWrap* wrap = GetAsyncWrap(); AsyncWrap* wrap = GetAsyncWrap();
// NOTE: All tests show that GetAsyncWrap() never returns nullptr here. If it
// can then replace the CHECK_NE() with if (wrap != nullptr).
CHECK_NE(wrap, nullptr); CHECK_NE(wrap, nullptr);
env->set_init_trigger_id(wrap->get_id()); env->set_init_trigger_id(wrap->get_id());
WriteWrap* req_wrap = WriteWrap::New(env, WriteWrap* req_wrap = WriteWrap::New(env,
@ -425,16 +423,9 @@ void StreamBase::EmitData(ssize_t nread,
if (argv[2].IsEmpty()) if (argv[2].IsEmpty())
argv[2] = Undefined(env->isolate()); argv[2] = Undefined(env->isolate());
AsyncWrap* async = GetAsyncWrap(); AsyncWrap* wrap = GetAsyncWrap();
if (async == nullptr) { CHECK_NE(wrap, nullptr);
node::MakeCallback(env, wrap->MakeCallback(env->onread_string(), arraysize(argv), argv);
GetObject(),
env->onread_string(),
arraysize(argv),
argv);
} else {
async->MakeCallback(env->onread_string(), arraysize(argv), argv);
}
} }
@ -448,11 +439,6 @@ int StreamBase::GetFD() {
} }
AsyncWrap* StreamBase::GetAsyncWrap() {
return nullptr;
}
Local<Object> StreamBase::GetObject() { Local<Object> StreamBase::GetObject() {
return GetAsyncWrap()->object(); return GetAsyncWrap()->object();
} }

2
src/stream_base.h
View File

@ -248,7 +248,7 @@ class StreamBase : public StreamResource {
virtual ~StreamBase() = default; virtual ~StreamBase() = default;
// One of these must be implemented // One of these must be implemented
virtual AsyncWrap* GetAsyncWrap(); virtual AsyncWrap* GetAsyncWrap() = 0;
virtual v8::Local<v8::Object> GetObject(); virtual v8::Local<v8::Object> GetObject();
// Libuv callbacks // Libuv callbacks