moved Poller and unique_fd from main to util, fixed c++ issues in util

Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>

3 files changed, 77 insertions, 72 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 {
 //  _       _ _       _                         _    ____
 // (_)_ __ (_) |_    | | __ _ _   _  ___  _   _| |_ / /\ \
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);
+   }
+}
diff --git a/src/util.hpp b/src/util.hpp
index 2fe6e84..bc45dfd 100644
--- a/src/util.hpp
+++ b/src/util.hpp
@@ -1,9 +1,9 @@
-#ifndef WM_UTIL_H
-#define WM_UTIL_H
+#ifndef WM_UTIL_HPP
+#define WM_UTIL_HPP
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <functional>
+#include <sys/poll.h>
+#include <vector>
 
 #ifdef __GNUC__
 #define ATTR_FORMAT(stringindex, firsttocheck) __attribute__((format(printf, stringindex, firsttocheck)))
@@ -22,8 +22,40 @@ static inline void logdebug(char const * fmt, ...) ATTR_FORMAT(1,2);
 static inline void logdebug(char const * fmt, ...) {}
 #endif
 
-#ifdef __cplusplus
-}
-#endif
+//      _                   _                 _                       __     _
+//  ___| |_ _ __ _   _  ___| |_   _   _ _ __ (_) __ _ _   _  ___     / _| __| |
+// / __| __| '__| | | |/ __| __| | | | | '_ \| |/ _` | | | |/ _ \   | |_ / _` |
+// \__ \ |_| |  | |_| | (__| |_  | |_| | | | | | (_| | |_| |  __/   |  _| (_| |
+// |___/\__|_|   \__,_|\___|\__|  \__,_|_| |_|_|\__, |\__,_|\___|___|_|  \__,_|
+//                                                 |_|         |_____|
+struct unique_fd {
+   int fd{-1};
+   unique_fd() = default;
+   explicit unique_fd(int f) : fd{f} {}
+   operator int() const { return fd; }
+   ~unique_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;
+   }
+};
+
+//      _                   _     ____       _ _
+//  ___| |_ _ __ _   _  ___| |_  |  _ \ ___ | | | ___ _ __
+// / __| __| '__| | | |/ __| __| | |_) / _ \| | |/ _ \ '__|
+// \__ \ |_| |  | |_| | (__| |_  |  __/ (_) | | |  __/ |
+// |___/\__|_|   \__,_|\___|\__| |_|   \___/|_|_|\___|_|
+//
+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_H
+#endif  // !WM_UTIL_HPP