Changeset 257

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/ChangeLog (modified) (1 diff)
• eaccelerator/branches/0.9.5/config.m4 (modified) (1 diff)
• eaccelerator/branches/0.9.5/mm.c (modified) (1 diff)

eaccelerator/branches/0.9.5/ChangeLog

@@ +1 @@
+2006-07-30  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>
+
+        * 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!
+
-2006-07-27  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>
-

eaccelerator/branches/0.9.5/config.m4

@@ -230 +230 @@
-
-  AC_MSG_CHECKING(for best shared memory type)
-
+
+
+
+
-    AC_DEFINE(MM_SHM_IPC, 1, [Define if you like to use sysvipc based shared memory])
-    msg="sysvipc"
-  elif test "$mm_shm_mmap_anon" = "yes"; then
-    AC_DEFINE(MM_SHM_MMAP_ANON, 1, [Define if you like to use anonymous mmap based shared memory])
-    msg="anonymous mmap"
-  elif test "$mm_shm_mmap_zero" = "yes"; then
-    AC_DEFINE(MM_SHM_MMAP_ZERO, 1, [Define if you like to use mmap on /dev/zero based shared memory])

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