X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Ffastbuf.h;h=83caf9211c72c9ab7345b10dbc01a7241ef670ea;hb=99ddd86376fcb9ad5795f60377c3203944821860;hp=bc7ef7eb7e492e2d3d1d25cf1fbcb9e299f0d658;hpb=e3f62ad82e2b88c52c34dcf6b769ba517e7e57f9;p=libucw.git diff --git a/lib/fastbuf.h b/lib/fastbuf.h index bc7ef7eb..83caf921 100644 --- a/lib/fastbuf.h +++ b/lib/fastbuf.h @@ -1,7 +1,7 @@ /* * UCW Library -- Fast Buffered I/O * - * (c) 1997--2004 Martin Mares + * (c) 1997--2007 Martin Mares * (c) 2004 Robert Spalek * * This software may be freely distributed and used according to the terms @@ -11,16 +11,9 @@ #ifndef _UCW_FASTBUF_H #define _UCW_FASTBUF_H -#ifndef EOF -#include -#endif - #include #include -#include "lib/unaligned.h" -#include "lib/bbuf.h" - /* * Generic buffered I/O. You supply hooks to be called for low-level operations * (swapping of buffers, seeking and closing), we do the rest. @@ -74,7 +67,7 @@ struct fastbuf { 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 */ + int (*seek)(struct fastbuf *, sh_off_t, int); /* Slow path for bseek(), buffer already flushed; returns success */ void (*close)(struct fastbuf *); /* Close the stream */ int (*config)(struct fastbuf *, uns, int); /* Configure the stream */ int can_overwrite_buffer; /* Can the buffer be altered? (see discussion above) 0=never, 1=temporarily, 2=permanently */ @@ -89,6 +82,9 @@ struct fastbuf *bfdopen(int fd, uns buflen); struct fastbuf *bfdopen_shared(int fd, uns buflen); void bfilesync(struct fastbuf *b); +#define TEMP_FILE_NAME_LEN 256 +void temp_file_name(byte *name); + /* FastIO on in-memory streams */ struct fastbuf *fbmem_create(unsigned blocksize); /* Create stream and return its writing fastbuf */ @@ -118,6 +114,26 @@ struct fastbuf *fbgrow_create(unsigned basic_size); void fbgrow_reset(struct fastbuf *b); /* Reset stream and prepare for writing */ void fbgrow_rewind(struct fastbuf *b); /* Prepare for reading */ +/* FastO with atomic writes for multi-threaded programs */ + +struct fb_atomic { + struct fastbuf fb; + struct fb_atomic_file *af; + byte *expected_max_bptr; + uns slack_size; +}; +#define FB_ATOMIC(f) ((struct fb_atomic *)(f)->is_fastbuf) + +struct fastbuf *fbatomic_open(byte *name, struct fastbuf *master, uns bufsize, int record_len); +void fbatomic_internal_write(struct fastbuf *b); + +static inline void +fbatomic_commit(struct fastbuf *b) +{ + if (b->bptr >= ((struct fb_atomic *)b)->expected_max_bptr) + fbatomic_internal_write(b); +} + /* Configuring stream parameters */ int bconfig(struct fastbuf *f, uns type, int data); @@ -131,7 +147,7 @@ void bflush(struct fastbuf *f); void bseek(struct fastbuf *f, sh_off_t pos, int whence); void bsetpos(struct fastbuf *f, sh_off_t pos); void brewind(struct fastbuf *f); -sh_off_t bfilesize(struct fastbuf *f); +sh_off_t bfilesize(struct fastbuf *f); // -1 if not seekable static inline sh_off_t btell(struct fastbuf *f) { @@ -176,110 +192,6 @@ bavailw(struct fastbuf *f) return f->bufend - f->bptr; } -int bgetw_slow(struct fastbuf *f); -static inline int bgetw(struct fastbuf *f) -{ - int w; - if (bavailr(f) >= 2) - { - w = GET_U16(f->bptr); - f->bptr += 2; - return w; - } - else - return bgetw_slow(f); -} - -u32 bgetl_slow(struct fastbuf *f); -static inline u32 bgetl(struct fastbuf *f) -{ - u32 l; - if (bavailr(f) >= 4) - { - l = GET_U32(f->bptr); - f->bptr += 4; - return l; - } - else - return bgetl_slow(f); -} - -u64 bgetq_slow(struct fastbuf *f); -static inline u64 bgetq(struct fastbuf *f) -{ - u64 l; - if (bavailr(f) >= 8) - { - l = GET_U64(f->bptr); - f->bptr += 8; - return l; - } - else - return bgetq_slow(f); -} - -u64 bget5_slow(struct fastbuf *f); -static inline u64 bget5(struct fastbuf *f) -{ - u64 l; - if (bavailr(f) >= 5) - { - l = GET_U40(f->bptr); - f->bptr += 5; - return l; - } - else - return bget5_slow(f); -} - -void bputw_slow(struct fastbuf *f, uns w); -static inline void bputw(struct fastbuf *f, uns w) -{ - if (bavailw(f) >= 2) - { - PUT_U16(f->bptr, w); - f->bptr += 2; - } - else - bputw_slow(f, w); -} - -void bputl_slow(struct fastbuf *f, u32 l); -static inline void bputl(struct fastbuf *f, u32 l) -{ - if (bavailw(f) >= 4) - { - PUT_U32(f->bptr, l); - f->bptr += 4; - } - else - bputl_slow(f, l); -} - -void bputq_slow(struct fastbuf *f, u64 l); -static inline void bputq(struct fastbuf *f, u64 l) -{ - if (bavailw(f) >= 8) - { - PUT_U64(f->bptr, l); - f->bptr += 8; - } - else - bputq_slow(f, l); -} - -void bput5_slow(struct fastbuf *f, u64 l); -static inline void bput5(struct fastbuf *f, u64 l) -{ - if (bavailw(f) >= 5) - { - PUT_U40(f->bptr, l); - f->bptr += 5; - } - else - bput5_slow(f, l); -} - uns bread_slow(struct fastbuf *f, void *b, uns l, uns check); static inline uns bread(struct fastbuf *f, void *b, uns l) { @@ -322,11 +234,18 @@ int bgets_nodie(struct fastbuf *f, byte *b, uns l); byte *bgets0(struct fastbuf *f, byte *b, uns l); struct mempool; -uns bgets_bb(struct fastbuf *f, bb_t *b); -byte *bgets_mp(struct mempool *mp, struct fastbuf *f); -int bgets_stk_step(struct fastbuf *f, byte *old_buf, byte *buf, uns len); -#define bgets_stk(f) ({ struct fastbuf *_fb = (f); uns _l = 256; byte *_b, *_p = NULL; \ - while (bgets_stk_step(_fb, _p, _b = alloca(_l), _l)) _p = _b, _l *= 2; _b; }) +struct bb_t; +uns bgets_bb(struct fastbuf *f, struct bb_t *b, uns limit); +byte *bgets_mp(struct fastbuf *f, struct mempool *mp); + +struct bgets_stk_struct { + struct fastbuf *f; + byte *old_buf, *cur_buf, *src; + uns old_len, cur_len, src_len; +}; +void bgets_stk_init(struct bgets_stk_struct *s); +void bgets_stk_step(struct bgets_stk_struct *s); +#define bgets_stk(fb) ({ struct bgets_stk_struct _s; _s.f = (fb); for (bgets_stk_init(&_s); _s.cur_len; _s.cur_buf = alloca(_s.cur_len), bgets_stk_step(&_s)); _s.cur_buf; }) static inline void bputs(struct fastbuf *f, byte *b) @@ -373,16 +292,6 @@ static inline int bskip(struct fastbuf *f, uns len) return bskip_slow(f, len); } -/* I/O on addr_int_t */ - -#ifdef CPU_64BIT_POINTERS -#define bputa(x,p) bputq(x,p) -#define bgeta(x) bgetq(x) -#else -#define bputa(x,p) bputl(x,p) -#define bgeta(x) bgetl(x) -#endif - /* Direct I/O on buffers */ static inline uns