luo980/uvw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8 from cynnyx/master

Browse Source 
write requests -> Write/Request
This commit is contained in:
Michele Caini 2016-07-16 19:14:36 +02:00 committed by GitHub
commit c69ff09ff2
3 changed files with 31 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/uvw/request.hpp
View File

@ -16,6 +16,7 @@ struct RequestType;
template<> struct RequestType<uv_connect_t> { };
template<> struct RequestType<uv_shutdown_t> { };
template<> struct RequestType<uv_work_t> { };
template<> struct RequestType<uv_write_t> { };
template<typename T>

46
src/uvw/stream.hpp
View File

@ -29,9 +29,25 @@ public:
return std::shared_ptr<Shutdown>{new Shutdown{std::forward<Args>(args)...}};
}
template<typename T>
void shutdown(uv_stream_t *stream) noexcept {
exec<uv_shutdown_t, ShutdownEvent>(&uv_shutdown, get<uv_shutdown_t>(), stream);
void shutdown(uv_stream_t *handle) noexcept {
exec<uv_shutdown_t, ShutdownEvent>(&uv_shutdown, get<uv_shutdown_t>(), handle);
}
};
class Write final: public Request<Write> {
explicit Write(std::shared_ptr<Loop> ref)
: Request{RequestType<uv_write_t>{}, std::move(ref)}
{ }
public:
template<typename... Args>
static std::shared_ptr<Write> create(Args&&... args) {
return std::shared_ptr<Write>{new Write{std::forward<Args>(args)...}};
}
void write(uv_stream_t *handle, const uv_buf_t bufs[], unsigned int nbufs) {
exec<uv_write_t, WriteEvent>(&uv_write, get<uv_write_t>(), handle, bufs, nbufs);
}
};
@ -61,14 +77,6 @@ class Stream: public Handle<T> {
}
}
static void writeCallback(uv_write_t *req, int status) {
// TODO migrate to Request (see request.hpp for further details)
T &ref = *(static_cast<T*>(req->handle->data));
if(status) { ref.publish(ErrorEvent{status}); }
else { ref.publish(WriteEvent{}); }
delete req;
}
static void listenCallback(uv_stream_t *handle, int status) {
T &ref = *(static_cast<T*>(handle->data));
if(status) ref.publish(ErrorEvent{status});
@ -114,15 +122,17 @@ public:
void write(char *data, ssize_t length) {
uv_buf_t bufs[] = { uv_buf_init(data, length) };
// TODO migrate to Request (see request.hpp for further details)
uv_write_t *req = new uv_write_t;
std::weak_ptr<T> weak = this->shared_from_this();
auto err = uv_write(req, this->template get<uv_stream_t>(), bufs, 1, &Stream<T>::writeCallback);
auto listener = [weak](const auto &event, details::Write &) {
auto ptr = weak.lock();
if(ptr) { ptr->publish(event); }
};
if(err) {
delete req;
this->publish(ErrorEvent{err});
}
auto write = this->loop().template resource<details::Write>();
write->template once<ErrorEvent>(listener);
write->template once<WriteEvent>(listener);
write->write(this->template get<uv_stream_t>(), bufs, 1);
}
void write(std::unique_ptr<char[]> data, ssize_t length) {

19
src/uvw/tcp.hpp
View File

@ -19,21 +19,6 @@ namespace details {
class Connect final: public Request<Connect> {
static void connectCallback(uv_connect_t *req, int status) {
Connect &connect = *(static_cast<Connect*>(req->data));
auto ptr = connect.shared_from_this();
(void)ptr;
connect.reset();
if(status) {
connect.publish(ErrorEvent{status});
} else {
connect.publish(ConnectEvent{});
}
}
explicit Connect(std::shared_ptr<Loop> ref)
: Request{RequestType<uv_connect_t>{}, std::move(ref)}
{ }
@ -44,8 +29,8 @@ public:
return std::shared_ptr<Connect>{new Connect{std::forward<Args>(args)...}};
}
void connect(uv_tcp_t *tcp, const sockaddr *addr) noexcept {
exec<uv_connect_t, ConnectEvent>(&uv_tcp_connect, get<uv_connect_t>(), tcp, addr);
void connect(uv_tcp_t *handle, const sockaddr *addr) noexcept {
exec<uv_connect_t, ConnectEvent>(&uv_tcp_connect, get<uv_connect_t>(), handle, addr);
}
};