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/util.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/util.cpp')
-rw-r--r-- | src/util.cpp | 42 |
1 files changed, 36 insertions, 6 deletions
diff --git a/src/util.cpp b/src/util.cpp index 1d0601a..482003e 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -1,10 +1,12 @@ #include "util.hpp" -#include <errno.h> -#include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> -#include <time.h> +#include <cerrno> +#include <cstdarg> +#include <cstdio> +#include <cstdlib> +#include <ctime> + +#include <unistd.h> struct strftime_cache { time_t time; @@ -15,7 +17,7 @@ static void log_(char const *log_type, FILE *stream, char const *fmt, va_list args) { static struct strftime_cache strft; - time_t t = time(NULL); + time_t t = time(nullptr); if (t != strft.time) { strft.time = t; struct tm tm; @@ -63,3 +65,31 @@ void logdebug(char const *fmt, ...) { va_end(a); } #endif + +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); + } +} |