util: logging to the afb daemon

[staging/windowmanager.git] / src / util.hpp

diff --git a/src/util.hpp b/src/util.hpp
index 0a3b8de..94838c0 100644 (file)
--- a/src/util.hpp
+++ b/src/util.hpp
@@ -5,6 +5,11 @@
 #include <sys/poll.h>
 #include <vector>
 
+extern "C" {
+#define AFB_BINDING_VERSION 2
+#include <afb/afb-binding.h>
+};
+
 #ifdef __GNUC__
 #define ATTR_FORMAT(stringindex, firsttocheck) \
    __attribute__((format(printf, stringindex, firsttocheck)))
@@ -14,15 +19,18 @@
 #define ATTR_NORETURN
 #endif
 
-void lognotice(char const *fmt, ...) noexcept ATTR_FORMAT(1, 2);
-void logerror(char const *fmt, ...) noexcept ATTR_FORMAT(1, 2);
-void fatal(char const *fmt, ...) noexcept ATTR_FORMAT(1, 2) ATTR_NORETURN;
+#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, ...) noexcept ATTR_FORMAT(1, 2);
+#define logdebug(...) AFB_DEBUG(__VA_ARGS__)
 #else
-static inline void logdebug(char const *fmt, ...) noexcept ATTR_FORMAT(1, 2);
-static inline void logdebug(char const *fmt, ...) noexcept {}
+#define logdebug(...)
 #endif
 
 //      _                   _                 _                       __     _