Changeset 73

Timestamp:

05/05/05 10:53:05 (3 years ago)

Author:

zoeloelip

Message:

This patch fixes some stuff concerning configuration. With this patch some parts that are forgotten with the
code split are fixed. They are also needed to compile eA with VC.
The other stuff make it possible to compile eA as a static module for php.

Files:

• eaccelerator/trunk/config.m4 (modified) (13 diffs)
• eaccelerator/trunk/eaccelerator.c (modified) (4 diffs)
• eaccelerator/trunk/eaccelerator.h (modified) (6 diffs)
• eaccelerator/trunk/mm.c (modified) (2 diffs)
• eaccelerator/trunk/webui.c (modified) (2 diffs)

eaccelerator/trunk/config.m4

@@ +1 @@
+AC_DEFUN([EA_REMOVE_IPC_TEST], [
+  # for cygwin ipc error
+  if test -f conftest* ; then
+    echo $ECHO_N "Wait for conftest* to exit$ECHO_C"
+    while ! rm -f conftest* 2>/dev/null ; do
+      echo $ECHO_N ".$ECHO_C"
+      sleep 1
+    done
+    echo
+  fi
+])
+
-AC_ARG_WITH(eaccelerator,[],[enable_eaccelerator=$withval])
-
@@ -148 +160 @@
-#define MM_SHM_IPC
-#define MM_TEST_SHM
-
+$ext_srcdir/
-],dnl
-    mm_shm_ipc=yes
-    msg=yes,msg=no,msg=no)
-  AC_MSG_RESULT([$msg])
+  EA_REMOVE_IPC_TEST()
-
-  AC_MSG_CHECKING(for mmap shared memory support)
@@ -158 +171 @@
-#define MM_SHM_MMAP_FILE
-#define MM_TEST_SHM
-
+$ext_srcdir/
-],dnl
-    mm_shm_mmap_file=yes
@@ -168 +181 @@
-#define MM_SHM_MMAP_ZERO
-#define MM_TEST_SHM
-
+$ext_srcdir/
-],dnl
-    mm_shm_mmap_zero=yes
@@ -178 +191 @@
-#define MM_SHM_MMAP_ANON
-#define MM_TEST_SHM
-
+$ext_srcdir/
-],dnl
-    mm_shm_mmap_anon=yes
@@ -188 +201 @@
-#define MM_SHM_MMAP_POSIX
-#define MM_TEST_SHM
-
+$ext_srcdir/
-],dnl
-    mm_shm_mmap_posix=yes
@@ -210 +223 @@
-    AC_DEFINE(MM_SHM_MMAP_FILE, 1, [Define if you like to use mmap on temporary file shared memory])
-    msg="mmap"
-
-
+
+
+
+
+
+
+
-
-  AC_MSG_CHECKING(for spinlock semaphores support)
-  AC_TRY_RUN([#define MM_SEM_SPINLOCK
-#define MM_TEST_SEM
-
+$ext_srcdir/
-],dnl
-    mm_sem_spinlock=yes
@@ -225 +243 @@
-  AC_TRY_RUN([#define MM_SEM_PTHREAD
-#define MM_TEST_SEM
-
+$ext_srcdir/
-],dnl
-    mm_sem_pthread=yes
@@ -234 +252 @@
-  AC_TRY_RUN([#define MM_SEM_POSIX
-#define MM_TEST_SEM
-
+$ext_srcdir/
-],dnl
-    mm_sem_posix=yes
@@ -243 +261 @@
-  AC_TRY_RUN([#define MM_SEM_IPC
-#define MM_TEST_SEM
-
+$ext_srcdir/
-],dnl
-    mm_sem_ipc=yes
-    msg=yes,msg=no,msg=no)
-  AC_MSG_RESULT([$msg])
+  EA_REMOVE_IPC_TEST()
-
-  AC_MSG_CHECKING(for fcntl semaphores support)
-  AC_TRY_RUN([#define MM_SEM_FCNTL
-#define MM_TEST_SEM
-
+$ext_srcdir/
-],dnl
-    mm_sem_fcntl=yes
@@ -261 +280 @@
-  AC_TRY_RUN([#define MM_SEM_FLOCK
-#define MM_TEST_SEM
-
+$ext_srcdir/
-],dnl
-    mm_sem_flock=yes
@@ -286 +305 @@
-    AC_DEFINE(MM_SEM_POSIX, 1, [Define if you like to use posix based semaphores])
-    msg="posix"
-
-
+
+
+
+
+
+
+
-
-  AC_CHECK_FUNC(sched_yield,[
@@ -298 +322 @@
-
-  old_cppflags="$CPPFLAGS"
-
+ -I$abs_srcdir
-  AC_MSG_CHECKING(for ext/session/php_session.h)
-  AC_TRY_CPP([#include "ext/session/php_session.h"],msg="yes",msg="no")

eaccelerator/trunk/eaccelerator.c

@@ -70 +70 @@
-*/
-
-#ifdef ZEND_WIN32
-#  include <process.h>
-#  ifndef S_ISREG
-#    define S_ISREG(mode) (((mode)&S_IFMT) & S_IFREG)
-#  endif
-#  ifndef S_IRUSR
-#    define S_IRUSR S_IREAD
-#  endif
-#  ifndef S_IWUSR
-#    define S_IWUSR S_IWRITE
-#  endif
-#else
-#  include <dirent.h>
-#endif
-
-#include "php.h"
-#include "php_ini.h"
@@ -120 +105 @@
-static int eaccelerator_is_extension      = 0;
-static zend_extension* ZendOptimizer = NULL;
-#ifdef ZTS
-static MUTEX_T mm_mutex;
-#endif
-
-static HashTable eaccelerator_global_function_table;
@@ -142 +124 @@
-/* external declarations */
-PHPAPI void php_stripslashes(char *str, int *len TSRMLS_DC);
-PHPAPI char *php_get_uname();
-
-ZEND_DLEXPORT zend_op_array* eaccelerator_compile_file(zend_file_handle *file_handle, int type TSRMLS_DC);
@@ -950 +931 @@
-  return ret;
-}
-
-typedef union align_union {
-  double d;
-  void *v;
-  int (*func)(int);
-  long l;
-} align_union;
-
-#if (defined (__GNUC__) && __GNUC__ >= 2)
-#define EACCELERATOR_PLATFORM_ALIGNMENT (__alignof__ (align_test))
-#else
-#define EACCELERATOR_PLATFORM_ALIGNMENT (sizeof(align_union))
-#endif
-
-#define EACCELERATOR_ALIGN(n) (n) = (void*)((((size_t)(n)-1) & ~(EACCELERATOR_PLATFORM_ALIGNMENT-1)) + EACCELERATOR_PLATFORM_ALIGNMENT)
-
-/******************************************************************************/

eaccelerator/trunk/eaccelerator.h

@@ -45 +45 @@
-#endif
-
-ndef ZEND_WIN32
+ !defined(ZEND_WIN32) && defined(HAVE_CONFIG_H)
-#  if ZEND_MODULE_API_NO >= 20001222
-#    include "config.h"
@@ -51 +51 @@
-#    include "php_config.h"
-#  endif
+#endif
+
+/* needed to compile eA as a static php module */
+extern zend_module_entry eaccelerator_module_entry;
+#define phpext_eaccelerator_ptr &eaccelerator_module_entry
+
+/* fixes compile errors on php5.1 */
+#ifdef STR_EMPTY_ALLOC
+#define empty_string STR_EMPTY_ALLOC()
-#endif
-
@@ -89 +98 @@
-#  ifndef ZEND_WIN32
-#    ifdef HAVE_FLOCK
+#          include <sys/file.h>
-#      define EACCELERATOR_FLOCK(FILE,OP) flock((FILE),(OP))
-#    else
@@ -119 +129 @@
-#endif
-
+#ifdef ZEND_WIN32
+#  include <process.h>
+#  ifndef S_ISREG
+#    define S_ISREG(mode) (((mode)&S_IFMT) & S_IFREG)
+#  endif
+#  ifndef S_IRUSR
+#    define S_IRUSR S_IREAD
+#  endif
+#  ifndef S_IWUSR
+#    define S_IWUSR S_IWRITE
+#  endif
+#else
+#  include <dirent.h>
+#endif
+
-#ifdef ZTS
-#  define ZTS_LOCK()    tsrm_mutex_lock(mm_mutex)
@@ -164 +189 @@
-#define MAX_DUP_STR_LEN 256
-
-
+
+
+
-
-#define EACCELERATOR_EXTENSION_NAME "eAccelerator"
@@ -377 +404 @@
-} mm_cond_entry;
-
+typedef union align_union {
+  double d;
+  void *v;
+  int (*func)(int);
+  long l;
+} align_union;
+
-/******************************************************************************/
+
+#ifdef ZTS
+MUTEX_T mm_mutex;
+#endif
-
-void format_size (char *s, unsigned int size, int legend);

eaccelerator/trunk/mm.c

@@ -1 +1 @@
-/* libmm replacement */
-
-
+
+
-#  include "config.h"
+# endif
+# include "php.h"
-#endif
-
@@ -580 +583 @@
-
-#define MM_SHM_TYPE "sysvipc"
+
+#ifndef SHM_R
+# define SHM_R 0444 /* read permission */
+#endif
+#ifndef SHM_W
+# define SHM_W 0222 /* write permission */
+#endif
-
-static MM* mm_create_shm(const char* key, size_t size) {

eaccelerator/trunk/webui.c

@@ -61 +61 @@
-
-extern eaccelerator_mm *eaccelerator_mm_instance;
+PHPAPI char *php_get_uname();
-
-/******************************************************************************/
@@ -283 +284 @@
-};
-
-
+const 
-{
-        return color_list[num % (sizeof (color_list) / sizeof (char *))];