diff options
author | Marcus Fritzsch <marcus_fritzsch@mentor.com> | 2017-07-03 11:04:24 +0200 |
---|---|---|
committer | Marcus Fritzsch <marcus_fritzsch@mentor.com> | 2017-08-08 17:24:00 +0200 |
commit | e86177d7a54d8c2c0e096fd856e64bb9671267a4 (patch) | |
tree | e31bab77a7b767a9dc635887c67d61bcf113f31a /src/main.cpp | |
parent | cb5568e11bbe2d499d4d43dc30a779a5869b12ea (diff) |
moved Poller and unique_fd from main to util, fixed c++ issues in util
Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
Diffstat (limited to 'src/main.cpp')
-rw-r--r-- | src/main.cpp | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/src/main.cpp b/src/main.cpp index 3b01d95..85169de 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -4,7 +4,6 @@ #include <unistd.h> #include <signal.h> -#include <sys/poll.h> #include <sys/signalfd.h> #include <algorithm> @@ -14,62 +13,6 @@ struct connection { std::unique_ptr<genivi::controller> c; }; -// _ _ ____ _ _ -// ___| |_ _ __ _ _ ___| |_ | _ \ ___ | | | ___ _ __ -// / __| __| '__| | | |/ __| __| | |_) / _ \| | |/ _ \ '__| -// \__ \ |_| | | |_| | (__| |_ | __/ (_) | | | __/ | -// |___/\__|_| \__,_|\___|\__| |_| \___/|_|_|\___|_| -// -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(); -}; - -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) { - if (handlers[i](pfds[i].fd) == -1) { - return -1; - } - pfds[i].revents = 0; - pfds[i].events = POLLIN; - } - } - } - return ret; -} - -struct unique_fd { - int fd {-1}; - unique_fd() = default; - explicit unique_fd(int f) : fd{f} {} - operator int() const { return fd; } - ~unique_fd() { - if (this->fd != -1) - close(this->fd); - } - unique_fd(unique_fd const &) = delete; - unique_fd &operator=(unique_fd const &) = delete; - unique_fd(unique_fd &&o) : fd(o.fd) { o.fd = -1; } - unique_fd &operator=(unique_fd &&o) { - std::swap(this->fd, o.fd); - return *this; - } -}; - - namespace { // _ _ _ _ _ ____ // (_)_ __ (_) |_ | | __ _ _ _ ___ _ _| |_ / /\ \ |