X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Futil.hpp;h=b3f43de882f1af86ad7c8af7e0003717c5b91c34;hb=6fdda786876d9640a6a26f05ef2c5aa7e2175421;hp=73ddb049c00cf0b4da1684952fc9ab24eaa2fe9a;hpb=daf3f38d2d89b0073bdbee2a531e00dc00e172c1;p=staging%2Fwindowmanager.git

diff --git a/src/util.hpp b/src/util.hpp
index 73ddb04..b3f43de 100644
--- a/src/util.hpp
+++ b/src/util.hpp
@@ -18,13 +18,19 @@
 #define WM_UTIL_HPP
 
 #include <functional>
-#include <sys/poll.h>
-
+#include <thread>
 #include <vector>
 
+#include <sys/poll.h>
+
+#ifndef DO_NOT_USE_AFB
 extern "C" {
 #include <afb/afb-binding.h>
 };
+#endif
+
+#define CONCAT_(X, Y) X##Y
+#define CONCAT(X, Y) CONCAT_(X, Y)
 
 #ifdef __GNUC__
 #define ATTR_FORMAT(stringindex, firsttocheck) \
@@ -35,6 +41,7 @@ extern "C" {
 #define ATTR_NORETURN
 #endif
 
+#ifdef AFB_BINDING_VERSION
 #define lognotice(...) AFB_NOTICE(__VA_ARGS__)
 #define logerror(...) AFB_ERROR(__VA_ARGS__)
 #define fatal(...)            \
@@ -42,22 +49,40 @@ extern "C" {
       AFB_ERROR(__VA_ARGS__); \
       abort();                \
    } while (0)
+#else
+#define lognotice(...)
+#define logerror(...)
+#define fatal(...)            \
+   do {                       \
+      abort();                \
+   } while (0)
+#endif
 
 #ifdef DEBUG_OUTPUT
+#ifdef AFB_BINDING_VERSION
 #define logdebug(...) AFB_DEBUG(__VA_ARGS__)
 #else
 #define logdebug(...)
 #endif
+#else
+#define logdebug(...)
+#endif
 
-#ifndef NDEBUG
-#define DB(expr)                                                           \
-   do {                                                                    \
-      std::ostringstream o;                                                \
-      o << __FILE__ << ":" << __LINE__ << ":" << __func__ << ": " << expr; \
-      logdebug("%s", o.str().c_str());                                     \
-   } while (0)
+#ifndef SCOPE_TRACING
+#define ST()
+#define STN(N)
 #else
-#define DB(expr)
+#define ST() \
+    ScopeTrace __attribute__((unused)) CONCAT(trace_scope_, __LINE__)(__func__)
+#define STN(N) \
+    ScopeTrace __attribute__((unused)) CONCAT(named_trace_scope_, __LINE__)(#N)
+
+struct ScopeTrace {
+   thread_local static int indent;
+   char const *f{};
+   explicit ScopeTrace(char const *func);
+   ~ScopeTrace();
+};
 #endif
 
 //      _                   _                 _                       __     _
@@ -81,19 +106,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