From 289267bf90280343c6984ca8bbec2a29dc617981 Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Sat, 10 Mar 2007 21:00:09 +0100 Subject: [PATCH] Binary fastbuf functions moved to lib/ff-binary.h. --- lib/db-tool.c | 1 + lib/fastbuf.h | 116 ---------------------------------------- lib/ff-binary.c | 1 + lib/ff-binary.h | 131 ++++++++++++++++++++++++++++++++++++++++++++++ lib/lizard-test.c | 1 + lib/qache.c | 1 + lib/redblack.h | 1 + 7 files changed, 136 insertions(+), 116 deletions(-) create mode 100644 lib/ff-binary.h diff --git a/lib/db-tool.c b/lib/db-tool.c index 8dca5204..bbb419ab 100644 --- a/lib/db-tool.c +++ b/lib/db-tool.c @@ -11,6 +11,7 @@ #include "lib/db.h" #include "lib/db_internal.h" #include "lib/fastbuf.h" +#include "lib/ff-binary.h" #include #include diff --git a/lib/fastbuf.h b/lib/fastbuf.h index 6961fd2c..83caf921 100644 --- a/lib/fastbuf.h +++ b/lib/fastbuf.h @@ -14,8 +14,6 @@ #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. @@ -194,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) { @@ -398,16 +292,6 @@ static inline int bskip(struct fastbuf *f, uns len) return bskip_slow(f, len); } -/* I/O on uintptr_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 diff --git a/lib/ff-binary.c b/lib/ff-binary.c index 2d088ccf..982cc8b7 100644 --- a/lib/ff-binary.c +++ b/lib/ff-binary.c @@ -9,6 +9,7 @@ #include "lib/lib.h" #include "lib/fastbuf.h" +#include "lib/ff-binary.h" int bgetw_slow(struct fastbuf *f) { diff --git a/lib/ff-binary.h b/lib/ff-binary.h new file mode 100644 index 00000000..150413c1 --- /dev/null +++ b/lib/ff-binary.h @@ -0,0 +1,131 @@ +/* + * UCW Library -- Fast Buffered I/O on Binary Values + * + * (c) 1997--2007 Martin Mares + * (c) 2004 Robert Spalek + * + * This software may be freely distributed and used according to the terms + * of the GNU Lesser General Public License. + */ + +#ifndef _UCW_FF_BINARY_H +#define _UCW_FF_BINARY_H + +#include "lib/fastbuf.h" +#include "lib/unaligned.h" + +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); +} + +/* I/O on uintptr_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 + +#endif diff --git a/lib/lizard-test.c b/lib/lizard-test.c index dd9c62c4..137cdc79 100644 --- a/lib/lizard-test.c +++ b/lib/lizard-test.c @@ -1,6 +1,7 @@ #include "lib/lib.h" #include "lib/getopt.h" #include "lib/fastbuf.h" +#include "lib/ff-binary.h" #include "lib/lizard.h" #include #include diff --git a/lib/qache.c b/lib/qache.c index c1a5024a..eeea2b6b 100644 --- a/lib/qache.c +++ b/lib/qache.c @@ -9,6 +9,7 @@ #include "lib/lib.h" #include "lib/bitops.h" #include "lib/fastbuf.h" +#include "lib/ff-binary.h" #include "lib/qache.h" #include diff --git a/lib/redblack.h b/lib/redblack.h index e2782048..a89149b2 100644 --- a/lib/redblack.h +++ b/lib/redblack.h @@ -136,6 +136,7 @@ * undef'd. */ +#include #include #if !defined(TREE_NODE) || !defined(TREE_PREFIX) -- 2.39.2