X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Ffastbuf.h;h=800794c7ae5669790d5d98eb94468196a38c3892;hb=3e1e48b786ff2295ca6196253849b48d3a7f91b9;hp=65245b6266720c8a2fab0f7fcbc38bf33bf91509;hpb=be2907b0805c4d55f89657f07afda7e28bcbda02;p=libucw.git

diff --git a/lib/fastbuf.h b/lib/fastbuf.h
index 65245b62..800794c7 100644
--- a/lib/fastbuf.h
+++ b/lib/fastbuf.h
@@ -1,5 +1,5 @@
 /*
- *	Sherlock Library -- Fast Buffered I/O
+ *	UCW Library -- Fast Buffered I/O
  *
  *	(c) 1997--2004 Martin Mares <mj@ucw.cz>
  *	(c) 2004 Robert Spalek <robert@ucw.cz>
@@ -8,8 +8,8 @@
  *	of the GNU Lesser General Public License.
  */
 
-#ifndef _SHERLOCK_FASTBUF_H
-#define _SHERLOCK_FASTBUF_H
+#ifndef _UCW_FASTBUF_H
+#define _UCW_FASTBUF_H
 
 #ifndef EOF
 #include <stdio.h>
@@ -84,6 +84,7 @@ struct fastbuf *bopen(byte *name, uns mode, uns buflen);
 struct fastbuf *bopen_tmp(uns buflen);
 struct fastbuf *bfdopen(int fd, uns buflen);
 struct fastbuf *bfdopen_shared(int fd, uns buflen);
+void bfilesync(struct fastbuf *b);
 
 /* FastIO on in-memory streams */
 
@@ -100,7 +101,7 @@ struct fastbuf *bopen_limited_fd(int fd, uns bufsize, uns limit);
 
 /* FastIO on static buffers */
 
-void fbbuf_init_read(struct fastbuf *f, byte *buffer, uns size);
+void fbbuf_init_read(struct fastbuf *f, byte *buffer, uns size, uns can_overwrite);
 void fbbuf_init_write(struct fastbuf *f, byte *buffer, uns size);
 static inline uns
 fbbuf_count_written(struct fastbuf *f)
@@ -121,7 +122,6 @@ 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);
-void bskip(struct fastbuf *f, uns len);
 sh_off_t bfilesize(struct fastbuf *f);
 
 static inline sh_off_t btell(struct fastbuf *f)
@@ -155,11 +155,23 @@ static inline void bputc(struct fastbuf *f, uns c)
     bputc_slow(f, c);
 }
 
