X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Ffastbuf.h;h=fadf306135ec7ebe5b490816d7ec871230234a9c;hb=3b44cc5e0858a329f647bee0617fbab117ea5ea9;hp=4f6c5e66f8ab8fa3e386f0d6a796d0ba67e80c35;hpb=a256a05fe3785c245f77761db19658c8bbc2b87a;p=libucw.git

diff --git a/lib/fastbuf.h b/lib/fastbuf.h
index 4f6c5e66..fadf3061 100644
--- a/lib/fastbuf.h
+++ b/lib/fastbuf.h
@@ -1,7 +1,8 @@
 /*
  *	Sherlock Library -- Fast Buffered I/O
  *
- *	(c) 1997--2002 Martin Mares <mj@ucw.cz>
+ *	(c) 1997--2004 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.
@@ -36,11 +37,11 @@
  *
  *  When writing:
  *
- *  +----------------+---------------------------+
- *  | written data   | free space                |
- *  +----------------+---------------------------+
- *  ^                 ^                           ^
- *  buffer=bstop      bptr                        bufend
+ *  +--------+--------------+--------------------+
+ *  | unused | written data | free space         |
+ *  +--------+--------------+--------------------+
+ *  ^         ^              ^                    ^
+ *  buffer    bstop          bptr                 bufend
  *
  *  Dirty tricks:
  *
@@ -50,6 +51,17 @@
  *	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 {
@@ -62,34 +74,55 @@ struct fastbuf {
   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 */
   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 */
-
-struct fb_file {
-  struct fastbuf fb;
-  int fd;				/* File descriptor, -1 if not a real file */
-  int is_temp_file;			/* 0=normal file, 1=temporary file, delete on close, -1=shared FD */
-};
-#define FB_FILE(f) ((struct fb_file *)(f)->is_fastbuf)
+/* FastIO on standard files (specify buffer size 0 to enable mmaping) */
 
-struct fastbuf *bopen(byte *name, uns mode, uns buffer);
-struct fastbuf *bopen_tmp(uns buffer);
-struct fastbuf *bfdopen(int fd, uns buffer);
-struct fastbuf *bfdopen_shared(int fd, uns buffer);
-#define FB_IS_TEMP_FILE(f) FB_FILE(f)->is_temp_file
+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);
 
 /* FastIO on in-memory streams */
 
 struct fastbuf *fbmem_create(unsigned blocksize);	/* Create stream and return its writing fastbuf */
 struct fastbuf *fbmem_clone_read(struct fastbuf *);	/* Create reading fastbuf */
 
+/* FastIO on memory mapped files */
+
+struct fastbuf *bopen_mm(byte *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;
+}
+
+/* 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);
+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)
 {
@@ -264,6 +297,7 @@ static inline void bwrite(struct fastbuf *f, void *b, uns l)
 }
 
 byte *bgets(struct fastbuf *f, byte *b, uns l);	/* Non-std */
+int bgets_nodie(struct fastbuf *f, byte *b, uns l);
 byte *bgets0(struct fastbuf *f, byte *b, uns l);
 
 static inline void
@@ -312,11 +346,11 @@ bbcopy(struct fastbuf *f, struct fastbuf *t, uns l)
 
 /* Direct I/O on buffers */
 
-static inline int
+static inline uns
 bdirect_read_prepare(struct fastbuf *f, byte **buf)
 {
   if (f->bptr == f->bstop && !f->refill(f))
-    return EOF;
+    return 0;
   *buf = f->bptr;
   return f->bstop - f->bptr;
 }
@@ -327,7 +361,14 @@ bdirect_read_commit(struct fastbuf *f, byte *pos)
   f->bptr = pos;
 }
 
-static inline int
+static inline void
+bdirect_read_commit_modified(struct fastbuf *f, byte *pos)
+{
+  f->bptr = pos;
+  f->buffer = pos;	/* Avoid seeking backwards in the buffer */
+}
+
+static inline uns
 bdirect_write_prepare(struct fastbuf *f, byte **buf)
 {
   if (f->bptr == f->bufend)
@@ -342,4 +383,9 @@ bdirect_write_commit(struct fastbuf *f, byte *pos)
   f->bptr = pos;
 }
 
+/* Formatted output */
+
+int bprintf(struct fastbuf *b, byte *msg, ...);
+int vbprintf(struct fastbuf *b, byte *msg, va_list args);
+
 #endif