X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Flib.h;h=554d9ecbd5d7b1561a12408b39058f8886faf529;hb=e7fcd506163c155afa5313fb28ee7e931018117f;hp=81728f1022bef457f054f40c8c2057903a84b3af;hpb=e046e98358467bc0b8a3e6bdb7685311aea462e4;p=libucw.git diff --git a/lib/lib.h b/lib/lib.h index 81728f10..554d9ecb 100644 --- a/lib/lib.h +++ b/lib/lib.h @@ -1,8 +1,9 @@ /* * The UCW Library -- Miscellaneous Functions * - * (c) 1997--2005 Martin Mares + * (c) 1997--2007 Martin Mares * (c) 2005 Tomas Valla + * (c) 2006 Robert Spalek * * This software may be freely distributed and used according to the terms * of the GNU Lesser General Public License. @@ -14,17 +15,15 @@ #include "lib/config.h" #include -/* Tell libc we're going to use all extensions available */ +/* Macros for handling structurues, offsets and alignment */ -#define _GNU_SOURCE - -/* 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 */ @@ -55,11 +54,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 @@ -77,8 +91,9 @@ extern char *log_title; /* NULL - print no title, default is log_progname */ extern char *log_filename; /* Expanded name of the current log file */ -extern int log_switch_nest; /* log_switch() nesting counter, increment to disable automatic switches */ +extern volatile int log_switch_nest; /* log_switch() nesting counter, increment to disable automatic switches */ extern int log_pid; /* 0 if shouldn't be logged */ +extern int log_precise_timings; /* Include microsecond timestamps in log messages */ extern void (*log_die_hook)(void); struct tm; extern void (*log_switch_hook)(struct tm *tm); @@ -135,13 +150,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); -#define sh_xfree(x) free(x) +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 */ @@ -194,49 +209,20 @@ int rx_subst(regex *r, byte *by, byte *src, byte *dest, uns destlen); /* random.c */ -uns random_max(uns); +uns random_max(uns max); +u64 random_u64(void); +u64 random_max_u64(u64 max); /* mmap.c */ void *mmap_file(byte *name, unsigned *len, int writeable); void munmap_file(void *start, unsigned len); -/* partmap.c */ - -struct partmap { - int fd; - sh_off_t file_size; - sh_off_t start_off, end_off; - byte *start_map; - int writeable; -}; - -struct partmap; -struct partmap *partmap_open(byte *name, int writeable); -void partmap_close(struct partmap *p); -sh_off_t partmap_size(struct partmap *p); -void partmap_load(struct partmap *p, sh_off_t start, uns size); - -static inline void * -partmap_map(struct partmap *p, sh_off_t start, uns size) -{ - if (unlikely(!p->start_map || start < p->start_off || (sh_off_t) (start+size) > p->end_off)) - partmap_load(p, start, size); - return p->start_map + (start - p->start_off); -} - -static inline void * -partmap_map_forward(struct partmap *p, sh_off_t start, uns size) -{ - if (unlikely((sh_off_t) (start+size) > p->end_off)) - partmap_load(p, start, size); - return p->start_map + (start - p->start_off); -} - /* proctitle.c */ void setproctitle_init(int argc, char **argv); void setproctitle(char *msg, ...) FORMAT_CHECK(printf,1,2); +char *getproctitle(void); /* randomkey.c */ @@ -267,12 +253,19 @@ 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); + +/* bigalloc.c */ -struct sigaction; -void handle_signal(int signum, struct sigaction *oldact); -void unhandle_signal(int signum, struct sigaction *oldact); +void *big_alloc(u64 len); +void big_free(void *start, u64 len); #endif