X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Ffastbuf.h;h=2948830ee4e0331e305a9c5a9ceb66486ca738db;hb=95e9dd4f86747dfacc24e990947717979f48cb17;hp=d5ca3e717ef7709d52ac46c4f3900ec4d5cffca0;hpb=168c1f2ddcb8ce07248b4079b6398afe8c2d792a;p=libucw.git

diff --git a/lib/fastbuf.h b/lib/fastbuf.h
index d5ca3e71..2948830e 100644
--- a/lib/fastbuf.h
+++ b/lib/fastbuf.h
@@ -4,10 +4,17 @@
  *	(c) 1997--2000 Martin Mares <mj@ucw.cz>
  */
 
+#ifndef _SHERLOCK_FASTBUF_H
+#define _SHERLOCK_FASTBUF_H
+
 #ifndef EOF
 #include <stdio.h>
 #endif
 
+#include <string.h>
+
+#include "lib/unaligned.h"
+
 /*
  *  Generic buffered I/O on a top of buffer swapping functions.
  *
@@ -40,6 +47,7 @@ struct fastbuf {
   sh_off_t pos;				/* Position of buffer start in the file */
   sh_off_t fdpos;			/* Current position in the non-buffered file */
   int fd;				/* File descriptor, -1 if not a real file */
+  int is_temp_file;			/* Is a temporary file, delete on close */
   void *lldata;				/* Data private to access functions below */
   void *llpos;				/* ... continued ... */
   int (*refill)(struct fastbuf *);	/* Get a buffer with new data */
@@ -51,6 +59,7 @@ struct fastbuf {
 /* FastIO on standard files */
 
 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);
 
@@ -66,30 +75,30 @@ 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);
 
-extern inline sh_off_t btell(struct fastbuf *f)
+static inline sh_off_t btell(struct fastbuf *f)
 {
   return f->pos + (f->bptr - f->buffer);
 }
 
 int bgetc_slow(struct fastbuf *f);
-extern inline int bgetc(struct fastbuf *f)
+static inline int bgetc(struct fastbuf *f)
 {
   return (f->bptr < f->bstop) ? (int) *f->bptr++ : bgetc_slow(f);
 }
 
 int bpeekc_slow(struct fastbuf *f);
-extern inline int bpeekc(struct fastbuf *f)
+static inline int bpeekc(struct fastbuf *f)
 {
   return (f->bptr < f->bstop) ? (int) *f->bptr : bpeekc_slow(f);
 }
 
-extern inline void bungetc(struct fastbuf *f, byte c)
+static inline void bungetc(struct fastbuf *f)
 {
-  *--f->bptr = c;
+  f->bptr--;
 }
 
-void bputc_slow(struct fastbuf *f, byte c);
-extern inline void bputc(struct fastbuf *f, byte c)
+void bputc_slow(struct fastbuf *f, uns c);
+static inline void bputc(struct fastbuf *f, uns c)
 {
   if (f->bptr < f->bufend)
     *f->bptr++ = c;
@@ -97,22 +106,13 @@ extern inline void bputc(struct fastbuf *f, byte c)
     bputc_slow(f, c);
 }
 
-word bgetw_slow(struct fastbuf *f);
-extern inline word bgetw(struct fastbuf *f)
+int bgetw_slow(struct fastbuf *f);
+static inline int bgetw(struct fastbuf *f)
 {
-  word w;
+  int w;
   if (f->bptr + 2 <= f->bstop)
     {
-      byte *p = f->bptr;
-#ifdef CPU_CAN_DO_UNALIGNED_WORDS
-      w = * ((word *) p);
-#else
-#ifdef CPU_BIG_ENDIAN
-      w = (p[0] << 8) | p[1];
-#else
-      w = (p[1] << 8) | p[0];
-#endif
-#endif
+      w = GET_U16(f->bptr);
       f->bptr += 2;
       return w;
     }
@@ -121,21 +121,12 @@ extern inline word bgetw(struct fastbuf *f)
 }
 
 u32 bgetl_slow(struct fastbuf *f);
