LibUCW: Fixed broken DARY_ALLOC() on 64bit architectures.

[libucw.git] / ucw / lib.h

diff --git a/ucw/lib.h b/ucw/lib.h
index f1ea7e9dc4fdb44f11d10a0297e1fb04013c9050..c673fb7bc7e1e09d51a4676b24c549ea0e44bf78 100644 (file)
--- a/ucw/lib.h
+++ b/ucw/lib.h
@@ -59,6 +59,7 @@
 #define NONRET __attribute__((noreturn))                               /** Function does not return **/
 #define UNUSED __attribute__((unused))                                 /** Variable/parameter is knowingly unused **/
 #define CONSTRUCTOR __attribute__((constructor))                       /** Call function upon start of program **/
+#define CONSTRUCTOR_WITH_PRIORITY(p) __attribute__((constructor(p)))   /** Define constructor with a given priority **/
 #define PACKED __attribute__((packed))                                 /** Structure should be packed **/
 #define CONST __attribute__((const))                                   /** Function depends only on arguments **/
 #define PURE __attribute__((pure))                                     /** Function depends only on arguments and global vars **/
@@ -145,8 +146,28 @@ void assert_failed_noinfo(void) NONRET;
 
 #ifdef LOCAL_DEBUG
 #define DBG(x,y...) msg(L_DEBUG, x,##y)        /** If `LOCAL_DEBUG` is defined before including <ucw/lib.h>, log a debug message. Otherwise do nothing. **/
+/**
+ * If `LOCAL_DEBUG` is defined before including <ucw/lib.h>, log current
+ * file name and line number. Otherwise do nothing.
+ **/
+#define DBG_SPOT msg(L_DEBUG, "%s:%d (%s)", __FILE__, __LINE__, __func__)
 #else
 #define DBG(x,y...) do { } while(0)
+#define DBG_SPOT do { } while(0)
+#endif
+
+#ifdef DEBUG_ASSERTS
+/**
+ * Sometimes, we may want to check that a pointer points to a valid memory
+ * location before we start using it for anything more complicated. This
+ * macro checks pointer validity by reading the byte it points to.
+ **/
+#define ASSERT_READABLE(ptr) ({ volatile char *__p = (ptr); *__p; })
+/** Like the previous macro, but it checks writeability, too. **/
+#define ASSERT_WRITEABLE(ptr) ({ volatile char *__p = (ptr); *__p = *__p; })
+#else
+#define ASSERT_READABLE(ptr) do { } while(0)
+#define ASSERT_WRITEABLE(ptr) do { } while(0)
 #endif
 
 /*** === Memory allocation ***/