+static inline uns
+bavailr(struct fastbuf *f)
+{
+  return f->bstop - f->bptr;
+}
+
+static inline uns
+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 (f->bptr + 2 <= f->bstop)
+  if (bavailr(f) >= 2)
     {
       w = GET_U16(f->bptr);
       f->bptr += 2;
@@ -173,7 +185,7 @@ u32 bgetl_slow(struct fastbuf *f);
 static inline u32 bgetl(struct fastbuf *f)
 {
   u32 l;
-  if (f->bptr + 4 <= f->bstop)
+  if (bavailr(f) >= 4)
     {
       l = GET_U32(f->bptr);
       f->bptr += 4;
@@ -187,7 +199,7 @@ u64 bgetq_slow(struct fastbuf *f);
 static inline u64 bgetq(struct fastbuf *f)
 {
   u64 l;
-  if (f->bptr + 8 <= f->bstop)
+  if (bavailr(f) >= 8)
     {
       l = GET_U64(f->bptr);
       f->bptr += 8;
@@ -201,7 +213,7 @@ u64 bget5_slow(struct fastbuf *f);
 static inline u64 bget5(struct fastbuf *f)
 {
   u64 l;
-  if (f->bptr + 5 <= f->bstop)
+  if (bavailr(f) >= 5)
     {
       l = GET_U40(f->bptr);
       f->bptr += 5;
@@ -214,7 +226,7 @@ static inline u64 bget5(struct fastbuf *f)
 void bputw_slow(struct fastbuf *f, uns w);
 static inline void bputw(struct fastbuf *f, uns w)
 {
-  if (f->bptr + 2 <= f->bufend)
+  if (bavailw(f) >= 2)
     {
       PUT_U16(f->bptr, w);
       f->bptr += 2;
@@ -226,7 +238,7 @@ static inline void bputw(struct fastbuf *f, uns w)
 void bputl_slow(struct fastbuf *f, u32 l);
 static inline void bputl(struct fastbuf *f, u32 l)
 {
-  if (f->bptr + 4 <= f->bufend)
+  if (bavailw(f) >= 4)
     {
       PUT_U32(f->bptr, l);
       f->bptr += 4;
@@ -238,7 +250,7 @@ static inline void bputl(struct fastbuf *f, u32 l)
 void bputq_slow(struct fastbuf *f, u64 l);
 static inline void bputq(struct fastbuf *f, u64 l)
 {
-  if (f->bptr + 8 <= f->bufend)
+  if (bavailw(f) >= 8)
     {
       PUT_U64(f->bptr, l);
       f->bptr += 8;
@@ -250,7 +262,7 @@ static inline void bputq(struct fastbuf *f, u64 l)
 void bput5_slow(struct fastbuf *f, u64 l);
 static inline void bput5(struct fastbuf *f, u64 l)
 {
-  if (f->bptr + 5 <= f->bufend)
+  if (bavailw(f) >= 5)
     {
       PUT_U40(f->bptr, l);
       f->bptr += 5;
@@ -262,7 +274,7 @@ static inline void bput5(struct fastbuf *f, u64 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)
+  if (bavailr(f) >= l)
     {
       memcpy(b, f->bptr, l);
       f->bptr += l;
@@ -274,7 +286,7 @@ static inline uns bread(struct fastbuf *f, void *b, uns l)
 
 static inline uns breadb(struct fastbuf *f, void *b, uns l)
 {
-  if (f->bptr + l <= f->bstop)
+  if (bavailr(f) >= l)
     {
       memcpy(b, f->bptr, l);
       f->bptr += l;
@@ -287,7 +299,7 @@ static inline uns breadb(struct fastbuf *f, void *b, uns l)
 void bwrite_slow(struct fastbuf *f, void *b, uns l);
 static inline void bwrite(struct fastbuf *f, void *b, uns l)
 {
-  if (f->bptr + l <= f->bufend)
+  if (bavailw(f) >= l)
     {
       memcpy(f->bptr, b, l);
       f->bptr += l;
@@ -323,8 +335,7 @@ 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)
+  if (bavailr(f) >= l && bavailw(t) >= l)
     {
       memcpy(t->bptr, f->bptr, l);
       t->bptr += l;
@@ -334,6 +345,18 @@ bbcopy(struct fastbuf *f, struct fastbuf *t, uns l)
     bbcopy_slow(f, t, l);
 }
 
+int bskip_slow(struct fastbuf *f, uns len);
+static inline int bskip(struct fastbuf *f, uns len)
+{
+  if (bavailr(f) >= len)
+    {
+      f->bptr += len;
+      return 1;
+    }
+  else
+    return bskip_slow(f, len);
+}
+
 /* I/O on addr_int_t */
 
 #ifdef CPU_64BIT_POINTERS
@@ -352,7 +375,7 @@ bdirect_read_prepare(struct fastbuf *f, byte **buf)
   if (f->bptr == f->bstop && !f->refill(f))
     return 0;
   *buf = f->bptr;
-  return f->bstop - f->bptr;
+  return bavailr(f);
 }
 
 static inline void
@@ -374,7 +397,7 @@ bdirect_write_prepare(struct fastbuf *f, byte **buf)
   if (f->bptr == f->bufend)
     f->spout(f);
   *buf = f->bptr;
-  return f->bufend - f->bptr;
+  return bavailw(f);
 }
 
 static inline void