summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Fritzsch <marcus_fritzsch@mentor.com>2017-08-08 12:03:45 +0200
committerMarcus Fritzsch <marcus_fritzsch@mentor.com>2017-08-08 17:30:49 +0200
commitadd2152e7561ea456068dd73ebbdc480d13e1015 (patch)
treeca8ddac854acb4b811f8ac9a85a2941a9cadd791
parent04540dd41d0b3c1fad72b3074c0511dadc947657 (diff)
remove Poller
Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
-rw-r--r--src/util.cpp22
-rw-r--r--src/util.hpp15
2 files changed, 0 insertions, 37 deletions
diff --git a/src/util.cpp b/src/util.cpp
index 1837936..1f2bc05 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -24,28 +24,6 @@
#include <unistd.h>
-void Poller::add_fd(int fd, std::function<int(int)> handler) {
- pfds.emplace_back(pollfd{.fd = fd, .events = POLLIN, .revents = 0});
- handlers.emplace_back(std::move(handler));
-}
-
-int Poller::check_events() {
- int ret = 0;
- if ((ret = poll(this->pfds.data(), this->pfds.size(), -1)) != -1 &&
- errno != EINTR) {
- for (unsigned i = 0; i < pfds.size(); i++) {
- if ((pfds[i].revents & POLLIN) != 0) {
- if (handlers[i](pfds[i].fd) == -1) {
- return -1;
- }
- pfds[i].revents = 0;
- pfds[i].events = POLLIN;
- }
- }
- }
- return ret;
-}
-
unique_fd::~unique_fd() {
if (this->fd != -1) {
close(this->fd);
diff --git a/src/util.hpp b/src/util.hpp
index 73ddb04..0703809 100644
--- a/src/util.hpp
+++ b/src/util.hpp
@@ -81,19 +81,4 @@ struct unique_fd {
}
};
-// _ _ ____ _ _
-// ___| |_ _ __ _ _ ___| |_ | _ \ ___ | | | ___ _ __
-// / __| __| '__| | | |/ __| __| | |_) / _ \| | |/ _ \ '__|
-// \__ \ |_| | | |_| | (__| |_ | __/ (_) | | | __/ |
-// |___/\__|_| \__,_|\___|\__| |_| \___/|_|_|\___|_|
-//
-struct Poller {
- std::vector<std::function<int(int)>> handlers;
- std::vector<struct pollfd> pfds;
-
- Poller() = default;
- void add_fd(int fd, std::function<int(int)> handler);
- int check_events();
-};
-
#endif // !WM_UTIL_HPP