X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Futil.hpp;h=84c2462bac114a7b7d8b92d6a8b72a060041b478;hb=628df48e0238391658dab54f81dfa1c62dbfb3ec;hp=2fe6e8490420c679190eb1ac575c77384f369263;hpb=cb5568e11bbe2d499d4d43dc30a779a5869b12ea;p=staging%2Fwindowmanager.git

diff --git a/src/util.hpp b/src/util.hpp
index 2fe6e84..84c2462 100644
--- a/src/util.hpp
+++ b/src/util.hpp
@@ -1,29 +1,72 @@
-#ifndef WM_UTIL_H
-#define WM_UTIL_H
+#ifndef WM_UTIL_HPP
+#define WM_UTIL_HPP
+
+#include <functional>
+#include <sys/poll.h>
+
+#include <vector>
 
-#ifdef __cplusplus
 extern "C" {
-#endif
+#include <afb/afb-binding.h>
+};
 
 #ifdef __GNUC__
-#define ATTR_FORMAT(stringindex, firsttocheck) __attribute__((format(printf, stringindex, firsttocheck)))
+#define ATTR_FORMAT(stringindex, firsttocheck) \
+   __attribute__((format(printf, stringindex, firsttocheck)))
+#define ATTR_NORETURN __attribute__((noreturn))
 #else
 #define ATTR_FORMAT(stringindex, firsttocheck)
+#define ATTR_NORETURN
 #endif
 
-void lognotice(char const *fmt, ...) ATTR_FORMAT(1,2);
-void logerror(char const *fmt, ...) ATTR_FORMAT(1,2);
-void fatal(char const *fmt, ...) ATTR_FORMAT(1,2);
+#define lognotice(...) AFB_NOTICE(__VA_ARGS__)
+#define logerror(...) AFB_ERROR(__VA_ARGS__)
+#define fatal(...)            \
+   do {                       \
+      AFB_ERROR(__VA_ARGS__); \
+      abort();                \
+   } while (0)
 
 #ifdef DEBUG_OUTPUT
-void logdebug(char const *fmt, ...) ATTR_FORMAT(1,2);
+#define logdebug(...) AFB_DEBUG(__VA_ARGS__)
 #else
-static inline void logdebug(char const * fmt, ...) ATTR_FORMAT(1,2);
-static inline void logdebug(char const * fmt, ...) {}
+#define logdebug(...)
 #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