X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Flib.h;h=27a7511b1308260c67196a23dc87a48fee16bc96;hb=116954d49373438c669eadd764e03ee8ac4211bb;hp=b20ba7e9b284a0aa9d0815a66af71caf803fb87b;hpb=0e7592fcce3a53423e5f87c28133af1523872ac7;p=libucw.git diff --git a/lib/lib.h b/lib/lib.h index b20ba7e9..27a7511b 100644 --- a/lib/lib.h +++ b/lib/lib.h @@ -27,7 +27,7 @@ #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_TO(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)) @@ -65,6 +65,13 @@ #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)) @@ -208,7 +215,9 @@ 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 */ @@ -250,16 +259,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 -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); +/* bigalloc.c */ + +void *big_alloc(unsigned int len); +void big_free(void *start, unsigned int len); + #endif