autoconf.h needs to be handled differently, since it is copied from obj/lib

[libucw.git] / lib / fastbuf.h

diff --git a/lib/fastbuf.h b/lib/fastbuf.h
index f3a05952c9db60a16021f66da5e1eaf2d9e2badd..1589843d5e3ccde0a701004ee893812b9a37c1af 100644 (file)
--- a/lib/fastbuf.h
+++ b/lib/fastbuf.h
@@ -1,22 +1,18 @@
 /*
 /*

- *     Sherlock Library -- Fast Buffered I/O
+ *     UCW Library -- Fast Buffered I/O

  *
  *

- *     (c) 1997--2002 Martin Mares <mj@ucw.cz>
+ *     (c) 1997--2007 Martin Mares <mj@ucw.cz>
+ *     (c) 2004 Robert Spalek <robert@ucw.cz>

  *
  *     This software may be freely distributed and used according to the terms
  *     of the GNU Lesser General Public License.
  */
 
  *
  *     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 <stdio.h>
-#endif
+#ifndef _UCW_FASTBUF_H
+#define _UCW_FASTBUF_H

 
 #include <string.h>
 
 #include <string.h>

-
-#include "lib/unaligned.h"
+#include <alloca.h>

 
 /*
  *  Generic buffered I/O. You supply hooks to be called for low-level operations
 
 /*
  *  Generic buffered I/O. You supply hooks to be called for low-level operations


@@ -36,11 +32,11 @@
  *
  *  When writing:
  *
  *
  *  When writing:
  *

- *  +----------------+---------------------------+
- *  | written data   | free space                |
- *  +----------------+---------------------------+
- *  ^                 ^                           ^
- *  buffer=bstop      bptr                        bufend
+ *  +--------+--------------+--------------------+
+ *  | unused | written data | free space         |
+ *  +--------+--------------+--------------------+
+ *  ^         ^              ^                    ^
+ *  buffer    bstop          bptr                 bufend

  *
  *  Dirty tricks:
  *
  *
  *  Dirty tricks:
  *


@@ -50,46 +46,108 @@
  *     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.
  *     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.

+ *    - In some cases, the user of the bdirect interface can be allowed to modify
+ *     the data in the buffer to avoid unnecessary copying. If the back-end
+ *     allows such modifications, it can set can_overwrite_buffer accordingly:
+ *             *  0 if no modification is allowed,
+ *             *  1 if the user can modify the buffer on the condition that
+ *                  the modifications will be undone before calling the next
+ *                  fastbuf operation
+ *             *  2 if the user is allowed to overwrite the data in the buffer
+ *                  if bdirect_read_commit_modified() is called afterwards.
+ *                  In this case, the back-end must be prepared for trimming
+ *                  of the buffer which is done by the commit function.

  */
 
 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 */
  */
 
 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 */
+  char *name;                          /* File name for error messages */

   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 */
   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 */
   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 */

 };
 
 };
 

-/* FastIO on standard files */
+/* FastIO on standard files (specify buffer size 0 to enable mmaping) */

 
 

-struct fb_file {
-  struct fastbuf fb;
-  int fd;                              /* File descriptor, -1 if not a real file */
-  int is_temp_file;                    /* Is a temporary file, delete on close */
-};
-#define FB_FILE(f) ((struct fb_file *)(f)->is_fastbuf)
+struct fastbuf *bopen(const char *name, uns mode, uns buflen);
+struct fastbuf *bopen_try(const char *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);

 
 

-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);
-#define FB_IS_TEMP_FILE(f) FB_FILE(f)->is_temp_file
+#define TEMP_FILE_NAME_LEN 256
+void temp_file_name(char *name);

 
 /* FastIO on in-memory streams */
 
 
 /* FastIO on in-memory streams */
 

-struct fastbuf *fbmem_create(unsigned blocksize);      /* Create stream and return its writing fastbuf */
+struct fastbuf *fbmem_create(uns blocksize);           /* Create stream and return its writing fastbuf */

 struct fastbuf *fbmem_clone_read(struct fastbuf *);    /* Create reading fastbuf */
 
 struct fastbuf *fbmem_clone_read(struct fastbuf *);    /* Create reading fastbuf */
 

+/* FastIO on memory mapped files */
+
+struct fastbuf *bopen_mm(const char *name, uns mode);
+
+/* FastI on file descriptors with limit */
+
+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, uns can_overwrite);
+void fbbuf_init_write(struct fastbuf *f, byte *buffer, uns size);
+static inline uns
+fbbuf_count_written(struct fastbuf *f)
+{
+  return f->bptr - f->bstop;
+}
+
+/* FastIO on recyclable growing buffers */
+
+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(const char *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);
+
+#define BCONFIG_IS_TEMP_FILE 0
+

 /* Universal functions working on all fastbuf's */
 
 void bclose(struct fastbuf *f);
 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);
 /* Universal functions working on all fastbuf's */
 
 void bclose(struct fastbuf *f);
 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);         // -1 if not seekable

 
 static inline sh_off_t btell(struct fastbuf *f)
 {
 
 static inline sh_off_t btell(struct fastbuf *f)
 {


@@ -122,184 +180,178 @@ static inline void bputc(struct fastbuf *f, uns c)
     bputc_slow(f, c);
 }
 
     bputc_slow(f, c);
 }
 

