X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Futil.hpp;h=0703809f870ff0a6cac894b5b545e27e34c9be86;hb=2b84aa5d33611d0f2f7b8c4395dc352ebf60ea29;hp=253f656edc4636204b22036b943596025c7a2ca7;hpb=08d25dcc9db8ff5f3ef4456f056d3e89f70e4f1f;p=staging%2Fwindowmanager.git

diff --git a/src/util.hpp b/src/util.hpp
index 253f656..0703809 100644
--- a/src/util.hpp
+++ b/src/util.hpp
@@ -1,8 +1,25 @@
+/*
+ * Copyright (C) 2017 Mentor Graphics Development (Deutschland) GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 #ifndef WM_UTIL_HPP
 #define WM_UTIL_HPP
 
 #include <functional>
 #include <sys/poll.h>
+
 #include <vector>
 
 extern "C" {
@@ -32,6 +49,17 @@ 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)
+#else
+#define DB(expr)
+#endif
+
 //      _                   _                 _                       __     _
 //  ___| |_ _ __ _   _  ___| |_   _   _ _ __ (_) __ _ _   _  ___     / _| __| |
 // / __| __| '__| | | |/ __| __| | | | | '_ \| |/ _` | | | |/ _ \   | |_ / _` |
@@ -53,19 +81,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