Changes in src/libcfa/libhdr/libdebug.h [4aa2fb2:2ac095d]

File:

• src/libcfa/libhdr/libdebug.h (modified) (2 diffs)

src/libcfa/libhdr/libdebug.h

@@ -18 +18 @@
 
 #ifdef __CFA_DEBUG__
-        #define LIB_DEBUG_DO(x) x
-        #define LIB_NO_DEBUG_DO(x) ((void)0)
+        #define LIB_DEBUG_DO(...) __VA_ARGS__
+        #define LIB_NO_DEBUG_DO(...)
+        #define DEBUG_CTX __PRETTY_FUNCTION__
+        #define DEBUG_CTX2 , __PRETTY_FUNCTION__
+        #define DEBUG_CTX_PARAM const char * caller
+        #define DEBUG_CTX_PARAM2 , const char * caller
 #else
-        #define LIB_DEBUG_DO(x) ((void)0)
-        #define LIB_NO_DEBUG_DO(x) x      
+        #define LIB_DEBUG_DO(...)
+        #define LIB_NO_DEBUG_DO(...) __VA_ARGS__
+        #define DEBUG_CTX
+        #define DEBUG_CTX2
+        #define DEBUG_CTX_PARAM
+        #define DEBUG_CTX_PARAM2
 #endif
 
@@ -51 +59 @@
 
 #ifdef __CFA_DEBUG_PRINT__
-      #define LIB_DEBUG_WRITE( fd, buffer, len )  __lib_debug_write( fd, buffer, len )
-      #define LIB_DEBUG_ACQUIRE()                 __lib_debug_acquire()
-      #define LIB_DEBUG_RELEASE()                 __lib_debug_release()
-      #define LIB_DEBUG_PRINT_SAFE(...)           __lib_debug_print_safe   (__VA_ARGS__)
-      #define LIB_DEBUG_PRINT_NOLOCK(...)         __lib_debug_print_nolock (__VA_ARGS__)
-      #define LIB_DEBUG_PRINT_BUFFER(...)         __lib_debug_print_buffer (__VA_ARGS__)
+        #define LIB_DEBUG_WRITE( fd, buffer, len )     __lib_debug_write( fd, buffer, len )
+        #define LIB_DEBUG_ACQUIRE()                    __lib_debug_acquire()
+        #define LIB_DEBUG_RELEASE()                    __lib_debug_release()
+        #define LIB_DEBUG_PRINT_SAFE(...)              __lib_debug_print_safe   (__VA_ARGS__)
+        #define LIB_DEBUG_PRINT_NOLOCK(...)            __lib_debug_print_nolock (__VA_ARGS__)
+        #define LIB_DEBUG_PRINT_BUFFER(...)            __lib_debug_print_buffer (__VA_ARGS__)
+        #define LIB_DEBUG_PRINT_BUFFER_DECL(fd, ...)   char text[256]; int len = snprintf( text, 256, __VA_ARGS__ ); __lib_debug_write( fd, text, len );
+        #define LIB_DEBUG_PRINT_BUFFER_LOCAL(fd, ...)  len = snprintf( text, 256, __VA_ARGS__ ); __lib_debug_write( fd, text, len );
 #else
-      #define LIB_DEBUG_WRITE(...)          ((void)0)
-      #define LIB_DEBUG_ACQUIRE()           ((void)0)
-      #define LIB_DEBUG_RELEASE()           ((void)0)
-      #define LIB_DEBUG_PRINT_SAFE(...)     ((void)0)
-      #define LIB_DEBUG_PRINT_NOLOCK(...)   ((void)0)
-      #define LIB_DEBUG_PRINT_BUFFER(...)   ((void)0)
+        #define LIB_DEBUG_WRITE(...)               ((void)0)
+        #define LIB_DEBUG_ACQUIRE()                ((void)0)
+        #define LIB_DEBUG_RELEASE()                ((void)0)
+        #define LIB_DEBUG_PRINT_SAFE(...)          ((void)0)
+        #define LIB_DEBUG_PRINT_NOLOCK(...)        ((void)0)
+        #define LIB_DEBUG_PRINT_BUFFER(...)        ((void)0)
+        #define LIB_DEBUG_PRINT_BUFFER_DECL(...)   ((void)0)
+        #define LIB_DEBUG_PRINT_BUFFER_LOCAL(...)  ((void)0)
 #endif