Changeset 333 for eaccelerator/trunk/mm.c

Timestamp:

08/20/07 18:40:16 (1 year ago)

Author:

bart

Message:

Add code that checks the shared memory chunks if needed to make sure no data

was written past the boundary. Change #undef MM_CHECK in mm.c to
#define MM_CHECK

Files:

• eaccelerator/trunk/mm.c (modified) (5 diffs)

eaccelerator/trunk/mm.c

@@ -67 +67 @@
-#endif
-
+#undef MM_CHECK 
+#define MM_PATTERN  0xdeadbeef
+
-#if defined(MM_SHM_MMAP_FILE) || defined(MM_SHM_MMAP_ZERO) || defined(MM_SHM_MMAP_ANON) || defined(MM_SHM_MMAP_POSIX) || defined(HAVE_MPROTECT)
-#  include <sys/mman.h>
@@ -1066 +1069 @@
-    mm_mem_head* x = NULL;
-    size_t realsize = (size_t)MM_ALIGN(MM_SIZE(size));
+#if MM_CHECK
+    realsize += (size_t)MM_ALIGN(sizeof(int));
+#endif
-    if (realsize <= mm->available) {
-      /* Search for free bucket */
@@ -1084 +1090 @@
-          break;
-        } else if (p->size > realsize && (best == NULL || best->size > p->size)) {
-grat
+bigg
-          best = p;
-          best_prev = q;
@@ -1119 +1125 @@
-    }
-    if (x != NULL) {
+#ifdef MM_CHECK
+      *(int *)((char *)x + realsize - (size_t)MM_ALIGN(sizeof(int))) = MM_PATTERN;
+#endif
-      return HEAD_TO_PTR(x);
-    }
@@ -1319 +1328 @@
-}
-
+#if defined(MM_CHECK) && !(defined(MM_TEST_SHM) || defined(MM_TEST_SEM))
+void mm_check_mem(void *x) {
+  mm_mem_head *p = PTR_TO_HEAD(x);
+  if (*((unsigned int *)((char *)p + p->size - (size_t)MM_ALIGN(sizeof(int)))) != MM_PATTERN) {
+    ea_debug_error("[EACCELERATOR] Corrupted memory detected\n");
+  }
+}
+#else
+void mm_check_mem(void *x) {}
+#endif
+
-#ifdef MM_TEST_SHM
-int main() {