Added tests for the hash table module.

[libucw.git] / lib / lib.h

diff --git a/lib/lib.h b/lib/lib.h
index de5b4b8cac65b2935543a57add7e70aa4b1ed909..c2ec50b03d8516ca8f004ec5922a03e9c7a1b51d 100644 (file)
--- a/lib/lib.h
+++ b/lib/lib.h
@@ -71,12 +71,13 @@ void log_file(byte *name);
 void log_fork(void);
 void log_switch(void);
 
 void log_fork(void);
 void log_switch(void);
 

-#ifdef DEBUG

 void assert_failed(char *assertion, char *file, int line) NONRET;
 void assert_failed(char *assertion, char *file, int line) NONRET;

+void assert_failed_noinfo(void) NONRET;
+
+#ifdef DEBUG_ASSERTS

 #define ASSERT(x) do { if (unlikely(!(x))) assert_failed(#x, __FILE__, __LINE__); } while(0)
 #else
 #define ASSERT(x) do { if (unlikely(!(x))) assert_failed(#x, __FILE__, __LINE__); } while(0)
 #else

-void assert_failed(void) NONRET;
-#define ASSERT(x) do { if (__builtin_constant_p(x) && !(x)) assert_failed(); } while(0)
+#define ASSERT(x) do { if (__builtin_constant_p(x) && !(x)) assert_failed_noinfo(); } while(0)

 #endif
 
 #define COMPILE_ASSERT(name,x) typedef char _COMPILE_ASSERT_##name[!!(x)-1]
 #endif
 
 #define COMPILE_ASSERT(name,x) typedef char _COMPILE_ASSERT_##name[!!(x)-1]


@@ -92,6 +93,10 @@ static inline void log_switch_enable(void) { ASSERT(log_switch_nest); log_switch
 
 /* Memory allocation */
 
 
 /* Memory allocation */
 

+#define xmalloc sh_xmalloc
+#define xrealloc sh_xrealloc
+#define xfree sh_xfree
+

 #ifdef DEBUG_DMALLOC
 /*
  * The standard dmalloc macros tend to produce lots of namespace
 #ifdef DEBUG_DMALLOC
 /*
  * The standard dmalloc macros tend to produce lots of namespace


@@ -100,19 +105,18 @@ static inline void log_switch_enable(void) { ASSERT(log_switch_nest); log_switch
  */
 #define DMALLOC_DISABLE
 #include <dmalloc.h>
  */
 #define DMALLOC_DISABLE
 #include <dmalloc.h>

-#define xmalloc(size) _xmalloc_leap(__FILE__, __LINE__, size)
-#define xrealloc(ptr,size) _xrealloc_leap(__FILE__, __LINE__, ptr, size)
-#define xfree(ptr) _xfree_leap(__FILE__, __LINE__, ptr)
+#define sh_xmalloc(size) _xmalloc_leap(__FILE__, __LINE__, size)
+#define sh_xrealloc(ptr,size) _xrealloc_leap(__FILE__, __LINE__, ptr, size)
+#define sh_xfree(ptr) _xfree_leap(__FILE__, __LINE__, ptr)

 #else
 /*
  * Unfortunately, several libraries we might want to link to define
  * their own xmalloc and we don't want to interfere with them, hence
  * the renaming.
  */
 #else
 /*
  * Unfortunately, several libraries we might want to link to define
  * their own xmalloc and we don't want to interfere with them, hence
  * the renaming.
  */

-#define xmalloc sh_xmalloc

 void *xmalloc(unsigned);
 void *xrealloc(void *, unsigned);
 void *xmalloc(unsigned);
 void *xrealloc(void *, unsigned);

-#define xfree(x) free(x)
+#define sh_xfree(x) free(x)

 #endif
 
 void *xmalloc_zero(unsigned);
 #endif
 
 void *xmalloc_zero(unsigned);