-extern inline u32 bgetl(struct fastbuf *f)
+static inline u32 bgetl(struct fastbuf *f)
 {
   u32 l;
   if (f->bptr + 4 <= f->bstop)
     {
-      byte *p = f->bptr;
-#ifdef CPU_CAN_DO_UNALIGNED_LONGS
-      l = * ((u32 *) p);
-#else
-#ifdef CPU_BIG_ENDIAN
-      l = (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3];
-#else
-      l = (p[3] << 24) | (p[2] << 16) | (p[1] << 8) | p[0];
-#endif
-#endif
+      l = GET_U32(f->bptr);
       f->bptr += 4;
       return l;
     }
@@ -144,12 +135,12 @@ extern inline u32 bgetl(struct fastbuf *f)
 }
 
 u64 bgetq_slow(struct fastbuf *f);
-extern inline u64 bgetq(struct fastbuf *f)
+static inline u64 bgetq(struct fastbuf *f)
 {
+  u64 l;
   if (f->bptr + 8 <= f->bstop)
     {
-      u64 l;
-      memcpy(&l, f->bptr, 8);
+      l = GET_U64(f->bptr);
       f->bptr += 8;
       return l;
     }
@@ -158,17 +149,12 @@ extern inline u64 bgetq(struct fastbuf *f)
 }
 
 u64 bget5_slow(struct fastbuf *f);
-extern inline u64 bget5(struct fastbuf *f)
+static inline u64 bget5(struct fastbuf *f)
 {
   u64 l;
   if (f->bptr + 5 <= f->bstop)
     {
-      byte *p = f->bptr;
-#ifdef CPU_BIG_ENDIAN
-      l = ((u64)p[0] << 32) | (u32)((p[1] << 24) | (p[2] << 16) | (p[3] << 8) | p[4]);
-#else
-      l = ((u64)p[4] << 32) | (u32)((p[3] << 24) | (p[2] << 16) | (p[1] << 8) | p[0]);
-#endif
+      l = GET_U40(f->bptr);
       f->bptr += 5;
       return l;
     }
@@ -176,23 +162,12 @@ extern inline u64 bget5(struct fastbuf *f)
     return bget5_slow(f);
 }
 
-void bputw_slow(struct fastbuf *f, word w);
-extern inline void bputw(struct fastbuf *f, word w)
+void bputw_slow(struct fastbuf *f, uns w);
+static inline void bputw(struct fastbuf *f, uns w)
 {
   if (f->bptr + 2 <= f->bufend)
     {
-      byte *p = f->bptr;
-#ifdef CPU_CAN_DO_UNALIGNED_WORDS
-      * ((word *) p) = w;
-#else
-#ifdef CPU_BIG_ENDIAN
-      p[0] = w >> 8U;
-      p[1] = w;
-#else
-      p[1] = w >> 8U;
-      p[0] = w;
-#endif
-#endif
+      PUT_U16(f->bptr, w);
       f->bptr += 2;
     }
   else
@@ -200,26 +175,11 @@ extern inline void bputw(struct fastbuf *f, word w)
 }
 
 void bputl_slow(struct fastbuf *f, u32 l);
-extern inline void bputl(struct fastbuf *f, u32 l)
+static inline void bputl(struct fastbuf *f, u32 l)
 {
   if (f->bptr + 4 <= f->bufend)
     {
-      byte *p = f->bptr;
-#ifdef CPU_CAN_DO_UNALIGNED_LONGS
-      * ((u32 *) p) = l;
-#else
-#ifdef CPU_BIG_ENDIAN
-      p[0] = l >> 24U;
-      p[1] = l >> 16U;
-      p[2] = l >> 8U;
-      p[3] = l;
-#else
-      p[3] = l >> 24U;
-      p[2] = l >> 16U;
-      p[1] = l >> 8U;
-      p[0] = l;
-#endif
-#endif
+      PUT_U32(f->bptr, l);
       f->bptr += 4;
     }
   else
@@ -227,11 +187,11 @@ extern inline void bputl(struct fastbuf *f, u32 l)
 }
 
 void bputq_slow(struct fastbuf *f, u64 l);
