/*
* The UCW Library -- Miscellaneous Functions
*
- * (c) 1997--2005 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
/* Tell libc we're going to use all extensions available */
+#ifndef _GNU_SOURCE
#define _GNU_SOURCE
+#endif
/* Ugly structure handling macros */
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 *xmalloc(unsigned);
void *xrealloc(void *, unsigned);
-#define sh_xfree(x) free(x)
+void xfree(void *);
#endif
void *xmalloc_zero(unsigned);
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);