X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Ffb-mmap.c;h=41e65832653c8c16180920d78172bc6221428e63;hb=4adf195fb2f36dfbd054745469fa1c580de2f61b;hp=bbd3a11eacc6e1017bed271b867f933160feefa9;hpb=f185581ca3237ec1c37bc4ad92aab4c3ce8e7236;p=libucw.git

diff --git a/lib/fb-mmap.c b/lib/fb-mmap.c
index bbd3a11e..41e65832 100644
--- a/lib/fb-mmap.c
+++ b/lib/fb-mmap.c
@@ -1,5 +1,5 @@
 /*
- *	Sherlock Library -- Fast Buffered I/O on Memory-Mapped Files
+ *	UCW Library -- Fast Buffered I/O on Memory-Mapped Files
  *
  *	(c) 2002 Martin Mares <mj@ucw.cz>
  *
@@ -12,26 +12,25 @@
 #include "lib/lfs.h"
 #include "lib/conf.h"
 
-#include <stdlib.h>
 #include <string.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 {
@@ -49,10 +48,10 @@ static void
 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);
+  uns oll = ALIGN_TO(f->bufend - f->buffer, 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);
@@ -68,7 +67,7 @@ bfmm_map_window(struct fastbuf *f)
   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;
@@ -109,7 +108,7 @@ bfmm_spout(struct fastbuf *f)
   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);
     }
@@ -118,7 +117,7 @@ bfmm_spout(struct fastbuf *f)
   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)
@@ -129,6 +128,7 @@ bfmm_seek(struct fastbuf *f, sh_off_t pos, int whence)
   f->pos = pos;
   f->bptr = f->bstop = f->bufend;	/* 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
@@ -137,7 +137,7 @@ bfmm_close(struct fastbuf *f)
   struct fb_mmap *F = FB_MMAP(f);
 
   if (f->buffer)
-    munmap(f->buffer, ALIGN(f->bufend-f->buffer, PAGE_SIZE));
+    munmap(f->buffer, ALIGN_TO(f->bufend-f->buffer, CPU_PAGE_SIZE));
   if (F->file_extend > F->file_size &&
       sh_ftruncate(F->fd, F->file_size))
     die("ftruncate(%s): %m", f->name);
@@ -160,8 +160,6 @@ bfmm_config(struct fastbuf *f, uns item, int value)
     case BCONFIG_IS_TEMP_FILE:
       FB_MMAP(f)->is_temp_file = value;
       return 0;
-    case BCONFIG_CAN_OVERWRITE:
-      return 0;				/* cannot use 1, because the pages would become dirty */
     default:
       return -1;
     }