* of the GNU Lesser General Public License.
*/
+#undef LOCAL_DEBUG
+
#include "lib/lib.h"
#include "lib/fastbuf.h"
#include "lib/lfs.h"
#include <fcntl.h>
#include <unistd.h>
#include <sys/mman.h>
-#include <sys/user.h>
-static uns mmap_window_size = 16*PAGE_SIZE;
-static uns mmap_extend_size = 4*PAGE_SIZE;
+static uns mmap_window_size = 16*CPU_PAGE_SIZE;
+static uns mmap_extend_size = 4*CPU_PAGE_SIZE;
-static struct cfitem fbmm_config[] = {
- { "FBMMap", CT_SECTION, NULL },
- { "WindowSize", CT_INT, &mmap_window_size },
- { "ExtendSize", CT_INT, &mmap_extend_size },
- { NULL, CT_STOP, NULL }
+static struct cf_section fbmm_config = {
+ CF_ITEMS {
+ CF_UNS("WindowSize", &mmap_window_size),
+ CF_UNS("ExtendSize", &mmap_extend_size),
+ CF_END
+ }
};
static void CONSTRUCTOR fbmm_init_config(void)
{
- cf_register(fbmm_config);
+ cf_declare_section("FBMMap", &fbmm_config, 0);
}
struct fb_mmap {
sh_off_t file_size;
sh_off_t file_extend;
sh_off_t window_pos;
+ uns window_size;
int mode;
};
#define FB_MMAP(f) ((struct fb_mmap *)(f)->is_fastbuf)
bfmm_map_window(struct fastbuf *f)
{
struct fb_mmap *F = FB_MMAP(f);
- sh_off_t pos0 = f->pos & ~(sh_off_t)(PAGE_SIZE-1);
+ 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);
- uns ll = ALIGN(l, PAGE_SIZE);
- uns oll = ALIGN(f->bufend - f->buffer, PAGE_SIZE);
+ uns 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);
- if (ll != oll && f->buffer)
+ if (ll != F->window_size && f->buffer)
{
- munmap(f->buffer, oll);
+ munmap(f->buffer, F->window_size);
f->buffer = NULL;
}
+ F->window_size = ll;
if (!f->buffer)
f->buffer = sh_mmap(NULL, ll, prot, MAP_SHARED, F->fd, pos0);
else
if (f->buffer == (byte *) MAP_FAILED)
die("mmap(%s): %m", f->name);
#ifdef MADV_SEQUENTIAL
- if (ll > PAGE_SIZE)
+ if (ll > CPU_PAGE_SIZE)
madvise(f->buffer, ll, MADV_SEQUENTIAL);
#endif
f->bufend = f->buffer + l;
f->pos = end;
if (f->pos >= F->file_extend)
{
- F->file_extend = ALIGN(F->file_extend + mmap_extend_size, (sh_off_t)PAGE_SIZE);
+ 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);
}
DBG(" -> %p %p %p(%x) %p", f->buffer, f->bptr, f->bstop, (int)f->pos, f->bufend);
}
-static void
+static int
bfmm_seek(struct fastbuf *f, sh_off_t pos, int whence)
{
if (whence == SEEK_END)
ASSERT(whence == SEEK_SET);
ASSERT(pos >= 0 && pos <= FB_MMAP(f)->file_size);
f->pos = pos;
- f->bptr = f->bstop = f->bufend; /* force refill/spout call */
+ f->bptr = f->bstop = f->bufend = f->buffer; /* force refill/spout call */
DBG("Seek -> %p %p %p(%x) %p", f->buffer, f->bptr, f->bstop, (int)f->pos, f->bufend);
+ return 1;
}
static void
struct fb_mmap *F = FB_MMAP(f);
if (f->buffer)
- munmap(f->buffer, ALIGN(f->bufend-f->buffer, PAGE_SIZE));
+ 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);
- switch (F->is_temp_file)
- {
- case 1:
- if (unlink(f->name) < 0)
- log(L_ERROR, "unlink(%s): %m", f->name);
- case 0:
- close(F->fd);
- }
+ bclose_file_helper(f, F->fd, F->is_temp_file);
xfree(f);
}
static int
bfmm_config(struct fastbuf *f, uns item, int value)
{
+ int orig;
+
switch (item)
{
case BCONFIG_IS_TEMP_FILE:
+ orig = FB_MMAP(f)->is_temp_file;
FB_MMAP(f)->is_temp_file = value;
- return 0;
+ return orig;
default:
return -1;
}
}
-static struct fastbuf *
-bfmmopen_internal(int fd, byte *name, uns mode)
+struct fastbuf *
+bfmmopen_internal(int fd, const char *name, uns mode)
{
int namelen = strlen(name) + 1;
struct fb_mmap *F = xmalloc(sizeof(struct fb_mmap) + namelen);
memcpy(f->name, name, namelen);
F->fd = fd;
F->file_extend = F->file_size = sh_seek(fd, 0, SEEK_END);
+ if (F->file_size < 0)
+ die("seek(%s): %m", name);
if (mode & O_APPEND)
f->pos = F->file_size;
F->mode = mode;
return f;
}
-struct fastbuf *
-bopen_mm(byte *name, uns mode)
-{
- int fd;
-
- if ((mode & O_ACCMODE) == O_WRONLY)
- mode = (mode & ~O_ACCMODE) | O_RDWR;
- fd = sh_open(name, mode, 0666);
- if (fd < 0)
- die("Unable to %s file %s: %m",
- (mode & O_CREAT) ? "create" : "open", name);
- return bfmmopen_internal(fd, name, mode);
-}
-
#ifdef TEST
int main(int argc, char **argv)
{
- struct fastbuf *f = bopen_mm(argv[1], O_RDONLY);
- struct fastbuf *g = bopen_mm(argv[2], O_RDWR | O_CREAT | O_TRUNC);
+ struct fb_params par = { .type = FB_MMAP };
+ struct fastbuf *f = bopen_file(argv[1], O_RDONLY, &par);
+ struct fastbuf *g = bopen_file(argv[2], O_RDWR | O_CREAT | O_TRUNC, &par);
int c;
DBG("Copying");