/*
- * Sherlock Library -- Fast Buffered I/O on Files
+ * UCW Library -- Fast Buffered I/O on Files
*
- * (c) 1997--2002 Martin Mares <mj@ucw.cz>
+ * (c) 1997--2004 Martin Mares <mj@ucw.cz>
*
* This software may be freely distributed and used according to the terms
* of the GNU Lesser General Public License.
#include "lib/fastbuf.h"
#include "lib/lfs.h"
-#include <stdlib.h>
+#include <stdio.h>
#include <string.h>
#include <fcntl.h>
#include <unistd.h>
struct fb_file {
struct fastbuf fb;
- int fd; /* File descriptor, -1 if not a real file */
+ int fd; /* File descriptor */
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)
+#define FB_BUFFER(f) (byte *)(FB_FILE(f) + 1)
static int
bfd_refill(struct fastbuf *f)
{
+ f->bptr = f->buffer = FB_BUFFER(f);
int l = read(FB_FILE(f)->fd, f->buffer, f->bufend-f->buffer);
if (l < 0)
die("Error reading %s: %m", f->name);
- f->bptr = f->buffer;
f->bstop = f->buffer + l;
f->pos += l;
return l;
bfd_spout(struct fastbuf *f)
{
int l = f->bptr - f->buffer;
- char *c = f->buffer;
+ byte *c = f->buffer;
f->pos += l;
while (l)
l -= z;
c += z;
}
- f->bptr = f->buffer;
+ f->bptr = f->buffer = FB_BUFFER(f);
}
-static void
+static int
bfd_seek(struct fastbuf *f, sh_off_t pos, int whence)
{
- sh_off_t l;
-
- if (whence == SEEK_SET && pos == f->pos)
- return;
-
- l = sh_seek(FB_FILE(f)->fd, pos, whence);
+ sh_off_t l = sh_seek(FB_FILE(f)->fd, pos, whence);
if (l < 0)
- die("lseek on %s: %m", f->name);
+ return 0;
f->pos = l;
+ return 1;
}
static void
case BCONFIG_IS_TEMP_FILE:
FB_FILE(f)->is_temp_file = value;
return 0;
- case BCONFIG_CAN_OVERWRITE:
- return 1;
default:
return -1;
}
}
-static struct fastbuf *
-bfdopen_internal(int fd, uns buflen, byte *name)
+struct fastbuf *
+bfdopen_internal(int fd, byte *name, uns buflen)
{
+ ASSERT(buflen);
int namelen = strlen(name) + 1;
struct fb_file *F = xmalloc(sizeof(struct fb_file) + buflen + namelen);
struct fastbuf *f = &F->fb;
bzero(F, sizeof(*F));
- f->buffer = (char *)(F+1);
+ f->buffer = (byte *)(F+1);
f->bptr = f->bstop = f->buffer;
f->bufend = f->buffer + buflen;
f->name = f->bufend;
f->seek = bfd_seek;
f->close = bfd_close;
f->config = bfd_config;
+ f->can_overwrite_buffer = 2;
return f;
}
struct fastbuf *
-bopen(byte *name, uns mode, uns buffer)
+bopen_try(byte *name, uns mode, uns buflen)
{
- struct fastbuf *b;
- int fd;
-
- if (!buffer)
- return bopen_mm(name, mode);
- fd = sh_open(name, mode, 0666);
- if (fd < 0)
- die("Unable to %s file %s: %m",
- (mode & O_CREAT) ? "create" : "open", name);
- b = bfdopen_internal(fd, buffer, name);
- if (mode & O_APPEND)
- bfd_seek(b, 0, SEEK_END);
- return b;
+ return bopen_file_try(name, mode, &(struct fb_params){ .type = FB_STD, .buffer_size = buflen });
}
struct fastbuf *
-bfdopen(int fd, uns buffer)
+bopen(byte *name, uns mode, uns buflen)
{
- byte x[32];
+ return bopen_file(name, mode, &(struct fb_params){ .type = FB_STD, .buffer_size = buflen });
+}
- sprintf(x, "fd%d", fd);
- return bfdopen_internal(fd, buffer, x);
+struct fastbuf *
+bfdopen(int fd, uns buflen)
+{
+ return bopen_fd(fd, &(struct fb_params){ .type = FB_STD, .buffer_size = buflen });
}
struct fastbuf *
-bfdopen_shared(int fd, uns buffer)
+bfdopen_shared(int fd, uns buflen)
{
- struct fastbuf *f = bfdopen(fd, buffer);
+ struct fastbuf *f = bfdopen(fd, buflen);
FB_FILE(f)->is_temp_file = -1;
return f;
}
+void
+bfilesync(struct fastbuf *b)
+{
+ bflush(b);
+ if (fsync(FB_FILE(b)->fd) < 0)
+ log(L_ERROR, "fsync(%s) failed: %m", b->name);
+}
+
#ifdef TEST
-int main(int argc, char **argv)
+int main(int argc UNUSED, char **argv UNUSED)
{
struct fastbuf *f, *t;