Skip to content

src: extracting OnConnection from pipe_wrap and tcp_wrap #7547

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
danbev wants to merge 23 commits into from
Closed

src: extracting OnConnection from pipe_wrap and tcp_wrap #7547

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
ad6dee3
src: extracting OnConnection from pipe_wrap and tcp_wrap
danbev Jul 4, 2016
a3b976e
Moving template types to the ConnectionWrap class.
danbev Jul 7, 2016
34d5abc
extracting UVHandle() and handle_ to ConnectionWrap.
danbev Jul 8, 2016
564342d
Renaming BaseObject's handle_ to objecthandle_
danbev Jul 9, 2016
623ad2e
Changing uvhandle_ back to handle_
danbev Jul 9, 2016
458accc
Removing unnecessary friend class ConnectionWrap
danbev Jul 9, 2016
ee0f2b9
Making UVHandle() an inline member function.
danbev Jul 9, 2016
5562c45
Adding a space after template keyword
danbev Jul 9, 2016
ee62109
Correcting comment changing Instanciate to Instantiate
danbev Jul 9, 2016
579f48a
Adding a null pointer check for wrap_data.
danbev Jul 9, 2016
1437ec6
Adding back spaces to line up macro continuation escape charaters
danbev Jul 9, 2016
d0da4bc
Removing unnecessary template specializations
danbev Jul 9, 2016
1b3be60
Fixing typo in comment.
danbev Jul 9, 2016
e364ec4
Lining up arguments for SetWeak method call
danbev Jul 14, 2016
e8ed621
Renaming objecthandle_ to persistent_handle_
danbev Jul 14, 2016
7ce112a
Adding a comment to clarify uv_accept error handling
danbev Jul 14, 2016
c9ec24d
Correcting spelling of unavailable.
danbev Jul 14, 2016
5ef85f9
Removing multiple inheritance.
danbev Jul 14, 2016
ece2d31
Making ConnectionWrap inherit from StreamWrap
danbev Jul 16, 2016
73c956d
Adding a destructor for ConnectionWrap
danbev Jul 17, 2016
4feb84a
Removing unnecessary template parameters for OnConnection
danbev Jul 17, 2016
0a1ff38
Removing the inclusion of async-wrap.h
danbev Jul 17, 2016
85af1a6
Removing the empty destructor in favour of an explicit default
danbev Jul 20, 2016
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
Prev Previous commit
Next Next commit
Moving template types to the ConnectionWrap class.
  • Loading branch information
@danbev
danbev committed Jul 7, 2016
commit a3b976e625c575eb4734a54d8907632e7a317ad5
13 changes: 6 additions & 7 deletions src/connection_wrap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ using v8::Value;


template<typename WrapType, typename UVType>
Copy link
Copy Markdown
Member

@bnoordhuis bnoordhuis Jul 9, 2016

Choose a reason for hiding this comment

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

Tiny style nit: space before <.

Copy link
Copy Markdown
Contributor Author

@danbev danbev Jul 9, 2016

Choose a reason for hiding this comment

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

I'll correct this.

void ConnectionWrap::OnConnection(uv_stream_t* handle, int status) {
void ConnectionWrap<WrapType, UVType>::OnConnection(uv_stream_t* handle,
int status) {
WrapType* wrap_data = static_cast<WrapType*>(handle->data);
CHECK_EQ(&wrap_data->handle_, reinterpret_cast<UVType*>(handle));

Expand Down Expand Up @@ -52,13 +53,11 @@ void ConnectionWrap::OnConnection(uv_stream_t* handle, int status) {
wrap_data->MakeCallback(env->onconnection_string(), arraysize(argv), argv);
}

template void ConnectionWrap::OnConnection<PipeWrap, uv_pipe_t>(
uv_stream_t* handle,
int status);
template void ConnectionWrap<PipeWrap, uv_pipe_t>::OnConnection(
uv_stream_t* handle, int status);

template void ConnectionWrap::OnConnection<TCPWrap, uv_tcp_t>(
uv_stream_t* handle,
int status);
template void ConnectionWrap<TCPWrap, uv_tcp_t>::OnConnection(
uv_stream_t* handle, int status);


} // namespace node
2 changes: 1 addition & 1 deletion src/connection_wrap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

namespace node {

template<typename WrapType, typename UVType>
class ConnectionWrap {
protected:
template<typename WrapType, typename UVType>
static void OnConnection(uv_stream_t* handle, int status);
};

Expand Down
2 changes: 1 addition & 1 deletion src/pipe_wrap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ void PipeWrap::Listen(const FunctionCallbackInfo<Value>& args) {
int backlog = args[0]->Int32Value();
int err = uv_listen(reinterpret_cast<uv_stream_t*>(&wrap->handle_),
backlog,
ConnectionWrap::OnConnection<PipeWrap, uv_pipe_t>);
OnConnection);
args.GetReturnValue().Set(err);
}

Expand Down
2 changes: 1 addition & 1 deletion src/pipe_wrap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

namespace node {

class PipeWrap : public StreamWrap, ConnectionWrap {
class PipeWrap : public StreamWrap, ConnectionWrap<PipeWrap, uv_pipe_t> {
public:
uv_pipe_t* UVHandle();

Expand Down
2 changes: 1 addition & 1 deletion src/tcp_wrap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ void TCPWrap::Listen(const FunctionCallbackInfo<Value>& args) {
int backlog = args[0]->Int32Value();
int err = uv_listen(reinterpret_cast<uv_stream_t*>(&wrap->handle_),
backlog,
ConnectionWrap::OnConnection<TCPWrap, uv_tcp_t>);
OnConnection);
args.GetReturnValue().Set(err);
}

Expand Down
2 changes: 1 addition & 1 deletion src/tcp_wrap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

namespace node {

class TCPWrap : public StreamWrap, ConnectionWrap {
class TCPWrap : public StreamWrap, ConnectionWrap<TCPWrap, uv_tcp_t> {
public:
static v8::Local<v8::Object> Instantiate(Environment* env, AsyncWrap* parent);
static void Initialize(v8::Local<v8::Object> target,
Expand Down