Added a graph-like test case which tests custom presorter and THIS_FB mode.

[libucw.git] / lib / lib.h

diff --git a/lib/lib.h b/lib/lib.h
index 5d0610e3cc33f71a2e0b6b112a721451e127ae4d..554d9ecbd5d7b1561a12408b39058f8886faf529 100644 (file)
--- a/lib/lib.h
+++ b/lib/lib.h
@@ -1,7 +1,7 @@
 /*
  *     The UCW Library -- Miscellaneous Functions
  *
 /*
  *     The UCW Library -- Miscellaneous Functions
  *

- *     (c) 1997--2006 Martin Mares <mj@ucw.cz>
+ *     (c) 1997--2007 Martin Mares <mj@ucw.cz>

  *     (c) 2005 Tomas Valla <tom@ucw.cz>
  *     (c) 2006 Robert Spalek <robert@ucw.cz>
  *
  *     (c) 2005 Tomas Valla <tom@ucw.cz>
  *     (c) 2006 Robert Spalek <robert@ucw.cz>
  *


@@ -15,21 +15,15 @@
 #include "lib/config.h"
 #include <stdarg.h>
 
 #include "lib/config.h"
 #include <stdarg.h>
 

-/* Tell libc we're going to use all extensions available */
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-

 /* Macros for handling structurues, offsets and alignment */
 
 #define CHECK_PTR_TYPE(x, type) ((x)-(type)(x) + (type)(x))
 #define PTR_TO(s, i) &((s*)0)->i
 #define OFFSETOF(s, i) ((unsigned int) PTR_TO(s, i))
 #define SKIP_BACK(s, i, p) ((s *)((char *)p - OFFSETOF(s, i)))
 /* Macros for handling structurues, offsets and alignment */
 
 #define CHECK_PTR_TYPE(x, type) ((x)-(type)(x) + (type)(x))
 #define PTR_TO(s, i) &((s*)0)->i
 #define OFFSETOF(s, i) ((unsigned int) PTR_TO(s, i))
 #define SKIP_BACK(s, i, p) ((s *)((char *)p - OFFSETOF(s, i)))

-#define ALIGN(s, a) (((s)+a-1)&~(a-1))
-#define ALIGN_PTR(p, s) ((addr_int_t)(p) % (s) ? (typeof(p))((addr_int_t)(p) + (s) - (addr_int_t)(p) % (s)) : (p))
-#define UNALIGNED_PART(ptr, type) (((addr_int_t) (ptr)) % sizeof(type))
+#define ALIGN_TO(s, a) (((s)+a-1)&~(a-1))
+#define ALIGN_PTR(p, s) ((uintptr_t)(p) % (s) ? (typeof(p))((uintptr_t)(p) + (s) - (uintptr_t)(p) % (s)) : (p))
+#define UNALIGNED_PART(ptr, type) (((uintptr_t) (ptr)) % sizeof(type))

 
 /* Some other macros */
 
 
 /* Some other macros */
 


@@ -67,6 +61,7 @@
 
 #if __GNUC__ >= 4 || __GNUC__ == 3 && __GNUC_MINOR__ >= 3
 #define ALWAYS_INLINE inline __attribute__((always_inline))
 
 #if __GNUC__ >= 4 || __GNUC__ == 3 && __GNUC_MINOR__ >= 3
 #define ALWAYS_INLINE inline __attribute__((always_inline))

+#define NO_INLINE __attribute__((noinline))

 #else
 #define ALWAYS_INLINE inline
 #endif
 #else
 #define ALWAYS_INLINE inline
 #endif


@@ -258,16 +253,19 @@ void sync_dir(byte *name);
 
 /* sighandler.c */
 
 
 /* sighandler.c */
 

-typedef int (*sh_sighandler_t)(int);
-  /* obtains signum, returns nonzero if abort() should be called */
-extern sh_sighandler_t signal_handler[];
+typedef int (*sh_sighandler_t)(int);   // gets signum, returns nonzero if abort() should be called

 
 

-struct sigaction;
-void handle_signal(int signum, struct sigaction *oldact);
-void unhandle_signal(int signum, struct sigaction *oldact);
+void handle_signal(int signum);
+void unhandle_signal(int signum);
+sh_sighandler_t set_signal_handler(int signum, sh_sighandler_t new);

 
 /* string.c */
 
 byte *str_unesc(byte *dest, byte *src);
 
 
 /* string.c */
 
 byte *str_unesc(byte *dest, byte *src);
 

+/* bigalloc.c */
+
+void *big_alloc(u64 len);
+void big_free(void *start, u64 len);
+

 #endif
 #endif