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

ongoing review

Browse Source
This commit is contained in:
Michele Caini 2017-02-01 17:56:55 +01:00
parent 75daf46790
commit 3534fecbf8
2 changed files with 40 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/uvw/stream.hpp
View File

@ -94,25 +94,25 @@ struct ShutdownReq final: public Request<ShutdownReq, uv_shutdown_t> {
class WriteReq final: public Request<WriteReq, uv_write_t> {
public:
using Deleter = void(*)(uv_buf_t *);
using Deleter = void(*)(char *);
WriteReq(ConstructorAccess ca, std::shared_ptr<Loop> loop, std::unique_ptr<uv_buf_t[], Deleter> data, unsigned int ndata)
WriteReq(ConstructorAccess ca, std::shared_ptr<Loop> loop, std::unique_ptr<char[], Deleter> dt, unsigned int len)
: Request<WriteReq, uv_write_t>{std::move(ca), std::move(loop)},
bufs{std::move(data)},
nbufs{ndata}
data{std::move(dt)},
buf{uv_buf_init(data.get(), len)}
{}
void write(uv_stream_t *handle) {
invoke(&uv_write, get(), handle, bufs.get(), nbufs, &defaultCallback<WriteEvent>);
invoke(&uv_write, get(), handle, &buf, 1, &defaultCallback<WriteEvent>);
}
void write(uv_stream_t *handle, uv_stream_t *send) {
invoke(&uv_write2, get(), handle, bufs.get(), nbufs, send, &defaultCallback<WriteEvent>);
invoke(&uv_write2, get(), handle, &buf, 1, send, &defaultCallback<WriteEvent>);
}
private:
std::unique_ptr<uv_buf_t[], Deleter> bufs;
unsigned int nbufs;
std::unique_ptr<char[], Deleter> data;
uv_buf_t buf;
};
@ -170,7 +170,7 @@ public:
* A ShutdownEvent event will be emitted after shutdown is complete.
*/
void shutdown() {
auto listener = [ptr = this->shared_from_this()](const auto &event, details::ShutdownReq &) {
auto listener = [ptr = this->shared_from_this()](const auto &event, const auto &) {
ptr->publish(event);
};
@ -251,12 +251,11 @@ public:
*/
void write(std::unique_ptr<char[]> data, unsigned int len) {
auto req = this->loop().template resource<details::WriteReq>(
std::unique_ptr<uv_buf_t[], details::WriteReq::Deleter>{
new uv_buf_t[1]{ uv_buf_init(data.release(), len) },
[](uv_buf_t *bufs) { delete[] bufs->base; delete[] bufs; }
}, 1);
std::unique_ptr<char[], details::WriteReq::Deleter>{
data.release(), [](char *ptr) { delete[] ptr; }
}, len);
auto listener = [ptr = this->shared_from_this()](const auto &event, details::WriteReq &) {
auto listener = [ptr = this->shared_from_this()](const auto &event, const auto &) {
ptr->publish(event);
};
@ -279,12 +278,11 @@ public:
*/
void write(char *data, unsigned int len) {
auto req = this->loop().template resource<details::WriteReq>(
std::unique_ptr<uv_buf_t[], details::WriteReq::Deleter>{
new uv_buf_t[1]{ uv_buf_init(data, len) },
[](uv_buf_t *bufs) { delete[] bufs; }
}, 1);
std::unique_ptr<char[], details::WriteReq::Deleter>{
data, [](char *) {}
}, len);
auto listener = [ptr = this->shared_from_this()](const auto &event, details::WriteReq &) {
auto listener = [ptr = this->shared_from_this()](const auto &event, const auto &) {
ptr->publish(event);
};
@ -315,12 +313,11 @@ public:
template<typename S>
void write(S &send, std::unique_ptr<char[]> data, unsigned int len) {
auto req = this->loop().template resource<details::WriteReq>(
std::unique_ptr<uv_buf_t[], details::WriteReq::Deleter>{
new uv_buf_t[1]{ uv_buf_init(data.release(), len) },
[](uv_buf_t *bufs) { delete[] bufs->base; delete[] bufs; }
}, 1);
std::unique_ptr<char[], details::WriteReq::Deleter>{
data.release(), [](char *ptr) { delete[] ptr; }
}, len);
auto listener = [ptr = this->shared_from_this()](const auto &event, details::WriteReq &) {
auto listener = [ptr = this->shared_from_this()](const auto &event, const auto &) {
ptr->publish(event);
};
@ -351,12 +348,11 @@ public:
template<typename S>
void write(S &send, char *data, unsigned int len) {
auto req = this->loop().template resource<details::WriteReq>(
std::unique_ptr<uv_buf_t[], details::WriteReq::Deleter>{
new uv_buf_t[1]{ uv_buf_init(data, len) },
[](uv_buf_t *bufs) { delete[] bufs; }
}, 1);
std::unique_ptr<char[], details::WriteReq::Deleter>{
data, [](char *) {}
}, len);
auto listener = [ptr = this->shared_from_this()](const auto &event, details::WriteReq &) {
auto listener = [ptr = this->shared_from_this()](const auto &event, const auto &) {
ptr->publish(event);
};

32
src/uvw/udp.hpp
View File

@ -59,21 +59,21 @@ enum class UVMembership: std::underlying_type_t<uv_membership> {
class SendReq final: public Request<SendReq, uv_udp_send_t> {
public:
using Deleter = void(*)(uv_buf_t *);
using Deleter = void(*)(char *);
SendReq(ConstructorAccess ca, std::shared_ptr<Loop> loop, std::unique_ptr<uv_buf_t[], Deleter> data, unsigned int ndata)
SendReq(ConstructorAccess ca, std::shared_ptr<Loop> loop, std::unique_ptr<char[], Deleter> dt, unsigned int len)
: Request<SendReq, uv_udp_send_t>{std::move(ca), std::move(loop)},
bufs{std::move(data)},
nbufs{ndata}
data{std::move(dt)},
buf{uv_buf_init(data.get(), len)}
{}
void send(uv_udp_t *handle, const struct sockaddr* addr) {
invoke(&uv_udp_send, get(), handle, bufs.get(), nbufs, addr, &defaultCallback<SendEvent>);
invoke(&uv_udp_send, get(), handle, &buf, 1, addr, &defaultCallback<SendEvent>);
}
private:
std::unique_ptr<uv_buf_t[], Deleter> bufs;
unsigned int nbufs;
std::unique_ptr<char[], Deleter> data;
uv_buf_t buf;
};
@ -300,12 +300,11 @@ public:
details::IpTraits<I>::addrFunc(ip.data(), port, &addr);
auto req = loop().resource<details::SendReq>(
std::unique_ptr<uv_buf_t[], details::SendReq::Deleter>{
new uv_buf_t[1]{ uv_buf_init(data.release(), len) },
[](uv_buf_t *bufs) { delete[] bufs->base; delete[] bufs; }
}, 1);
std::unique_ptr<char[], details::SendReq::Deleter>{
data.release(), [](char *ptr) { delete[] ptr; }
}, len);
auto listener = [ptr = shared_from_this()](const auto &event, details::SendReq &) {
auto listener = [ptr = shared_from_this()](const auto &event, const auto &) {
ptr->publish(event);
};
@ -360,12 +359,11 @@ public:
details::IpTraits<I>::addrFunc(ip.data(), port, &addr);
auto req = loop().resource<details::SendReq>(
std::unique_ptr<uv_buf_t[], details::SendReq::Deleter>{
new uv_buf_t[1]{ uv_buf_init(data, len) },
[](uv_buf_t *bufs) { delete[] bufs; }
}, 1);
std::unique_ptr<char[], details::SendReq::Deleter>{
data, [](char *) {}
}, len);
auto listener = [ptr = shared_from_this()](const auto &event, details::SendReq &) {
auto listener = [ptr = shared_from_this()](const auto &event, const auto &) {
ptr->publish(event);
};