-extern inline void bputq(struct fastbuf *f, u64 l)
+static inline void bputq(struct fastbuf *f, u64 l)
 {
   if (f->bptr + 8 <= f->bufend)
     {
-      memcpy(f->bptr, &l, 8);
+      PUT_U64(f->bptr, l);
       f->bptr += 8;
     }
   else
@@ -239,45 +199,44 @@ extern inline void bputq(struct fastbuf *f, u64 l)
 }
 
 void bput5_slow(struct fastbuf *f, u64 l);
-extern inline void bput5(struct fastbuf *f, u64 l)
+static inline void bput5(struct fastbuf *f, u64 l)
 {
   if (f->bptr + 5 <= f->bufend)
     {
-      byte *p = f->bptr;
-      u32 low = l;
-#ifdef CPU_BIG_ENDIAN
-      p[0] = l >> 32U;
-      p[1] = low >> 24U;
-      p[2] = low >> 16U;
-      p[3] = low >> 8U;
-      p[4] = low;
-#else
-      p[4] = l >> 32U;
-      p[3] = low >> 24U;
-      p[2] = low >> 16U;
-      p[1] = low >> 8U;
-      p[0] = low;
-#endif
+      PUT_U40(f->bptr, l);
       f->bptr += 5;
     }
   else
     bput5_slow(f, l);
 }
 
-void bread_slow(struct fastbuf *f, void *b, uns l);
-extern inline void bread(struct fastbuf *f, void *b, uns 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)
     {
       memcpy(b, f->bptr, l);
       f->bptr += l;
+      return l;
     }
   else
-    bread_slow(f, b, l);
+    return bread_slow(f, b, l, 0);
+}
+
+static inline uns breadb(struct fastbuf *f, void *b, uns l)
+{
+  if (f->bptr + l <= f->bstop)
+    {
+      memcpy(b, f->bptr, l);
+      f->bptr += l;
+      return l;
+    }
+  else
+    return bread_slow(f, b, l, 1);
 }
 
 void bwrite_slow(struct fastbuf *f, void *b, uns l);
-extern inline void bwrite(struct fastbuf *f, void *b, uns l)
+static inline void bwrite(struct fastbuf *f, void *b, uns l)
 {
   if (f->bptr + l <= f->bufend)
     {
@@ -289,30 +248,41 @@ extern inline void bwrite(struct fastbuf *f, void *b, uns l)
 }
 
 byte *bgets(struct fastbuf *f, byte *b, uns l);	/* Non-std */
+byte *bgets0(struct fastbuf *f, byte *b, uns l);
 
-extern inline void
+static inline void
 bputs(struct fastbuf *f, byte *b)
 {
   bwrite(f, b, strlen(b));
 }
 
-extern inline void
+static inline void
+bputs0(struct fastbuf *f, byte *b)
+{
+  bwrite(f, b, strlen(b)+1);
+}
+
+static inline void
 bputsn(struct fastbuf *f, byte *b)
 {
   bputs(f, b);
   bputc(f, '\n');
 }
 
-/* Depending on compile-time configuration, we select the right function for reading/writing of file offsets */
+/* I/O on addr_int_t */
 
-#ifdef SHERLOCK_CONFIG_LARGE_DB
-#define bgeto(f) bget5(f)
-#define bputo(f,l) bput5(f,l)
-#define bgetp(f) bgetq(f)
-#define bputp(f,l) bputq(f,l)
+#ifdef CPU_64BIT_POINTERS
+#define bputa(x,p) bputq(x,p)
+#define bgeta(x) bgetq(x)
 #else
-#define bgeto(f) bgetl(f)
-#define bputo(f,l) bputl(f,l)
-#define bgetp(f) bgetl(f)
-#define bputp(f,l) bputl(f,l)
+#define bputa(x,p) bputl(x,p)
+#define bgeta(x) bgetl(x)
+#endif
+
+/* Direct I/O on buffers */
+
+int bdirect_read(struct fastbuf *f, byte **buf);
+int bdirect_write_prepare(struct fastbuf *f, byte **buf);
+void bdirect_write_commit(struct fastbuf *f, byte *pos);
+
 #endif