Changeset 134

Timestamp:

11/20/05 18:53:43 (3 years ago)

Author:

zoeloelip

Message:

* Removed executor hooks, they weren't used anyway.
* Check if eA has a valid cache directory.
* Make the init of php fail if the initialisation of the shared memory

or cache directory failes.

* set shared memory size in eaccelerator.ini to 0 so the default OS

size is used.

Files:

• eaccelerator/trunk/ChangeLog (modified) (1 diff)
• eaccelerator/trunk/Makefile.in (modified) (1 diff)
• eaccelerator/trunk/config.m4 (modified) (2 diffs)
• eaccelerator/trunk/eaccelerator.c (modified) (7 diffs)
• eaccelerator/trunk/eaccelerator.ini (modified) (1 diff)

eaccelerator/trunk/ChangeLog

@@ +1 @@
+2005-11-20 Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>
+
+        * Removed executor hooks, they weren't used anyway.
+        * Check if eA has a valid cache directory.
+        * Make the init of php fail if the initialisation of the shared memory
+          or cache directory failes.
+        * set shared memory size in eaccelerator.ini to 0 so the default OS
+          size is used.
+
-2005-11-17 Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>
-

eaccelerator/trunk/Makefile.in

@@ -1 +1 @@
-LTLIBRARY_NAME        = libeaccelerator.la
-xecute.c e
+
-LTLIBRARY_SHARED_NAME = eaccelerator.la
-

eaccelerator/trunk/config.m4

@@ -79 +79 @@
-])
-
-AC_ARG_WITH(eaccelerator-executor,
-[  --with-eaccelerator-executor            Include optimized executor (not implemented yet)],[
-  eaccelerator_executor=$withval
-],[
-  eaccelerator_executor=no
-])
-
-AC_ARG_WITH(eaccelerator-use-inode,
-[  --without-eaccelerator-use-inode            Don't use inodes to determine hash keys (never used on win32)],[
@@ -131 +124 @@
-  if test "$eaccelerator_disassembler" = "yes"; then
-    AC_DEFINE(WITH_EACCELERATOR_DISASSEMBLER, 1, [Define if you like to explore Zend bytecode])
-  fi
-  if test "$eaccelerator_executor" = "yes"; then
-    AC_DEFINE(WITH_EACCELERATOR_EXECUTOR, 1, [Define if you like use optimized executor (not implemented yet)])
-  fi
-  if test "$eaccelerator_inode" = "yes"; then

eaccelerator/trunk/eaccelerator.c

@@ -111 +111 @@
-static zend_op_array *(*mm_saved_zend_compile_file)(zend_file_handle *file_handle, int type TSRMLS_DC);
-
-#if defined(DEBUG) || defined(WITH_EACCELERATOR_EXECUTOR)
-static void (*mm_saved_zend_execute)(zend_op_array *op_array TSRMLS_DC);
-#endif
-
-/* external declarations */
-PHPAPI void php_stripslashes(char *str, int *len TSRMLS_DC);
@@ -253 +249 @@
-}
-
+/* check the cache dir */
+static int check_cache_dir(char *cache_dir) {
+  struct stat buf;
+  int uid = 0;
+  int gid = 0;
+
+  if (stat(cache_dir, &buf) == -1) {
+    ea_debug_error("Cache dir does not exist (could not stat %s)\n", cache_dir);
+    return 0;
+  }
+  if (!(buf.st_mode & S_IFDIR)) {
+    ea_debug_error("%s is not a directory!\n", cache_dir);
+    return 0;
+  }
+#if 0
+  uid = getuid();
+  gid = getgid();
+  if (!((buf.st_uid == uid && (buf.st_mode & (S_IRUSR | S_IWUSR))) /* not root, owner and rw */
+        || (buf.st_gid == gid && (buf.st_mode & (S_IRGRP | S_IWGRP))) /* not root, group and rw */
+        || (buf.st_mode & (S_IROTH & S_IWOTH)))) { /* other and rw */
+    ea_debug_error("%s hasn't got the right permissions!\n", cache_dir);
+    return 0;
+  }
+#endif
+  return 1;
+}
+
-/* Initialise the shared memory */
-static int init_mm(TSRMLS_D) {
@@ -304 +327 @@
-  eaccelerator_mm_instance->last_prune = time(0);
-  EACCELERATOR_PROTECT();
+
+  if (!check_cache_dir(EAG(cache_dir))) {
+    return FAILURE;
+  }
+  
-  return SUCCESS;
-}
@@ -1542 +1570 @@
-  EAG(self_time)[EAG(profile_level)] = 0;
-  EAG(profile_level)++;
-#ifdef WITH_EACCELERATOR_EXECUTOR
-  eaccelerator_execute(op_array TSRMLS_CC);
-#else
-  mm_saved_zend_execute(op_array TSRMLS_CC);
-#endif
-  usec = ea_debug_elapsed_time(&tv_start);
-  EAG(profile_level)--;
@@ -2000 +2024 @@
-    if (init_mm(TSRMLS_C) == FAILURE) {
-      zend_error(E_CORE_WARNING,"[%s] Can not create shared memory area", EACCELERATOR_EXTENSION_NAME);
+      return FAILURE;
-    }
-
@@ -2010 +2035 @@
-#else
-    zend_compile_file = eaccelerator_compile_file;
-#ifdef WITH_EACCELERATOR_EXECUTOR
-    mm_saved_zend_execute = zend_execute;
-    zend_execute = eaccelerator_execute;
-#endif
-#endif
-  }
@@ -2039 +2060 @@
-  }
-  zend_compile_file = mm_saved_zend_compile_file;
-#if defined(DEBUG) || defined(WITH_EACCELERATOR_EXECUTOR)
-  zend_execute = mm_saved_zend_execute;
-#endif
-#ifdef WITH_EACCELERATOR_CONTENT_CACHING
-  eaccelerator_content_cache_shutdown();

eaccelerator/trunk/eaccelerator.ini

@@ -22 +22 @@
-; The amount of shared memory (in megabytes) that eAccelerator will use.
-; "0" means OS default. Default value is "0".
-64
+0
-
-; The directory that is used for disk cache. eAccelerator stores precompiled