X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Flib.h;h=a0f6788a58661d30bdf7d020dc78064cc1d5f325;hb=be8d99292164b5708998ce8d46424574fc866f80;hp=5eb05441a0c2306e79707dfa0229ebbb1028ea6c;hpb=a4cbca22d2cd36ae0c52f6ec868c7b0225e453c9;p=libucw.git

diff --git a/lib/lib.h b/lib/lib.h
index 5eb05441..a0f6788a 100644
--- a/lib/lib.h
+++ b/lib/lib.h
@@ -1,34 +1,32 @@
 /*
- *	Sherlock Library -- Miscellaneous Functions
+ *	The UCW Library -- Miscellaneous Functions
  *
- *	(c) 1997--2004 Martin Mares <mj@ucw.cz>
+ *	(c) 1997--2006 Martin Mares <mj@ucw.cz>
+ *	(c) 2005 Tomas Valla <tom@ucw.cz>
  *
  *	This software may be freely distributed and used according to the terms
  *	of the GNU Lesser General Public License.
  */
 
-/*
- *  This file should be included as the very first include in all
- *  source files, especially before all OS includes since it sets
- *  up libc feature macros.
- */
-
-#ifndef _SHERLOCK_LIB_H
-#define _SHERLOCK_LIB_H
+#ifndef _UCW_LIB_H
+#define _UCW_LIB_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
 
 /* Ugly structure handling macros */
 
 #define OFFSETOF(s, i) ((unsigned int)&((s *)0)->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_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))
 
 /* Some other macros */
 
@@ -38,6 +36,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
 
@@ -46,6 +45,27 @@
 #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__
+
+#undef inline
+#define NONRET __attribute__((noreturn))
+#define UNUSED __attribute__((unused))
+#define CONSTRUCTOR __attribute__((constructor))
+#define PACKED __attribute__((packed))
+#define CONST __attribute__((const))
+#define PURE __attribute__((const))
+#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)
+
+#else
+#error This program requires the GNU C compiler.
+#endif
+
 /* Logging */
 
 #define L_DEBUG		'D'		/* Debugging messages */
@@ -59,20 +79,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;
@@ -119,7 +140,7 @@ static inline void log_switch_enable(void) { ASSERT(log_switch_nest); log_switch
  */
 void *xmalloc(unsigned);
 void *xrealloc(void *, unsigned);
-#define sh_xfree(x) free(x)
+void xfree(void *);
 #endif
 
 void *xmalloc_zero(unsigned);
@@ -129,10 +150,6 @@ byte *xstrdup(byte *);
 
 int match_ct_patt(byte *, byte *);
 
-/* log2.c */
-
-int fls(u32);
-
 /* wordsplit.c */
 
 int sepsplit(byte *str, byte sep, byte **rec, uns max);
@@ -156,10 +173,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 */
 
@@ -179,18 +204,10 @@ uns random_max(uns);
 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);
 
 /* randomkey.c */