X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Flib.h;h=554d9ecbd5d7b1561a12408b39058f8886faf529;hb=239f3fb07d3b69db82ddb097f16c495c6a289349;hp=80857c9ce3f895ba08eacaff85248813463c40d2;hpb=fc7fa4d600551c44261e8faf6fc4caaa5d459851;p=libucw.git diff --git a/lib/lib.h b/lib/lib.h index 80857c9c..554d9ecb 100644 --- a/lib/lib.h +++ b/lib/lib.h @@ -1,7 +1,9 @@ /* * The UCW Library -- Miscellaneous Functions * - * (c) 1997--2004 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. @@ -13,16 +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 UNALIGNED_PART(ptr, type) (((long) (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 */ @@ -32,6 +33,7 @@ #define ABS(x) ((x) < 0 ? -(x) : (x)) #define ARRAY_SIZE(a) (sizeof(a)/sizeof(*(a))) #define STRINGIFY(x) #x +#define STRINGIFY_EXPANDED(x) STRINGIFY(x) #define GLUE(x,y) x##y #define GLUE_(x,y) x##_##y @@ -40,6 +42,8 @@ #define COMPARE_LT(x,y) do { if ((x)<(y)) return 1; if ((x)>(y)) return 0; } while(0) #define COMPARE_GT(x,y) COMPARE_LT(y,x) +#define ROL(x, bits) (((x) << (bits)) | ((x) >> (sizeof(uns)*8 - (bits)))) /* Bitwise rotation of an uns to the left */ + /* GCC Extensions */ #ifdef __GNUC__ @@ -50,10 +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 @@ -71,20 +91,21 @@ 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); -void log_msg(unsigned int cat, const char *msg, ...) __attribute__((format(printf,2,3))); +void log_msg(unsigned int cat, const char *msg, ...) FORMAT_CHECK(printf,2,3); #define log log_msg void vlog_msg(unsigned int cat, const char *msg, va_list args); -void die(byte *, ...) NONRET; +void die(const char *, ...) NONRET FORMAT_CHECK(printf,1,2); void log_init(byte *argv0); void log_file(byte *name); void log_fork(void); -void log_switch(void); +int log_switch(void); void assert_failed(char *assertion, char *file, int line) NONRET; void assert_failed_noinfo(void) NONRET; @@ -129,22 +150,18 @@ 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 */ int match_ct_patt(byte *, byte *); -/* log2.c */ - -int fls(u32); - /* wordsplit.c */ int sepsplit(byte *str, byte sep, byte **rec, uns max); @@ -168,10 +185,18 @@ void hex_to_md5(byte *, byte *); int isprime(uns); uns nextprime(uns); +/* primetable.c */ + +uns next_table_prime(uns x); +uns prev_table_prime(uns x); + /* timer.c */ +struct timeval; + void init_timer(void); uns get_timer(void); +void get_last_timeval(struct timeval *tv); /* regex.c */ @@ -184,25 +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; -struct partmap *partmap_open(byte *name, int writeable); -void *partmap_map(struct partmap *p, sh_off_t offset, uns size); -void partmap_close(struct partmap *p); -sh_off_t partmap_size(struct partmap *p); - /* proctitle.c */ void setproctitle_init(int argc, char **argv); -void setproctitle(char *msg, ...) __attribute__((format(printf,1,2))); +void setproctitle(char *msg, ...) FORMAT_CHECK(printf,1,2); +char *getproctitle(void); /* randomkey.c */ @@ -233,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