pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Create wrapper for uv_pipe_t

Browse Source
This commit is contained in:
patrick96 2021-09-12 15:42:30 +02:00 committed by Patrick Ziegler
parent 86f02a3ebe
commit 309fd8221a
4 changed files with 49 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/components/controller.hpp
View File

@ -3,8 +3,8 @@
#include <moodycamel/blockingconcurrentqueue.h>
#include <uv.h>
#include <thread>
#include <mutex>
#include <thread>
#include "common.hpp"
#include "components/eventloop.hpp"

65
include/components/eventloop.hpp
View File

@ -17,7 +17,8 @@ POLYBAR_NS
do { \
int res = fun(__VA_ARGS__); \
if (res < 0) { \
throw std::runtime_error("libuv error for '" #fun "': "s + uv_strerror(res)); \
throw std::runtime_error( \
__FILE__ ":"s + std::to_string(__LINE__) + ": libuv error for '" #fun "': "s + uv_strerror(res)); \
} \
} while (0);
@ -31,6 +32,10 @@ struct cb_helper {
}
};
/**
* \tparam H Type of the handle
* \tparam I Type of the handle passed to the callback. Often the same as H, but not always (e.g. uv_read_start)
*/
template <typename H, typename I, typename... Args>
struct UVHandleGeneric {
UVHandleGeneric(std::function<void(Args...)> fun) {
@ -81,43 +86,45 @@ struct FSEventHandle : public UVHandle<uv_fs_event_t, const char*, int, int> {
};
struct PipeHandle : public UVHandleGeneric<uv_pipe_t, uv_stream_t, ssize_t, const uv_buf_t*> {
std::function<void(const string)> func;
int fd;
PipeHandle(uv_loop_t* loop, std::function<void(const string)> fun)
: UVHandleGeneric([&](ssize_t nread, const uv_buf_t* buf) {
if (nread > 0) {
string payload = string(buf->base, nread);
logger::make().notice("Bytes read: %d: '%s'", nread, payload);
fun(std::move(payload));
} else if (nread < 0) {
if (nread != UV_EOF) {
logger::make().err("Read error: %s", uv_err_name(nread));
uv_close((uv_handle_t*)handle.get(), nullptr);
} else {
UV(
uv_read_start, (uv_stream_t*)handle.get(),
[](uv_handle_t*, size_t, uv_buf_t* buf) {
: UVHandleGeneric([&](ssize_t nread, const uv_buf_t* buf) { read_cb(nread, buf); }), func(fun) {
UV(uv_pipe_init, loop, handle.get(), false);
}
void start(int fd) {
this->fd = fd;
UV(uv_pipe_open, handle.get(), fd);
UV(uv_read_start, (uv_stream_t*)handle.get(), alloc_cb, &cb.callback);
}
static void alloc_cb(uv_handle_t*, size_t, uv_buf_t* buf) {
buf->base = new char[BUFSIZ];
buf->len = BUFSIZ;
},
&cb.callback);
}
void read_cb(ssize_t nread, const uv_buf_t* buf) {
auto log = logger::make();
if (nread > 0) {
string payload = string(buf->base, nread);
log.notice("Bytes read: %d: '%s'", nread, payload);
func(payload);
} else if (nread < 0) {
if (nread != UV_EOF) {
log.err("Read error: %s", uv_err_name(nread));
uv_close((uv_handle_t*)handle.get(), nullptr);
} else {
// TODO this causes constant EOFs
start(this->fd);
}
}
if (buf->base) {
delete[] buf->base;
}
}) {
UV(uv_pipe_init, loop, handle.get(), false);
}
void start(int fd) {
UV(uv_pipe_open, handle.get(), fd);
UV(
uv_read_start, (uv_stream_t*)handle.get(),
[](uv_handle_t*, size_t, uv_buf_t* buf) {
buf->base = new char[BUFSIZ];
buf->len = BUFSIZ;
},
&cb.callback);
}
};

33
src/components/controller.cpp
View File

@ -237,30 +237,6 @@ void controller::notifier_handler() {
}
}
static void ipc_alloc_cb(uv_handle_t*, size_t, uv_buf_t* buf) {
buf->base = new char[BUFSIZ];
buf->len = BUFSIZ;
}
static void ipc_read_cb_wrapper(uv_stream_t* stream, ssize_t nread, const uv_buf_t* buf) {
if (nread > 0) {
string payload = string(buf->base, nread);
logger::make().notice("Bytes read: %d: '%s'", nread, payload);
static_cast<controller*>(stream->data)->ipc_cb(std::move(payload));
} else if (nread < 0) {
if (nread != UV_EOF) {
fprintf(stderr, "Read error %s\n", uv_err_name(nread));
uv_close((uv_handle_t*)stream, nullptr);
} else {
uv_read_start(stream, ipc_alloc_cb, ipc_read_cb_wrapper);
}
}
if (buf->base) {
delete[] buf->base;
}
}
static void notifier_cb_wrapper(uv_async_t* handle) {
static_cast<controller*>(handle->data)->notifier_handler();
}
@ -284,7 +260,7 @@ void controller::read_events(bool confwatch) {
m_bar->start();
}
auto ipc_handle = std::unique_ptr<uv_pipe_t>(nullptr);
auto ipc_handle = std::unique_ptr<PipeHandle>(nullptr);
auto screenshot_timer_handle = std::unique_ptr<uv_timer_t>(nullptr);
try {
@ -304,11 +280,8 @@ void controller::read_events(bool confwatch) {
}
if (m_ipc) {
ipc_handle = std::make_unique<uv_pipe_t>();
UV(uv_pipe_init, loop, ipc_handle.get(), false);
ipc_handle->data = this;
UV(uv_pipe_open, ipc_handle.get(), m_ipc->get_file_descriptor());
UV(uv_read_start, (uv_stream_t*)ipc_handle.get(), ipc_alloc_cb, ipc_read_cb_wrapper);
ipc_handle = std::make_unique<PipeHandle>(loop, [this](const string payload) { ipc_cb(payload); });
ipc_handle->start(m_ipc->get_file_descriptor());
}
m_notifier = std::make_unique<uv_async_t>();

2
src/components/eventloop.cpp
View File

@ -30,7 +30,7 @@ eventloop::~eventloop() {
close_loop(m_loop.get());
UV(uv_loop_close, m_loop.get());
} catch (const std::exception& e) {
// TODO log error
logger::make().err("%s", e.what());
}
m_loop.reset();