#undef LOCAL_DEBUG
-#include "ucw/lib.h"
-#include "ucw/fastbuf.h"
-#include "ucw/lfs.h"
-#include "ucw/conf.h"
+#include <ucw/lib.h>
+#include <ucw/fastbuf.h>
+#include <ucw/io.h>
+#include <ucw/conf.h>
#include <string.h>
#include <fcntl.h>
#include <unistd.h>
#include <sys/mman.h>
-static uns mmap_window_size = 16*CPU_PAGE_SIZE;
-static uns mmap_extend_size = 4*CPU_PAGE_SIZE;
+static uint mmap_window_size = 16*CPU_PAGE_SIZE;
+static uint mmap_extend_size = 4*CPU_PAGE_SIZE;
+#ifndef TEST
static struct cf_section fbmm_config = {
CF_ITEMS {
- CF_UNS("WindowSize", &mmap_window_size),
- CF_UNS("ExtendSize", &mmap_extend_size),
+ CF_UINT("WindowSize", &mmap_window_size),
+ CF_UINT("ExtendSize", &mmap_extend_size),
CF_END
}
};
{
cf_declare_section("FBMMap", &fbmm_config, 0);
}
+#endif
struct fb_mmap {
struct fastbuf fb;
ucw_off_t file_size;
ucw_off_t file_extend;
ucw_off_t window_pos;
- uns window_size;
+ uint window_size;
int mode;
};
-#define FB_MMAP(f) ((struct fb_mmap *)(f)->is_fastbuf)
+#define FB_MMAP(f) ((struct fb_mmap *)(f))
static void
bfmm_map_window(struct fastbuf *f)
struct fb_mmap *F = FB_MMAP(f);
ucw_off_t pos0 = f->pos & ~(ucw_off_t)(CPU_PAGE_SIZE-1);
int l = MIN((ucw_off_t)mmap_window_size, F->file_extend - pos0);
- uns ll = ALIGN_TO(l, CPU_PAGE_SIZE);
+ uint ll = ALIGN_TO(l, CPU_PAGE_SIZE);
int prot = ((F->mode & O_ACCMODE) == O_RDONLY) ? PROT_READ : (PROT_READ | PROT_WRITE);
DBG(" ... Mapping %x(%x)+%x(%x) len=%x extend=%x", (int)pos0, (int)f->pos, ll, l, (int)F->file_size, (int)F->file_extend);
else
f->buffer = ucw_mmap(f->buffer, ll, prot, MAP_SHARED | MAP_FIXED, F->fd, pos0);
if (f->buffer == (byte *) MAP_FAILED)
- die("mmap(%s): %m", f->name);
+ {
+ f->buffer = NULL;
+ bthrow(f, "mmap", "mmap(%s): %m", f->name);
+ }
#ifdef MADV_SEQUENTIAL
if (ll > CPU_PAGE_SIZE)
madvise(f->buffer, ll, MADV_SEQUENTIAL);
{
F->file_extend = ALIGN_TO(F->file_extend + mmap_extend_size, (ucw_off_t)CPU_PAGE_SIZE);
if (ucw_ftruncate(F->fd, F->file_extend))
- die("ftruncate(%s): %m", f->name);
+ bthrow(f, "write", "ftruncate(%s): %m", f->name);
}
bfmm_map_window(f);
f->bstop = f->bptr;
bfmm_close(struct fastbuf *f)
{
struct fb_mmap *F = FB_MMAP(f);
-
if (f->buffer)
munmap(f->buffer, F->window_size);
- if (F->file_extend > F->file_size &&
+ if (!(f->flags & FB_DEAD) &&
+ F->file_extend > F->file_size &&
ucw_ftruncate(F->fd, F->file_size))
- die("ftruncate(%s): %m", f->name);
+ bthrow(f, "write", "ftruncate(%s): %m", f->name);
bclose_file_helper(f, F->fd, F->is_temp_file);
xfree(f);
}
static int
-bfmm_config(struct fastbuf *f, uns item, int value)
+bfmm_config(struct fastbuf *f, uint item, int value)
{
int orig;
}
struct fastbuf *
-bfmmopen_internal(int fd, const char *name, uns mode)
+bfmmopen_internal(int fd, const char *name, uint mode)
{
int namelen = strlen(name) + 1;
struct fb_mmap *F = xmalloc(sizeof(struct fb_mmap) + namelen);
F->fd = fd;
F->file_extend = F->file_size = ucw_seek(fd, 0, SEEK_END);
if (F->file_size < 0)
- die("seek(%s): %m", name);
+ bthrow(f, "open", "fb-mmap: Cannot detect size of %s -- is it seekable?", name);
if (mode & O_APPEND)
f->pos = F->file_size;
F->mode = mode;