-int bgetw_slow(struct fastbuf *f);
-static inline int bgetw(struct fastbuf *f)
+static inline uns
+bavailr(struct fastbuf *f)

 {
 {

-  int w;
-  if (f->bptr + 2 <= f->bstop)
-    {
-      w = GET_U16(f->bptr);
-      f->bptr += 2;
-      return w;
-    }
-  else
-    return bgetw_slow(f);
+  return f->bstop - f->bptr;

 }
 
 }
 

-u32 bgetl_slow(struct fastbuf *f);
-static inline u32 bgetl(struct fastbuf *f)
+static inline uns
+bavailw(struct fastbuf *f)

 {
 {

-  u32 l;
-  if (f->bptr + 4 <= f->bstop)
-    {
-      l = GET_U32(f->bptr);
-      f->bptr += 4;
-      return l;
-    }
-  else
-    return bgetl_slow(f);
+  return f->bufend - f->bptr;

 }
 
 }
 

-u64 bgetq_slow(struct fastbuf *f);
-static inline u64 bgetq(struct fastbuf *f)
+uns bread_slow(struct fastbuf *f, void *b, uns l, uns check);
+static inline uns bread(struct fastbuf *f, void *b, uns l)

 {
 {

-  u64 l;
-  if (f->bptr + 8 <= f->bstop)
+  if (bavailr(f) >= l)

     {
     {

-      l = GET_U64(f->bptr);
-      f->bptr += 8;
+      memcpy(b, f->bptr, l);
+      f->bptr += l;

       return l;
     }
   else
       return l;
     }
   else

-    return bgetq_slow(f);
+    return bread_slow(f, b, l, 0);

 }
 
 }
 

-u64 bget5_slow(struct fastbuf *f);
-static inline u64 bget5(struct fastbuf *f)
+static inline uns breadb(struct fastbuf *f, void *b, uns l)

 {
 {

-  u64 l;
-  if (f->bptr + 5 <= f->bstop)
+  if (bavailr(f) >= l)

     {
     {

-      l = GET_U40(f->bptr);
-      f->bptr += 5;
+      memcpy(b, f->bptr, l);
+      f->bptr += l;

       return l;
     }
   else
       return l;
     }
   else

-    return bget5_slow(f);
+    return bread_slow(f, b, l, 1);

 }
 
 }
 

-void bputw_slow(struct fastbuf *f, uns w);
-static inline void bputw(struct fastbuf *f, uns w)
+void bwrite_slow(struct fastbuf *f, const void *b, uns l);
+static inline void bwrite(struct fastbuf *f, const void *b, uns l)

 {
 {

-  if (f->bptr + 2 <= f->bufend)
+  if (bavailw(f) >= l)

     {
     {

-      PUT_U16(f->bptr, w);
-      f->bptr += 2;
+      memcpy(f->bptr, b, l);
+      f->bptr += l;

     }
   else
     }
   else

-    bputw_slow(f, w);
+    bwrite_slow(f, b, l);

 }
 
 }
 

-void bputl_slow(struct fastbuf *f, u32 l);
-static inline void bputl(struct fastbuf *f, u32 l)
+/*
+ *  Functions for reading of strings:
+ *
+ *     bgets()         reads a line, strip the trailing '\n' and return a pointer
+ *                     to the terminating 0 or NULL on EOF. Dies if the line is too long.
+ *     bgets0()                does the same for 0-terminated strings.
+ *     bgets_nodie()   a variant of bgets() which returns either the length of the
+ *                             string (excluding the terminator) or -1 if the line does not fit
+ *                             in the buffer. In such cases, it returns after reading exactly `l'
+ *                             bytes of input.
+ *     bgets_bb()      a variant of bgets() which allocates the string in a growing buffer
+ *     bgets_mp()      the same, but in a mempool
+ *     bgets_stk()     the same, but on the stack by alloca()
+ */
+
+char *bgets(struct fastbuf *f, char *b, uns l);
+char *bgets0(struct fastbuf *f, char *b, uns l);
+int bgets_nodie(struct fastbuf *f, char *b, uns l);
+
+struct mempool;
+struct bb_t;
+uns bgets_bb(struct fastbuf *f, struct bb_t *b, uns limit);
+char *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, const char *b)

 {
 {

-  if (f->bptr + 4 <= f->bufend)
-    {
-      PUT_U32(f->bptr, l);
-      f->bptr += 4;
-    }
-  else
-    bputl_slow(f, l);
+  bwrite(f, b, strlen(b));

 }
 
 }
 

