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

diff --git a/src/util.hpp b/src/util.hpp
index 73ddb04..5d602ed 100644
--- a/src/util.hpp
+++ b/src/util.hpp
@@ -18,14 +18,18 @@
 #define WM_UTIL_HPP
 
 #include <functional>
-#include <sys/poll.h>
-
+#include <thread>
 #include <vector>
 
+#include <sys/poll.h>
+
 extern "C" {
 #include <afb/afb-binding.h>
 };
 
+#define CONCAT_(X, Y) X##Y
+#define CONCAT(X, Y) CONCAT_(X, Y)
+
 #ifdef __GNUC__
 #define ATTR_FORMAT(stringindex, firsttocheck) \
    __attribute__((format(printf, stringindex, firsttocheck)))
@@ -49,15 +53,21 @@ extern "C" {
 #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 +91,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