#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>
static uns mmap_window_size = 16*CPU_PAGE_SIZE;
static uns mmap_extend_size = 4*CPU_PAGE_SIZE;
+#ifndef TEST
static struct cf_section fbmm_config = {
CF_ITEMS {
CF_UNS("WindowSize", &mmap_window_size),
{
cf_declare_section("FBMMap", &fbmm_config, 0);
}
+#endif
struct fb_mmap {
struct fastbuf fb;
int fd;
int is_temp_file;
- sh_off_t file_size;
- sh_off_t file_extend;
- sh_off_t window_pos;
+ ucw_off_t file_size;
+ ucw_off_t file_extend;
+ ucw_off_t window_pos;
uns 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);
- sh_off_t pos0 = f->pos & ~(sh_off_t)(CPU_PAGE_SIZE-1);
- int l = MIN((sh_off_t)mmap_window_size, F->file_extend - pos0);
+ 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);
int prot = ((F->mode & O_ACCMODE) == O_RDONLY) ? PROT_READ : (PROT_READ | PROT_WRITE);
}
F->window_size = ll;
if (!f->buffer)
- f->buffer = sh_mmap(NULL, ll, prot, MAP_SHARED, F->fd, pos0);
+ f->buffer = ucw_mmap(NULL, ll, prot, MAP_SHARED, F->fd, pos0);
else
- f->buffer = sh_mmap(f->buffer, ll, prot, MAP_SHARED | MAP_FIXED, F->fd, pos0);
+ 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);
bfmm_spout(struct fastbuf *f)
{
struct fb_mmap *F = FB_MMAP(f);
- sh_off_t end = f->pos + (f->bptr - f->bstop);
+ ucw_off_t end = f->pos + (f->bptr - f->bstop);
DBG("Spout <- %p %p %p %p", f->buffer, f->bptr, f->bstop, f->bufend);
if (end > F->file_size)
f->pos = end;
if (f->pos >= F->file_extend)
{
- F->file_extend = ALIGN_TO(F->file_extend + mmap_extend_size, (sh_off_t)CPU_PAGE_SIZE);
- if (sh_ftruncate(F->fd, F->file_extend))
- die("ftruncate(%s): %m", f->name);
+ 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))
+ bthrow(f, "write", "ftruncate(%s): %m", f->name);
}
bfmm_map_window(f);
f->bstop = f->bptr;
}
static int
-bfmm_seek(struct fastbuf *f, sh_off_t pos, int whence)
+bfmm_seek(struct fastbuf *f, ucw_off_t pos, int whence)
{
if (whence == SEEK_END)
pos += FB_MMAP(f)->file_size;
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 &&
- sh_ftruncate(F->fd, F->file_size))
- die("ftruncate(%s): %m", f->name);
+ if (!(f->flags & FB_DEAD) &&
+ F->file_extend > F->file_size &&
+ ucw_ftruncate(F->fd, F->file_size))
+ bthrow(f, "write", "ftruncate(%s): %m", f->name);
bclose_file_helper(f, F->fd, F->is_temp_file);
xfree(f);
}
f->name = (byte *)(F+1);
memcpy(f->name, name, namelen);
F->fd = fd;
- F->file_extend = F->file_size = sh_seek(fd, 0, SEEK_END);
+ 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;
#ifdef TEST
-int main(int argc, char **argv)
+int main(int UNUSED argc, char **argv)
{
struct fb_params par = { .type = FB_MMAP };
struct fastbuf *f = bopen_file(argv[1], O_RDONLY, &par);