-void bputq_slow(struct fastbuf *f, u64 l);
-static inline void bputq(struct fastbuf *f, u64 l)
+static inline void
+bputs0(struct fastbuf *f, const char *b)

 {
 {

-  if (f->bptr + 8 <= f->bufend)
-    {
-      PUT_U64(f->bptr, l);
-      f->bptr += 8;
-    }
-  else
-    bputq_slow(f, l);
+  bwrite(f, b, strlen(b)+1);

 }
 
 }
 

-void bput5_slow(struct fastbuf *f, u64 l);
-static inline void bput5(struct fastbuf *f, u64 l)
+static inline void
+bputsn(struct fastbuf *f, const char *b)

 {
 {

-  if (f->bptr + 5 <= f->bufend)
-    {
-      PUT_U40(f->bptr, l);
-      f->bptr += 5;
-    }
-  else
-    bput5_slow(f, l);
+  bputs(f, b);
+  bputc(f, '\n');

 }
 
 }
 

-uns bread_slow(struct fastbuf *f, void *b, uns l, uns check);
-static inline uns bread(struct fastbuf *f, void *b, uns l)
+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)
+  if (bavailr(f) >= l && bavailw(t) >= l)

     {
     {

-      memcpy(b, f->bptr, l);
+      memcpy(t->bptr, f->bptr, l);
+      t->bptr += l;

       f->bptr += l;
       f->bptr += l;

-      return l;

     }
   else
     }
   else

-    return bread_slow(f, b, l, 0);
+    bbcopy_slow(f, t, l);

 }
 
 }
 

-static inline uns breadb(struct fastbuf *f, void *b, uns l)
+int bskip_slow(struct fastbuf *f, uns len);
+static inline int bskip(struct fastbuf *f, uns len)

 {
 {

-  if (f->bptr + l <= f->bstop)
+  if (bavailr(f) >= len)

     {
     {

-      memcpy(b, f->bptr, l);
-      f->bptr += l;
-      return l;
+      f->bptr += len;
+      return 1;

     }
   else
     }
   else

-    return bread_slow(f, b, l, 1);
+    return bskip_slow(f, len);

 }
 
 }
 

-void bwrite_slow(struct fastbuf *f, void *b, uns l);
-static inline void bwrite(struct fastbuf *f, void *b, uns l)
+/* Direct I/O on buffers */
+
+static inline uns
+bdirect_read_prepare(struct fastbuf *f, byte **buf)

 {
 {

-  if (f->bptr + l <= f->bufend)
+  if (f->bptr == f->bstop && !f->refill(f))

     {
     {

-      memcpy(f->bptr, b, l);
-      f->bptr += l;
+      *buf = NULL;  // This is not needed, but it helps to get rid of spurious warnings
+      return 0;

     }
     }

-  else
-    bwrite_slow(f, b, l);
+  *buf = f->bptr;
+  return bavailr(f);

 }
 
 }
 

-byte *bgets(struct fastbuf *f, byte *b, uns l);        /* Non-std */
-byte *bgets0(struct fastbuf *f, byte *b, uns l);
-

 static inline void
 static inline void

-bputs(struct fastbuf *f, byte *b)
+bdirect_read_commit(struct fastbuf *f, byte *pos)

 {
 {

-  bwrite(f, b, strlen(b));
+  f->bptr = pos;

 }
 
 static inline void
 }
 
 static inline void

-bputs0(struct fastbuf *f, byte *b)
+bdirect_read_commit_modified(struct fastbuf *f, byte *pos)

 {
 {

-  bwrite(f, b, strlen(b)+1);
+  f->bptr = pos;
+  f->buffer = pos;     /* Avoid seeking backwards in the buffer */

 }
 
 }
 

-static inline void
-bputsn(struct fastbuf *f, byte *b)
+static inline uns
+bdirect_write_prepare(struct fastbuf *f, byte **buf)

 {
 {

-  bputs(f, b);
-  bputc(f, '\n');
+  if (f->bptr == f->bufend)
+    f->spout(f);
+  *buf = f->bptr;
+  return bavailw(f);

 }
 
 }
 

-/* 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
+static inline void
+bdirect_write_commit(struct fastbuf *f, byte *pos)
+{
+  f->bptr = pos;
+}

 
 

-/* Direct I/O on buffers */
+/* Formatted output */

 
 

-int bdirect_read_prepare(struct fastbuf *f, byte **buf);
-void bdirect_read_commit(struct fastbuf *f, byte *pos);
-int bdirect_write_prepare(struct fastbuf *f, byte **buf);
-void bdirect_write_commit(struct fastbuf *f, byte *pos);
+int bprintf(struct fastbuf *b, const char *msg, ...) FORMAT_CHECK(printf,2,3);
+int vbprintf(struct fastbuf *b, const char *msg, va_list args);

 
 #endif
 
 #endif