mirror/polybar
3
0
Fork 0
mirror of https://github.com/polybar/polybar.git synced 2026-02-10 02:35:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle fs_event and poll errors in handle wrapper

Browse Source
This commit is contained in:
patrick96
2021-09-13 18:16:00 +02:00
committed by Patrick Ziegler
parent db52106934
commit 895c1a6b51
6 changed files with 77 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/components/controller.hpp
View File

@ -56,8 +56,8 @@ class controller : public signal_receiver<SIGN_PRIORITY_CONTROLLER, signals::eve
void signal_handler(int signum);
void conn_cb(int status, int events);
void confwatch_handler(const char* fname, int events, int status);
void conn_cb(uv_poll_event events);
void confwatch_handler(const char* fname, uv_fs_event events);
void notifier_handler();
void screenshot_handler();

23
include/components/eventloop.hpp
View File

@ -37,12 +37,16 @@ struct UVHandleGeneric {
}
~UVHandleGeneric() {
close();
}
void close() {
if (handle && !uv_is_closing((uv_handle_t*)handle)) {
uv_close((uv_handle_t*)handle, close_callback);
}
}
void close() {
void cleanup_resources() {
if (handle) {
delete handle;
handle = nullptr;
@ -69,13 +73,21 @@ struct SignalHandle : public UVHandle<uv_signal_t, int> {
};
struct PollHandle : public UVHandle<uv_poll_t, int, int> {
PollHandle(uv_loop_t* loop, int fd, std::function<void(int, int)> fun);
PollHandle(uv_loop_t* loop, int fd, std::function<void(uv_poll_event)> fun, std::function<void(int)> err_cb);
void start(int events);
void poll_cb(int status, int events);
std::function<void(uv_poll_event)> func;
std::function<void(int)> err_cb;
};
struct FSEventHandle : public UVHandle<uv_fs_event_t, const char*, int, int> {
FSEventHandle(uv_loop_t* loop, std::function<void(const char*, int, int)> fun);
FSEventHandle(uv_loop_t* loop, std::function<void(const char*, uv_fs_event)> fun, std::function<void(int)> err_cb);
void start(const string& path);
void fs_event_cb(const char* path, int events, int status);
std::function<void(const char*, uv_fs_event)> func;
std::function<void(int)> err_cb;
};
struct PipeHandle : public UVHandleGeneric<uv_pipe_t, uv_stream_t, ssize_t, const uv_buf_t*> {
@ -113,8 +125,9 @@ class eventloop {
void run();
void stop();
void signal_handler(int signum, std::function<void(int)> fun);
void poll_handler(int events, int fd, std::function<void(int, int)> fun);
void fs_event_handler(const string& path, std::function<void(const char*, int, int)> fun);
void poll_handler(int events, int fd, std::function<void(uv_poll_event)> fun, std::function<void(int)> err_cb);
void fs_event_handler(
const string& path, std::function<void(const char*, uv_fs_event)> fun, std::function<void(int)> err_cb);
void pipe_handle(int fd, std::function<void(const string)> fun, std::function<void(void)> eof_cb);
void timer_handle(uint64_t timeout, uint64_t repeat, std::function<void(void)> fun);
AsyncHandle_t async_handle(std::function<void(void)> fun);

10
include/components/ipc.hpp
View File

@ -8,16 +8,8 @@
POLYBAR_NS
class file_descriptor;
class logger;
class signal_emitter;
/**
* Message types
*/
static constexpr const char* ipc_command_prefix{"cmd:"};
static constexpr const char* ipc_hook_prefix{"hook:"};
static constexpr const char* ipc_action_prefix{"action:"};
class logger;
/**
* Component used for inter-process communication.