Code Review
/
staging
/
windowmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
AFBClient: add license headers
[staging/windowmanager.git]
/
src
/
util.hpp
diff --git
a/src/util.hpp
b/src/util.hpp
index
ff173c8
..
b3f43de
100644
(file)
--- a/
src/util.hpp
+++ b/
src/util.hpp
@@
-23,9
+23,14
@@
#include <sys/poll.h>
#include <sys/poll.h>
+#ifndef DO_NOT_USE_AFB
extern "C" {
#include <afb/afb-binding.h>
};
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) \
#ifdef __GNUC__
#define ATTR_FORMAT(stringindex, firsttocheck) \
@@
-36,6
+41,7
@@
extern "C" {
#define ATTR_NORETURN
#endif
#define ATTR_NORETURN
#endif
+#ifdef AFB_BINDING_VERSION
#define lognotice(...) AFB_NOTICE(__VA_ARGS__)
#define logerror(...) AFB_ERROR(__VA_ARGS__)
#define fatal(...) \
#define lognotice(...) AFB_NOTICE(__VA_ARGS__)
#define logerror(...) AFB_ERROR(__VA_ARGS__)
#define fatal(...) \
@@
-43,20
+49,29
@@
extern "C" {
AFB_ERROR(__VA_ARGS__); \
abort(); \
} while (0)
AFB_ERROR(__VA_ARGS__); \
abort(); \
} while (0)
+#else
+#define lognotice(...)
+#define logerror(...)
+#define fatal(...) \
+ do { \
+ abort(); \
+ } while (0)
+#endif
#ifdef DEBUG_OUTPUT
#ifdef DEBUG_OUTPUT
+#ifdef AFB_BINDING_VERSION
#define logdebug(...) AFB_DEBUG(__VA_ARGS__)
#else
#define logdebug(...)
#endif
#define logdebug(...) AFB_DEBUG(__VA_ARGS__)
#else
#define logdebug(...)
#endif
+#else
+#define logdebug(...)
+#endif
-#if
def NDEBU
G
+#if
ndef SCOPE_TRACIN
G
#define ST()
#define STN(N)
#else
#define ST()
#define STN(N)
#else
-#define CONCAT_(X, Y) X##Y
-#define CONCAT(X, Y) CONCAT_(X, Y)
-
#define ST() \
ScopeTrace __attribute__((unused)) CONCAT(trace_scope_, __LINE__)(__func__)
#define STN(N) \
#define ST() \
ScopeTrace __attribute__((unused)) CONCAT(trace_scope_, __LINE__)(__func__)
#define STN(N) \
@@
-65,10
+80,8
@@
extern "C" {
struct ScopeTrace {
thread_local static int indent;
char const *f{};
struct ScopeTrace {
thread_local static int indent;
char const *f{};
- explicit ScopeTrace(char const *func) : f(func) {
- fprintf(stderr, "%lu %*s%s -->\n", pthread_self(), 2 * indent++, "", this->f);
- }
- ~ScopeTrace() { fprintf(stderr, "%lu %*s%s <--\n", pthread_self(), 2 * --indent, "", this->f); }
+ explicit ScopeTrace(char const *func);
+ ~ScopeTrace();
};
#endif
};
#endif