X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Ffastbuf.h;h=1f502ce5d733a7ac85d95e7abbd20be2446a1a02;hb=2a5686e35c9d6be6cefe22d49cfff6d23ec2e842;hp=e215b3ca6c455f54d10aba593e57fa625e9bb76f;hpb=33392850a6fdcfcf2a274e3ff16dbf1fe1bd84f3;p=libucw.git diff --git a/lib/fastbuf.h b/lib/fastbuf.h index e215b3ca..1f502ce5 100644 --- a/lib/fastbuf.h +++ b/lib/fastbuf.h @@ -1,15 +1,26 @@ /* * Sherlock Library -- Fast Buffered I/O * - * (c) 1997--2000 Martin Mares + * (c) 1997--2002 Martin Mares + * + * This software may be freely distributed and used according to the terms + * of the GNU Lesser General Public License. */ +#ifndef _SHERLOCK_FASTBUF_H +#define _SHERLOCK_FASTBUF_H + #ifndef EOF #include #endif +#include + +#include "lib/unaligned.h" + /* - * Generic buffered I/O on a top of buffer swapping functions. + * Generic buffered I/O. You supply hooks to be called for low-level operations + * (swapping of buffers, seeking and closing), we do the rest. * * Buffer layout when reading: * @@ -25,23 +36,28 @@ * * When writing: * - * +----------------+---------------------------+ - * | written data | free space | - * +----------------+---------------------------+ - * ^ ^ ^ - * buffer=bstop bptr bufend + * +--------+--------------+--------------------+ + * | unused | written data | free space | + * +--------+--------------+--------------------+ + * ^ ^ ^ ^ + * buffer bstop bptr bufend + * + * Dirty tricks: + * + * - You can mix reads and writes on the same stream, but you must + * call bflush() in between and remember that the file position + * points after the flushed buffer which is not necessarily the same + * as after the data you've read. + * - The spout/refill hooks can change not only bptr and bstop, but also + * the location of the buffer; fb-mem.c takes advantage of it. */ struct fastbuf { + byte is_fastbuf[0]; /* Dummy field for checking of type casts */ byte *bptr, *bstop; /* Access pointers */ byte *buffer, *bufend; /* Start and end of the buffer */ byte *name; /* File name for error messages */ - uns buflen; /* Size of the buffer */ - sh_off_t pos; /* Position of buffer start in the file */ - sh_off_t fdpos; /* Current position in the non-buffered file */ - int fd; /* File descriptor, -1 if not a real file */ - void *lldata; /* Data private to access functions below */ - void *llpos; /* ... continued ... */ + sh_off_t pos; /* Position of bstop in the file */ int (*refill)(struct fastbuf *); /* Get a buffer with new data */ void (*spout)(struct fastbuf *); /* Write buffer data to the file */ void (*seek)(struct fastbuf *, sh_off_t, int); /* Slow path for bseek(), buffer already flushed */ @@ -50,9 +66,18 @@ struct fastbuf { /* FastIO on standard files */ +struct fb_file { + struct fastbuf fb; + int fd; /* File descriptor, -1 if not a real file */ + int is_temp_file; /* 0=normal file, 1=temporary file, delete on close, -1=shared FD */ +}; +#define FB_FILE(f) ((struct fb_file *)(f)->is_fastbuf) + struct fastbuf *bopen(byte *name, uns mode, uns buffer); +struct fastbuf *bopen_tmp(uns buffer); struct fastbuf *bfdopen(int fd, uns buffer); -void bbcopy(struct fastbuf *f, struct fastbuf *t, uns l); +struct fastbuf *bfdopen_shared(int fd, uns buffer); +#define FB_IS_TEMP_FILE(f) FB_FILE(f)->is_temp_file /* FastIO on in-memory streams */ @@ -68,7 +93,7 @@ void bsetpos(struct fastbuf *f, sh_off_t pos); static inline sh_off_t btell(struct fastbuf *f) { - return f->pos + (f->bptr - f->buffer); + return f->pos + (f->bptr - f->bstop); } int bgetc_slow(struct fastbuf *f); @@ -83,13 +108,13 @@ static inline int bpeekc(struct fastbuf *f) return (f->bptr < f->bstop) ? (int) *f->bptr : bpeekc_slow(f); } -static inline void bungetc(struct fastbuf *f, byte c) +static inline void bungetc(struct fastbuf *f) { - *--f->bptr = c; + f->bptr--; } -void bputc_slow(struct fastbuf *f, byte c); -static inline void bputc(struct fastbuf *f, byte c) +void bputc_slow(struct fastbuf *f, uns c); +static inline void bputc(struct fastbuf *f, uns c) { if (f->bptr < f->bufend) *f->bptr++ = c; @@ -97,22 +122,13 @@ static inline void bputc(struct fastbuf *f, byte c) bputc_slow(f, c); } -word bgetw_slow(struct fastbuf *f); -static inline word bgetw(struct fastbuf *f) +int bgetw_slow(struct fastbuf *f); +static inline int bgetw(struct fastbuf *f) { - word w; + int w; if (f->bptr + 2 <= f->bstop) { - byte *p = f->bptr; -#ifdef CPU_CAN_DO_UNALIGNED_WORDS - w = * ((word *) p); -#else -#ifdef CPU_BIG_ENDIAN - w = (p[0] << 8) | p[1]; -#else - w = (p[1] << 8) | p[0]; -#endif -#endif + w = GET_U16(f->bptr); f->bptr += 2; return w; } @@ -126,16 +142,7 @@ static inline u32 bgetl(struct fastbuf *f) u32 l; if (f->bptr + 4 <= f->bstop) { - byte *p = f->bptr; -#ifdef CPU_CAN_DO_UNALIGNED_LONGS - l = * ((u32 *) p); -#else -#ifdef CPU_BIG_ENDIAN - l = (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]; -#else - l = (p[3] << 24) | (p[2] << 16) | (p[1] << 8) | p[0]; -#endif -#endif + l = GET_U32(f->bptr); f->bptr += 4; return l; } @@ -146,10 +153,10 @@ static inline u32 bgetl(struct fastbuf *f) u64 bgetq_slow(struct fastbuf *f); static inline u64 bgetq(struct fastbuf *f) { + u64 l; if (f->bptr + 8 <= f->bstop) { - u64 l; - memcpy(&l, f->bptr, 8); + l = GET_U64(f->bptr); f->bptr += 8; return l; } @@ -163,12 +170,7 @@ static inline u64 bget5(struct fastbuf *f) u64 l; if (f->bptr + 5 <= f->bstop) { - byte *p = f->bptr; -#ifdef CPU_BIG_ENDIAN - l = ((u64)p[0] << 32) | (u32)((p[1] << 24) | (p[2] << 16) | (p[3] << 8) | p[4]); -#else - l = ((u64)p[4] << 32) | (u32)((p[3] << 24) | (p[2] << 16) | (p[1] << 8) | p[0]); -#endif + l = GET_U40(f->bptr); f->bptr += 5; return l; } @@ -176,23 +178,12 @@ static inline u64 bget5(struct fastbuf *f) return bget5_slow(f); } -void bputw_slow(struct fastbuf *f, word w); -static inline void bputw(struct fastbuf *f, word w) +void bputw_slow(struct fastbuf *f, uns w); +static inline void bputw(struct fastbuf *f, uns w) { if (f->bptr + 2 <= f->bufend) { - byte *p = f->bptr; -#ifdef CPU_CAN_DO_UNALIGNED_WORDS - * ((word *) p) = w; -#else -#ifdef CPU_BIG_ENDIAN - p[0] = w >> 8U; - p[1] = w; -#else - p[1] = w >> 8U; - p[0] = w; -#endif -#endif + PUT_U16(f->bptr, w); f->bptr += 2; } else @@ -204,22 +195,7 @@ static inline void bputl(struct fastbuf *f, u32 l) { if (f->bptr + 4 <= f->bufend) { - byte *p = f->bptr; -#ifdef CPU_CAN_DO_UNALIGNED_LONGS - * ((u32 *) p) = l; -#else -#ifdef CPU_BIG_ENDIAN - p[0] = l >> 24U; - p[1] = l >> 16U; - p[2] = l >> 8U; - p[3] = l; -#else - p[3] = l >> 24U; - p[2] = l >> 16U; - p[1] = l >> 8U; - p[0] = l; -#endif -#endif + PUT_U32(f->bptr, l); f->bptr += 4; } else @@ -231,7 +207,7 @@ static inline void bputq(struct fastbuf *f, u64 l) { if (f->bptr + 8 <= f->bufend) { - memcpy(f->bptr, &l, 8); + PUT_U64(f->bptr, l); f->bptr += 8; } else @@ -243,28 +219,14 @@ static inline void bput5(struct fastbuf *f, u64 l) { if (f->bptr + 5 <= f->bufend) { - byte *p = f->bptr; - u32 low = l; -#ifdef CPU_BIG_ENDIAN - p[0] = l >> 32U; - p[1] = low >> 24U; - p[2] = low >> 16U; - p[3] = low >> 8U; - p[4] = low; -#else - p[4] = l >> 32U; - p[3] = low >> 24U; - p[2] = low >> 16U; - p[1] = low >> 8U; - p[0] = low; -#endif + PUT_U40(f->bptr, l); f->bptr += 5; } else bput5_slow(f, l); } -uns bread_slow(struct fastbuf *f, void *b, uns l); +uns bread_slow(struct fastbuf *f, void *b, uns l, uns check); static inline uns bread(struct fastbuf *f, void *b, uns l) { if (f->bptr + l <= f->bstop) @@ -274,7 +236,19 @@ static inline uns bread(struct fastbuf *f, void *b, uns l) return l; } else - return bread_slow(f, b, l); + return bread_slow(f, b, l, 0); +} + +static inline uns breadb(struct fastbuf *f, void *b, uns l) +{ + if (f->bptr + l <= f->bstop) + { + memcpy(b, f->bptr, l); + f->bptr += l; + return l; + } + else + return bread_slow(f, b, l, 1); } void bwrite_slow(struct fastbuf *f, void *b, uns l); @@ -290,6 +264,7 @@ static inline void bwrite(struct fastbuf *f, void *b, uns l) } byte *bgets(struct fastbuf *f, byte *b, uns l); /* Non-std */ +byte *bgets0(struct fastbuf *f, byte *b, uns l); static inline void bputs(struct fastbuf *f, byte *b) @@ -297,6 +272,12 @@ bputs(struct fastbuf *f, byte *b) bwrite(f, b, strlen(b)); } +static inline void +bputs0(struct fastbuf *f, byte *b) +{ + bwrite(f, b, strlen(b)+1); +} + static inline void bputsn(struct fastbuf *f, byte *b) { @@ -304,16 +285,61 @@ bputsn(struct fastbuf *f, byte *b) bputc(f, '\n'); } -/* Depending on compile-time configuration, we select the right function for reading/writing of file offsets */ +void bbcopy_slow(struct fastbuf *f, struct fastbuf *t, uns l); +static inline void +bbcopy(struct fastbuf *f, struct fastbuf *t, uns l) +{ + if (f->bptr + l <= f->bstop && + t->bptr + l <= t->bufend) + { + memcpy(t->bptr, f->bptr, l); + t->bptr += l; + f->bptr += l; + } + else + bbcopy_slow(f, t, l); +} + +/* I/O on addr_int_t */ -#ifdef SHERLOCK_CONFIG_LARGE_DB -#define bgeto(f) bget5(f) -#define bputo(f,l) bput5(f,l) -#define bgetp(f) bgetq(f) -#define bputp(f,l) bputq(f,l) +#ifdef CPU_64BIT_POINTERS +#define bputa(x,p) bputq(x,p) +#define bgeta(x) bgetq(x) #else -#define bgeto(f) bgetl(f) -#define bputo(f,l) bputl(f,l) -#define bgetp(f) bgetl(f) -#define bputp(f,l) bputl(f,l) +#define bputa(x,p) bputl(x,p) +#define bgeta(x) bgetl(x) +#endif + +/* Direct I/O on buffers */ + +static inline int +bdirect_read_prepare(struct fastbuf *f, byte **buf) +{ + if (f->bptr == f->bstop && !f->refill(f)) + return EOF; + *buf = f->bptr; + return f->bstop - f->bptr; +} + +static inline void +bdirect_read_commit(struct fastbuf *f, byte *pos) +{ + f->bptr = pos; +} + +static inline int +bdirect_write_prepare(struct fastbuf *f, byte **buf) +{ + if (f->bptr == f->bufend) + f->spout(f); + *buf = f->bptr; + return f->bufend - f->bptr; +} + +static inline void +bdirect_write_commit(struct fastbuf *f, byte *pos) +{ + f->bptr = pos; +} + #endif