Changeset 257 for eaccelerator/branches/0.9.5/mm.c

Timestamp:

07/30/06 13:09:59 (2 years ago)

Author:

bart

Message:

Fixed detection of SysV IPC shared memory and made anonymous mmap

the first selected type. This makes the behaviour of rc1 the
default. anonymous mmap doens't have the problem of shmmax. SysVIPC is
still available!

Files:

• eaccelerator/branches/0.9.5/mm.c (modified) (1 diff)

eaccelerator/branches/0.9.5/mm.c

@@ -707 +707 @@
-    while ((fd = shmget(IPC_PRIVATE, seg_size, (IPC_CREAT | SHM_R | SHM_W))) == -1) {
-      if (seg_size <= 1024*1024) {
+#if !defined(MM_TEST_SEM) && !defined(MM_TEST_SHM)
-        ea_debug_error("eAccelerator: shmmax should be at least 2MB");
+#endif
-        return (MM*)-1;
-      }
-      seg_size /= 2;
-    }
+#if !defined(MM_TEST_SEM) && !defined(MM_TEST_SHM)
-    ea_debug_error("eAccelerator: Could not allocate %d bytes, the maximum size the kernel allows is %d bytes. "
-            "Lower the amount of memory request or increase the limit in /proc/sys/kernel/shmmax.\n", size, seg_size);
+#endif
-
-    /* bart: Removed the code that tried to allocate more then one segment