X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Ffastbuf.h;h=83caf9211c72c9ab7345b10dbc01a7241ef670ea;hb=99ddd86376fcb9ad5795f60377c3203944821860;hp=922798ff183515a3d102191c6e614569373088e1;hpb=8104dc01b157ffb4aa43306623dd0de03a991693;p=libucw.git diff --git a/lib/fastbuf.h b/lib/fastbuf.h index 922798ff..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,15 +11,9 @@ #ifndef _UCW_FASTBUF_H #define _UCW_FASTBUF_H -#ifndef EOF -#include -#endif - #include #include -#include "lib/unaligned.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. @@ -73,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 */ @@ -88,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 */ @@ -150,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) { @@ -195,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) { @@ -399,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