Changeset 259

Timestamp:

07/30/06 16:56:41 (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!
* Fixed some of the detection test in the configure script that probably
never worked.

Files:

• eaccelerator/trunk/ChangeLog (modified) (1 diff)
• eaccelerator/trunk/config.m4 (modified) (17 diffs)
• eaccelerator/trunk/mm.c (modified) (5 diffs)

eaccelerator/trunk/ChangeLog

@@ -7 +7 @@
-        * Move some functions around to make more of them static, this reduces
-          the binary size and load times.
-               
-               
+        
+        
-        * Clean up the session handler, removed old code for php < 4.3. 
-
+
+
+
+
+
+
+
-2006-07-29  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>
-

eaccelerator/trunk/config.m4

@@ -11 +11 @@
-])
-
+dnl 
+dnl configure options for eAccelerator
+dnl 
-AC_ARG_WITH(eaccelerator,[],[enable_eaccelerator=$withval])
-
@@ -122 +125 @@
-
-  AC_REQUIRE_CPP()
+
+dnl
+dnl Do some tests for OS support
+dnl
-
-  AC_HAVE_HEADERS(unistd.h limits.h sys/param.h sched.h)
@@ -152 +159 @@
-
-
+dnl Test for union semun
-  AC_MSG_CHECKING(whether union semun is defined in sys/sem.h)
-  AC_TRY_COMPILE([
@@ -171 +179 @@
-  mm_shm_mmap_posix=no
-
+dnl sysvipc shared memory
-  AC_MSG_CHECKING(for sysvipc shared memory support)
-  AC_TRY_RUN([#define MM_SEM_NONE
@@ -182 +191 @@
-  EA_REMOVE_IPC_TEST()
-
+dnl mmap shared memory
-  AC_MSG_CHECKING(for mmap shared memory support)
-  AC_TRY_RUN([#define MM_SEM_NONE
@@ -192 +202 @@
-  AC_MSG_RESULT([$msg])
-
+dnl mmap zero shared memory
-  AC_MSG_CHECKING(for mmap on /dev/zero shared memory support)
-  AC_TRY_RUN([#define MM_SEM_NONE
@@ -202 +213 @@
-  AC_MSG_RESULT([$msg])
-
+dnl mmap anonymous shared memory
-  AC_MSG_CHECKING(for anonymous mmap shared memory support)
-  AC_TRY_RUN([#define MM_SEM_NONE
@@ -212 +224 @@
-  AC_MSG_RESULT([$msg])
-
+dnl posix mmap shared memory support
-  AC_MSG_CHECKING(for posix mmap shared memory support)
-  AC_TRY_RUN([#define MM_SEM_NONE
@@ -222 +235 @@
-  AC_MSG_RESULT([$msg])
-
+dnl determine the best type
-  AC_MSG_CHECKING(for best shared memory type)
-  if test "$mm_shm_ipc" = "yes"; then
@@ -243 +257 @@
-  AC_MSG_RESULT([$msg])
-  if test "$msg" = "no" ; then
-
-
-
+
+
+
+
+
+
+
-  AC_MSG_CHECKING(for spinlock semaphores support)
-  AC_TRY_RUN([#define MM_SEM_SPINLOCK
@@ -255 +273 @@
-  AC_MSG_RESULT([$msg])
-
+oldLIBS="$LIBS"
+LIBS="-lpthread"
+dnl pthread support
-  AC_MSG_CHECKING(for pthread semaphores support)
-  AC_TRY_RUN([#define MM_SEM_PTHREAD
@@ -264 +285 @@
-  AC_MSG_RESULT([$msg])
-
+dnl posix semaphore support
-  AC_MSG_CHECKING(for posix semaphores support)
-  AC_TRY_RUN([#define MM_SEM_POSIX
@@ -273 +295 @@
-  AC_MSG_RESULT([$msg])
-
+LIBS="$oldLIBS"
+dnl sysvipc semaphore support
-  AC_MSG_CHECKING(for sysvipc semaphores support)
-  AC_TRY_RUN([#define MM_SEM_IPC
@@ -283 +307 @@
-  EA_REMOVE_IPC_TEST()
-
+dnl fnctl semaphore support
-  AC_MSG_CHECKING(for fcntl semaphores support)
-  AC_TRY_RUN([#define MM_SEM_FCNTL
@@ -292 +317 @@
-  AC_MSG_RESULT([$msg])
-
+dnl flock semaphore support
-  AC_MSG_CHECKING(for flock semaphores support)
-  AC_TRY_RUN([#define MM_SEM_FLOCK
@@ -301 +327 @@
-  AC_MSG_RESULT([$msg])
-
+dnl Determine the best type
-  AC_MSG_CHECKING(for best semaphores type)
-  if test "$mm_sem_spinlock" = "yes"; then
@@ -329 +356 @@
-  AC_MSG_RESULT([$msg])
-  if test "$msg" = "no" ; then
-WARN
+ERROR
-  fi
-

eaccelerator/trunk/mm.c

@@ -194 +194 @@
-} mm_mutex;
-
-/* not used 
-static int mm_attach_lock(const char* key, mm_mutex* lock) {
-  return 1;
-}
-*/
-
-static int mm_init_lock(const char* key, mm_mutex* lock) {
-  spinlock_init(&lock->spinlock);
@@ -266 +260 @@
-#elif defined(MM_SEM_POSIX)
-
-not tested
+this one doesn't work!
-
-#define MM_SEM_TYPE "posix"
@@ -275 +269 @@
-
-static int mm_init_lock(const char* key, mm_mutex* lock) {
+  int fd;
-#ifdef SEM_NAME_LEN
-  char s[SEM_NAME_LEN];
-
-key,SEM_NAME_LEN-
-".sem.XXXXXX",
+ key, SEM_NAME_LEN - 
+ ".sem.XXXXXX", 
-#else
-  char s[MAXPATHLEN];
-
-
-
-
-
+
+
+
+
+
+
+
-  if ((lock->sem = sem_open(s, O_CREAT, S_IRUSR | S_IWUSR, 1)) == (sem_t*)SEM_FAILED) {
+    perror(s);
-    return 0;
-  }
@@ -707 +706 @@
-    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 
@@ -799 +802 @@
-  strncpy(s,key,MAXPATHLEN-1);
-  strxcat(s,".shm.XXXXXX",MAXPATHLEN);
-temp(s) == NULL
+stemp(s) == -1
-    return (MM*)-1;
-  }