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

renaming

Browse Source
This commit is contained in:
Michele Caini 2016-06-27 09:24:50 +02:00
parent f10bb0503a
commit bdfd36d661
5 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/uvw/check.hpp
View File

@ -29,8 +29,8 @@ public:
}
void start(std::function<void(UVWError, Check &)> cb) noexcept {
using CB = Callback<void(uv_check_t *)>;
auto func = CB::on<&Check::startCallback>(*this, cb);
using CBF = CallbackFactory<void(uv_check_t *)>;
auto func = CBF::on<&Check::startCallback>(*this, cb);
auto err = uv_check_start(get<uv_check_t>(), func);
if(err) { cb(UVWError{err}, *this); }
}

24
src/uvw/resource.hpp
View File

@ -29,11 +29,11 @@ void* get(uv_connect_t *conn) { return conn->handle->data; }
template<typename T, typename F>
struct UVCallback;
struct UVCallbackFactory;
template<typename T,typename H, typename... Args>
struct UVCallback<T, void(H, Args...)> {
struct UVCallbackFactory<T, void(H, Args...)> {
template<void(*F)(T &, std::function<void(UVWError, T &)> &, H, Args...)>
static auto once(T &, std::function<void(UVWError, T &)>);
@ -55,7 +55,7 @@ private:
template<typename T>
class Resource: public std::enable_shared_from_this<T> {
template<typename, typename>
friend struct details::UVCallback;
friend struct details::UVCallbackFactory;
static void closeCallback(T &t, std::function<void(UVWError, T &)> &cb, uv_handle_t*) {
cb(UVWError{}, t);
@ -63,7 +63,7 @@ class Resource: public std::enable_shared_from_this<T> {
protected:
template<typename F>
using Callback = details::UVCallback<T, F>;
using CallbackFactory = details::UVCallbackFactory<T, F>;
template<typename U>
explicit Resource(HandleType<U>, std::shared_ptr<Loop> r)
@ -94,8 +94,8 @@ public:
bool referenced() const noexcept { return !(uv_has_ref(get<uv_handle_t>()) == 0); }
void close(std::function<void(UVWError, T &)> cb) noexcept {
using CB = Callback<void(uv_handle_t*)>;
auto func = CB::template once<&Resource<T>::closeCallback>(*static_cast<T*>(this), std::move(cb));
using CBF = CallbackFactory<void(uv_handle_t*)>;
auto func = CBF::template once<&Resource<T>::closeCallback>(*static_cast<T*>(this), std::move(cb));
uv_close(get<uv_handle_t>(), func);
}
@ -112,27 +112,27 @@ namespace details {
template<typename T, typename H, typename... Args>
template<void(*F)(T &, std::function<void(UVWError, T &)> &, H, Args...)>
auto UVCallback<T, void(H, Args...)>::once(T &ref, std::function<void(UVWError, T &)> cb) {
auto UVCallbackFactory<T, void(H, Args...)>::once(T &ref, std::function<void(UVWError, T &)> cb) {
Resource<T> &res = ref;
res.callback = std::move(cb);
res.leak = res.shared_from_this();
res.template get<uv_handle_t>()->data = static_cast<void*>(&ref);
return &UVCallback<T, void(H, Args...)>::protoOnce<F>;
return &UVCallbackFactory<T, void(H, Args...)>::protoOnce<F>;
}
template<typename T, typename H, typename... Args>
template<void(*F)(T &, std::function<void(UVWError, T &)> &, H, Args...)>
auto UVCallback<T, void(H, Args...)>::on(T &ref, std::function<void(UVWError, T &)> cb) {
auto UVCallbackFactory<T, void(H, Args...)>::on(T &ref, std::function<void(UVWError, T &)> cb) {
Resource<T> &res = ref;
res.callback = std::move(cb);
res.leak = res.shared_from_this();
res.template get<uv_handle_t>()->data = static_cast<void*>(&ref);
return &UVCallback<T, void(H, Args...)>::protoOn<F>;
return &UVCallbackFactory<T, void(H, Args...)>::protoOn<F>;
}
template<typename T, typename H, typename... Args>
template<void(*F)(T &, std::function<void(UVWError, T &)> &, H, Args...)>
void UVCallback<T, void(H, Args...)>::protoOnce(H handle, Args... args) {
void UVCallbackFactory<T, void(H, Args...)>::protoOnce(H handle, Args... args) {
T &ref = *(static_cast<T*>(details::get(handle)));
std::shared_ptr<T> ptr = std::static_pointer_cast<T>(ref.leak);
auto cb = std::move(ref.callback);
@ -142,7 +142,7 @@ void UVCallback<T, void(H, Args...)>::protoOnce(H handle, Args... args) {
template<typename T, typename H, typename... Args>
template<void(*F)(T &, std::function<void(UVWError, T &)> &, H, Args...)>
void UVCallback<T, void(H, Args...)>::protoOn(H handle, Args... args) {
void UVCallbackFactory<T, void(H, Args...)>::protoOn(H handle, Args... args) {
T &ref = *(static_cast<T*>(details::get(handle)));
F(ref, ref.callback, handle, std::forward<Args>(args)...);
}

4
src/uvw/stream.hpp
View File

@ -22,8 +22,8 @@ public:
// TODO shutdown
void listen(int backlog, std::function<void(UVWError, T &)> cb) noexcept {
using CB = typename Resource<T>::template Callback<void(uv_stream_t *, int)>;
auto func = CB::on<&Stream<T>::listenCallback>(*static_cast<T*>(this), cb);
using CBF = typename Resource<T>::template CallbackFactory<void(uv_stream_t *, int)>;
auto func = CBF::on<&Stream<T>::listenCallback>(*static_cast<T*>(this), cb);
auto err = uv_listen(this->template get<uv_stream_t>(), backlog, func);
if(err) { cb(UVWError{err}, *static_cast<T*>(this)); }
}

8
src/uvw/tcp.hpp
View File

@ -64,8 +64,8 @@ template<>
void Tcp::connect<Tcp::IPv4>(std::string ip, int port, std::function<void(UVWError, Tcp &)> cb) noexcept {
sockaddr_in addr;
uv_ip4_addr(ip.c_str(), port, &addr);
using CB = Callback<void(uv_connect_t *, int)>;
auto func = CB::template once<&Tcp::connectCallback>(*this, cb);
using CBF = CallbackFactory<void(uv_connect_t *, int)>;
auto func = CBF::template once<&Tcp::connectCallback>(*this, cb);
auto err = uv_tcp_connect(conn.get(), get<uv_tcp_t>(), reinterpret_cast<const sockaddr*>(&addr), func);
if(err) { cb(UVWError{err}, *this); }
}
@ -75,8 +75,8 @@ template<>
void Tcp::connect<Tcp::IPv6>(std::string ip, int port, std::function<void(UVWError, Tcp &)> cb) noexcept {
sockaddr_in6 addr;
uv_ip6_addr(ip.c_str(), port, &addr);
using CB = Callback<void(uv_connect_t *, int)>;
auto func = CB::template once<&Tcp::connectCallback>(*this, cb);
using CBF = CallbackFactory<void(uv_connect_t *, int)>;
auto func = CBF::template once<&Tcp::connectCallback>(*this, cb);
auto err = uv_tcp_connect(conn.get(), get<uv_tcp_t>(), reinterpret_cast<const sockaddr*>(&addr), func);
if(err) { cb(UVWError{err}, *this); }
}

4
src/uvw/timer.hpp
View File

@ -33,8 +33,8 @@ public:
}
void start(const Time &timeout, const Time &rep, std::function<void(UVWError, Timer &)> cb) noexcept {
using CB = Callback<void(uv_timer_t *)>;
auto func = CB::on<&Timer::startCallback>(*this, cb);
using CBF = CallbackFactory<void(uv_timer_t *)>;
auto func = CBF::on<&Timer::startCallback>(*this, cb);
auto err = uv_timer_start(get<uv_timer_t>(), func, timeout.count(), rep.count());
if(err) { cb(UVWError{err}, *this); }
}