Changeset 49 for trunk/xcache.c

Timestamp:

2006-05-30T04:05:58+02:00 (7 years ago)

Author:

moo

Message:

big diff yet small change: fix ran into outside of shared memory. and commit the test that figure it out.
valgrind rocks even for our code for shared memory.

File:

• trunk/xcache.c (modified) (1 diff)

trunk/xcache.c

@@ -892 +892 @@
     xc_mem_t *mem;
     int i;
-
-    xc_memsize_t memsize = shmsize / hcache->size;
+    xc_memsize_t memsize;
+
+    memsize = shmsize / hcache->size;
+
+    /* Don't let it break out of mem after ALIGNed
+     * This is important for 
+     * Simply loop until it fit our need
+     */
+    while (ALIGN(memsize) * hcache->size > shmsize && ALIGN(memsize) != memsize) {
+        if (memsize < ALIGN(1)) {
+            CHECK(NULL, "cache too small");
+        }
+        memsize --;
+    }
 
     CHECK(caches = calloc(hcache->size, sizeof(xc_cache_t *)), "caches OOM");
 
     for (i = 0; i < hcache->size; i ++) {
-        mem = xc_mem_init(ptr, memsize);
-        ptr += ALIGN(memsize);
+        CHECK(mem            = xc_mem_init(ptr, memsize), "Failed init memory allocator");
+        ptr += memsize;
         CHECK(cache          = xc_mem_calloc(mem, 1, sizeof(xc_cache_t)), "cache OOM");
         CHECK(cache->entries = xc_mem_calloc(mem, hentry->size, sizeof(xc_entry_t*)), "entries OOM");