Merge with git+ssh://git.ucw.cz/projects/sherlock/GIT/sherlock.git

[libucw.git] / lib / qache.c

diff --git a/lib/qache.c b/lib/qache.c
index a973be458a5d88f15fd6177bdfb14efdedc95eba..eeea2b6b01d7ad121cef2ebbdfbe5317e87c6f38 100644 (file)
--- a/lib/qache.c
+++ b/lib/qache.c
@@ -7,14 +7,16 @@
 #undef LOCAL_DEBUG
 
 #include "lib/lib.h"
 #undef LOCAL_DEBUG
 
 #include "lib/lib.h"

+#include "lib/bitops.h"

 #include "lib/fastbuf.h"
 #include "lib/fastbuf.h"

+#include "lib/ff-binary.h"

 #include "lib/qache.h"
 
 #include "lib/qache.h"
 

-#include <stdlib.h>
+#include <stdio.h>

 #include <unistd.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <fcntl.h>

+#include <sys/stat.h>

 #include <sys/mman.h>
 #include <sys/mman.h>

-#include <sys/user.h>

 
 /*
  *  The cache lives in a mmapped file of the following format:
 
 /*
  *  The cache lives in a mmapped file of the following format:


@@ -80,9 +82,9 @@ qache_msync(struct qache *q UNUSED, uns start UNUSED, uns len UNUSED)
 {
 #ifndef CONFIG_LINUX
   /* We don't need msyncing on Linux, since the mappings are guaranteed to be coherent */
 {
 #ifndef CONFIG_LINUX
   /* We don't need msyncing on Linux, since the mappings are guaranteed to be coherent */

-  len += (start % PAGE_SIZE);
-  start -= start % PAGE_SIZE;
-  len = ALIGN(len, PAGE_SIZE);
+  len += (start % CPU_PAGE_SIZE);
+  start -= start % CPU_PAGE_SIZE;
+  len = ALIGN_TO(len, CPU_PAGE_SIZE);

   if (msync(q->mmap_data + start, len, MS_ASYNC | MS_INVALIDATE) < 0)
     log(L_ERROR, "Cache %s: msync failed: %m", q->file_name);
 #endif
   if (msync(q->mmap_data + start, len, MS_ASYNC | MS_INVALIDATE) < 0)
     log(L_ERROR, "Cache %s: msync failed: %m", q->file_name);
 #endif


@@ -313,7 +315,7 @@ qache_create(struct qache *q, struct qache_params *par)
   bzero(&h, sizeof(h));
   h.magic = QACHE_MAGIC;
   h.block_size = par->block_size;
   bzero(&h, sizeof(h));
   h.magic = QACHE_MAGIC;
   h.block_size = par->block_size;

-  h.block_shift = fls(h.block_size);
+  h.block_shift = bit_fls(h.block_size);

   h.num_blocks = par->cache_size >> h.block_shift;
   h.format_id = par->format_id;
   h.entry_table_start = sizeof(h);
   h.num_blocks = par->cache_size >> h.block_shift;
   h.format_id = par->format_id;
   h.entry_table_start = sizeof(h);


@@ -383,7 +385,7 @@ qache_open(struct qache_params *par)
   q->file_name = xstrdup(par->file_name);
 
   ASSERT(par->block_size >= 8 && !(par->block_size & (par->block_size-1)));
   q->file_name = xstrdup(par->file_name);
 
   ASSERT(par->block_size >= 8 && !(par->block_size & (par->block_size-1)));

-  par->cache_size = ALIGN(par->cache_size, par->block_size);
+  par->cache_size = ALIGN_TO(par->cache_size, par->block_size);

 
   if (par->force_reset <= 0 && qache_open_existing(q, par))
     ;
 
   if (par->force_reset <= 0 && qache_open_existing(q, par))
     ;