X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Flib.h;h=92c891526767e8b7333c55900596a15d266ebbeb;hb=d5e8872563f6fde8299db971ffb6494c2438c590;hp=a0f6788a58661d30bdf7d020dc78064cc1d5f325;hpb=ce64a28cb066300d964d86f2db9842e1708f9e70;p=libucw.git diff --git a/lib/lib.h b/lib/lib.h index a0f6788a..92c89152 100644 --- a/lib/lib.h +++ b/lib/lib.h @@ -1,8 +1,10 @@ /* * The UCW Library -- Miscellaneous Functions * - * (c) 1997--2006 Martin Mares + * (c) 1997--2007 Martin Mares * (c) 2005 Tomas Valla + * (c) 2006 Robert Spalek + * (c) 2007 Pavel Charvat * * This software may be freely distributed and used according to the terms * of the GNU Lesser General Public License. @@ -14,19 +16,15 @@ #include "lib/config.h" #include -/* Tell libc we're going to use all extensions available */ +/* Macros for handling structurues, offsets and alignment */ -#ifndef _GNU_SOURCE -#define _GNU_SOURCE -#endif - -/* Ugly structure handling macros */ - -#define OFFSETOF(s, i) ((unsigned int)&((s *)0)->i) +#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 */ @@ -57,11 +55,26 @@ #define CONSTRUCTOR __attribute__((constructor)) #define PACKED __attribute__((packed)) #define CONST __attribute__((const)) -#define PURE __attribute__((const)) +#define PURE __attribute__((pure)) #define FORMAT_CHECK(x,y,z) __attribute__((format(x,y,z))) #define likely(x) __builtin_expect((x),1) #define unlikely(x) __builtin_expect((x),0) +#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 + +#if __GNUC__ >= 4 +#define LIKE_MALLOC __attribute__((malloc)) +#define SENTINEL_CHECK __attribute__((sentinel)) +#else +#define LIKE_MALLOC +#define SENTINEL_CHECK +#endif + #else #error This program requires the GNU C compiler. #endif @@ -99,9 +112,9 @@ 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) +#define ASSERT(x) ({ if (unlikely(!(x))) assert_failed(#x, __FILE__, __LINE__); 1; }) #else -#define ASSERT(x) do { if (__builtin_constant_p(x) && !(x)) assert_failed_noinfo(); } while(0) +#define ASSERT(x) ({ if (__builtin_constant_p(x) && !(x)) assert_failed_noinfo(); 1; }) #endif #define COMPILE_ASSERT(name,x) typedef char _COMPILE_ASSERT_##name[!!(x)-1] @@ -138,13 +151,13 @@ static inline void log_switch_enable(void) { ASSERT(log_switch_nest); log_switch * their own xmalloc and we don't want to interfere with them, hence * the renaming. */ -void *xmalloc(unsigned); +void *xmalloc(unsigned) LIKE_MALLOC; void *xrealloc(void *, unsigned); void xfree(void *); #endif -void *xmalloc_zero(unsigned); -byte *xstrdup(byte *); +void *xmalloc_zero(unsigned) LIKE_MALLOC; +byte *xstrdup(byte *) LIKE_MALLOC; /* Content-Type pattern matching and filters */ @@ -180,11 +193,11 @@ uns prev_table_prime(uns x); /* timer.c */ -struct timeval; +timestamp_t get_timestamp(void); -void init_timer(void); -uns get_timer(void); -void get_last_timeval(struct timeval *tv); +void init_timer(timestamp_t *timer); +uns get_timer(timestamp_t *timer); +uns switch_timer(timestamp_t *old, timestamp_t *new); /* regex.c */ @@ -197,7 +210,10 @@ int rx_subst(regex *r, byte *by, byte *src, byte *dest, uns destlen); /* random.c */ -uns random_max(uns); +uns random_u32(void); +uns random_max(uns max); +u64 random_u64(void); +u64 random_max_u64(u64 max); /* mmap.c */ @@ -208,6 +224,7 @@ void munmap_file(void *start, unsigned len); void setproctitle_init(int argc, char **argv); void setproctitle(char *msg, ...) FORMAT_CHECK(printf,1,2); +char *getproctitle(void); /* randomkey.c */ @@ -238,12 +255,26 @@ void sync_dir(byte *name); /* 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 + +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); +byte *str_format_flags(byte *dest, const byte *fmt, uns flags); + +/* bigalloc.c */ + +void *page_alloc(u64 len) LIKE_MALLOC; // allocates a multiple of CPU_PAGE_SIZE bytes with mmap +void *page_alloc_zero(u64 len) LIKE_MALLOC; +void page_free(void *start, u64 len); +void *page_realloc(void *start, u64 old_len, u64 new_len); -struct sigaction; -void handle_signal(int signum, struct sigaction *oldact); -void unhandle_signal(int signum, struct sigaction *oldact); +void *big_alloc(u64 len) LIKE_MALLOC; // allocate a large memory block in the most efficient way available +void *big_alloc_zero(u64 len) LIKE_MALLOC; +void big_free(void *start, u64 len); #endif