Changeset 330 for eaccelerator/trunk

Timestamp:

08/20/07 15:15:06 (1 year ago)

Author:

hans

Message:

* Changed crash handler error message format to Apache-style error log format as suggested in ticket #217
* Fixed ticket #274
* Performance: eliminated a bunch of time() syscalls
* Performance: eliminated calls to eaccelerator_gc when not build with either session, shm or user cache functionality (which are all off by default)
* Disable eaccelerator_list_keys function when not build with either session, shm or user cache functionality (which are all off by default)
* Disable 'User Cache' tab in control panel when not build with either session, shm or user cache functionality (which are all off by default)

Files:

• eaccelerator/trunk/ChangeLog (modified) (2 diffs)
• eaccelerator/trunk/cache.c (modified) (9 diffs)
• eaccelerator/trunk/cache.h (modified) (1 diff)
• eaccelerator/trunk/control.php (modified) (1 diff)
• eaccelerator/trunk/ea_info.c (modified) (2 diffs)
• eaccelerator/trunk/ea_info.h (modified) (1 diff)
• eaccelerator/trunk/eaccelerator.c (modified) (21 diffs)
• eaccelerator/trunk/eaccelerator.h (modified) (2 diffs)

eaccelerator/trunk/ChangeLog

@@ +1 @@
+2007-08-20  Hans Rakers <hans at react.nl>
+        * Changed crash handler error message format to Apache-style error log
+          format as suggested in ticket #217
+        * Fixed ticket #274
+        * Performance: eliminated a bunch of time() syscalls
+        * Performance: eliminated calls to eaccelerator_gc when not build with
+          either session, shm or user cache functionality (which are all off
+          by default)
+        * Disable eaccelerator_list_keys function when not build with either
+          session, shm or user cache functionality (which are all off by
+          default)
+        * Disable 'User Cache' tab in control panel when not build with either
+          session, shm or user cache functionality (which are all off by
+          default)
+
-2007-08-20  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>
-        * Rewrite the calc_* values so it no longer uses the EAG(mem) global.
@@ -12 +27 @@
-
-        * Optimizer fix for #242. PHP-5.2.1 introduces a ZEND_JMP before a
-       
-       
+    
+    
-
-2007-05-09  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>

eaccelerator/trunk/cache.c

@@ -249 +249 @@
-        memcpy(q->key, xkey, xlen + 1);
-        memcpy(&q->value, val, sizeof(zval));
-time(0
-time(0
+EAG(req_start
+EAG(req_start
-        /* set the refcount to 1 */
-        q->value.refcount = 1;
@@ -342 +342 @@
-            if ((p->hv == hv) && (strcmp(p->key, xkey) == 0)) {
-                x = p;
-time(0
+EAG(req_start
-                    if (q == NULL) {
-                        eaccelerator_mm_instance->user_hash[slot] = p->next;
@@ -374 +374 @@
-    if ((where == ea_shm_and_disk || where == ea_shm || where == ea_disk_only) && 
-            eaccelerator_md5(s, "/eaccelerator-user-", xkey TSRMLS_CC)) {
-        time_t t = time(0);
-        int use_shm = 1;
-        int ret = 0;
@@ -391 +390 @@
-                return 0;
-            }
-t
+EAG(req_start)
-                /*
-                 * try to put it into shared memory 
@@ -549 +548 @@
-    return 1;
-}
-#endif
-
-/* do garbage collection on the keys */
@@ -556 +554 @@
-    size_t size = 0;
-    unsigned int i;
-time(0
+EAG(req_start
-
-    if (eaccelerator_mm_instance == NULL) {
@@ -590 +588 @@
-    char *xkey = "";
-    ea_user_cache_entry *p;
-    time_t t = time(0);
-
-    // create key prefix for current host / namespace
@@ -623 +620 @@
-                
-                if (p->ttl) {
-t
+EAG(req_start)
-                        add_assoc_long(list, "ttl", p->ttl); // ttl
-                    } else {
@@ -646 +643 @@
-#endif /* WITH_EACCELERATOR_INFO */
-
+#endif /* WITH_EACCELERATOR_CONTENT_CACHING) || WITH_EACCELERATOR_SESSIONS || WITH_EACCELERATOR_SHM */
+
-#endif /* HAVE_EACCELERATOR */
-

eaccelerator/trunk/cache.h

@@ -39 +39 @@
-int eaccelerator_get (const char *key, int key_len, zval * return_value, ea_cache_place where TSRMLS_DC);
-int eaccelerator_rm (const char *key, int key_len, ea_cache_place where TSRMLS_DC);
+size_t eaccelerator_gc (TSRMLS_D);
-#endif
-size_t eaccelerator_gc (TSRMLS_D);
-
-
-
+
-int eaccelerator_list_keys(zval *return_value TSRMLS_DC);
-#endif

eaccelerator/trunk/control.php

@@ -273 +273 @@
-<div class="head2">
-<?php
-
+
+
+
+
+
+
+
+
+
+
-foreach ($items as $i => $item) {
-    echo '<span class="menuitem'.(($sec == $i)?'_sel':'').'" onmouseover="menusel(this)" onmouseout="menusel(this)" onclick="gosec('.$i.')">'.(($sec != $i)?'<a href="'.$_SERVER['PHP_SELF'].'?sec='.$i.'">'.$item.'</a>':$item).'</span>';

eaccelerator/trunk/ea_info.c

@@ -502 +502 @@
-/* }}} */
-
+#if defined (WITH_EACCELERATOR_CONTENT_CACHING) || defined(WITH_EACCELERATOR_SESSIONS) || defined(WITH_EACCELERATOR_SHM)
-/* {{{ PHP_FUNCTION(eaccelerator_list_keys): returns list of keys in shared memory that matches actual hostname or namespace */
-PHP_FUNCTION(eaccelerator_list_keys)
@@ -512 +513 @@
-}
-/* }}} */
-
-#endif
+
+#endif  /* WITH_EACCELERATOR_INFO */
-
-/*

eaccelerator/trunk/ea_info.h

@@ -41 +41 @@
-PHP_FUNCTION(eaccelerator_cached_scripts);
-PHP_FUNCTION(eaccelerator_removed_scripts);
+#if defined (WITH_EACCELERATOR_CONTENT_CACHING) || defined(WITH_EACCELERATOR_SESSIONS) || defined(WITH_EACCELERATOR_SHM)
-PHP_FUNCTION(eaccelerator_list_keys);
+#endif
-
-#endif

eaccelerator/trunk/eaccelerator.c

@@ -290 +290 @@
-  eaccelerator_mm_instance->locks = NULL;
-  eaccelerator_mm_instance->user_hash_cnt = 0;
-0);
+NULL);   /* this time() call is harmless since this is init phase */
-  EACCELERATOR_PROTECT();
-  return SUCCESS;
@@ -463 +463 @@
-}
-
-
+memory 
-void eaccelerator_prune(time_t t) {
-  unsigned int i;
@@ -496 +496 @@
-void* eaccelerator_malloc2(size_t size TSRMLS_DC) {
-  void *p = NULL;
-
-
+
+
-  if (eaccelerator_gc(TSRMLS_C) > 0) {
-    p = eaccelerator_malloc(size);
@@ -504 +504 @@
-    }
-  }
+#endif
-  if (ea_shm_prune_period > 0) {
-
-
-
+
+
-      p = eaccelerator_malloc(size);
-    }
@@ -740 +740 @@
-      p->removed  = 0;
-      if (ea_shm_ttl > 0) {
-time(0
+EAG(req_start
-      } else {
-        p->ttl = 0;
@@ -809 +809 @@
-    return 0;
-  }
-
+
-  DBG(ea_debug_pad, (EA_DEBUG TSRMLS_CC));
-  DBG(ea_debug_printf, (EA_DEBUG, "[%d] eaccelerator_store:  returned %d, mm=%x\n", getpid(), size, eaccelerator_mm_instance->mm));
@@ -836 +836 @@
-    if (use_shm) {
-      if (ea_shm_ttl > 0) {
-time(0
+EAG(req_start
-      } else {
-        p->ttl = 0;
@@ -1125 +1125 @@
-#endif
-
-  compile_time = time(0);
-  stat_result = eaccelerator_stat(file_handle, realname, &buf TSRMLS_CC);
-  if (buf.st_mtime >= compile_time && eaccelerator_debug > 0) {
-        ea_debug_log("EACCELERATOR: Warning: \"%s\" is cached but it's mtime is in the future.\n", file_handle->filename);
-  }
-
-  ok_to_cache = ea_match(EAG(pattern_list), file_handle->filename);
-
+
-  // eAccelerator isn't working, so just compile the file
-  if (!EAG(enabled) || (eaccelerator_mm_instance == NULL) || 
@@ -1153 +1149 @@
-  }
-
+  compile_time = EAG(req_start);
+  if (buf.st_mtime >= compile_time && eaccelerator_debug > 0) {
+        ea_debug_log("EACCELERATOR: Warning: \"%s\" is cached but it's mtime is in the future.\n", file_handle->filename);
+  }
+
-  t = eaccelerator_restore(realname, &buf, &nreloads, compile_time TSRMLS_CC);
-
@@ -1178 +1179 @@
-    if (file_handle->opened_path == NULL && file_handle->type != ZEND_HANDLE_STREAM) {
-      file_handle->handle.stream.handle = (void*)1;
-
+
+
-#else
-    if (file_handle->opened_path == NULL && file_handle->type != ZEND_HANDLE_FP) {
-      int dummy = 1;
-
+     /* EAG(mem) = p->realfilename from eaccelerator_restore here */
-      zend_hash_add(&EG(included_files), file_handle->opened_path, strlen(file_handle->opened_path)+1, (void *)&dummy, sizeof(int), NULL);
-      file_handle->handle.fp = NULL;
-
-
+
+
+
-    DBG(ea_debug_printf, (EA_TEST_PERFORMANCE, "\t[%d] compile_file: restored (%ld)\n", getpid(), ea_debug_elapsed_time(&tv_start)));
-    DBG(ea_debug_printf, (EA_DEBUG, "\t[%d] compile_file: restored\n", getpid()));
@@ -1193 +1196 @@
-#endif
-    DBG(ea_debug_printf, (EA_DEBUG, "[%d] Leave COMPILE\n", getpid()));
+
-    return t;
+
-  } else { // not in cache or must be recompiled
-                Bucket *function_table_tail;
@@ -1267 +1272 @@
-    if (t != NULL && file_handle->opened_path != NULL && (eaccelerator_check_mtime ||
-         ((stat(file_handle->opened_path, &buf) == 0) && S_ISREG(buf.st_mode)))) {
+
-      DBG(ea_debug_printf, (EA_TEST_PERFORMANCE, "\t[%d] compile_file: storing in cache (%ld)\n", getpid(), ea_debug_elapsed_time(&tv_start)));
-      DBG(ea_debug_printf, (EA_DEBUG, "\t[%d] compile_file: storing in cache\n", getpid()));
-      function_table_tail = function_table_tail ? function_table_tail->pListNext : CG(function_table)->pListHead;
-      class_table_tail = class_table_tail ? class_table_tail->pListNext : CG(class_table)->pListHead;
+
-      if (eaccelerator_store(file_handle->opened_path, &buf, nreloads, t, function_table_tail, class_table_tail TSRMLS_CC)) {
-#ifdef DEBUG
@@ -1647 +1654 @@
-#ifdef WITH_EACCELERATOR_CRASH_DETECTION
-static void eaccelerator_crash_handler(int dummy) {
+  struct tm *loctime;
+
-  TSRMLS_FETCH();
-  fflush(stdout);
@@ -1686 +1695 @@
-#endif
-  eaccelerator_clean_request(TSRMLS_C);
+
+  loctime = localtime(&EAG(req_start));
+
-  if (EG(active_op_array)) {
-
+
+
-      getpid(),
-      (long)(active_opline-EG(active_op_array)->opcodes),
@@ -1694 +1707 @@
-      zend_get_executed_lineno(TSRMLS_C));
-  } else {
-d] EACCELERATOR: PHP crashed\n\n",
+s] [notice] EACCELERATOR(%d): PHP crashed\n\n", asctime(loctime), 
-  }
-#if !defined(WIN32) && !defined(NETWARE)
@@ -1717 +1730 @@
-        eag->eaccelerator_log_file = '\000';
-        eag->name_space = '\000';
+#if defined(WITH_EACCELERATOR_CONTENT_CACHING) || defined(WITH_EACCELERATOR_SESSIONS) || defined(WITH_EACCELERATOR_SHM)
-        eag->hostname[0] = '\000';
+#endif
-        eag->in_request = 0;
-        eag->allowed_admin_path= NULL;
@@ -1885 +1900 @@
-PHP_RINIT_FUNCTION(eaccelerator)
-{
+#if defined(WITH_EACCELERATOR_CONTENT_CACHING) || defined(WITH_EACCELERATOR_SESSIONS) || defined(WITH_EACCELERATOR_SHM)
-  union {
-                zval **v;
-    void *ptr;
-  } server_vars, hostname;
+#endif
-
-        if (eaccelerator_mm_instance == NULL) {
@@ -1903 +1920 @@
-        EAG(compress_content) = 1;
-        EAG(content_headers) = NULL;
-
+
+
+
-        /* Storing Host Name */
-        EAG(hostname)[0] = '\000';
@@ -1917 +1936 @@
-                }
-  }
+#endif
-
-        zend_hash_init(&EAG(restored), 0, NULL, NULL, 0);
-
-        DBG(ea_debug_printf, (EA_DEBUG, "[%d] Leave RINIT\n",getpid()));
-#ifdef DEBUG
-        EAG(xpad) = 0;
@@ -1943 +1962 @@
-#endif
-#endif
+
+        DBG(ea_debug_printf, (EA_DEBUG, "[%d] Leave RINIT\n",getpid()));
+        
-        return SUCCESS;
-}
@@ -2024 +2046 @@
-  PHP_FE(eaccelerator_cached_scripts, NULL)
-  PHP_FE(eaccelerator_removed_scripts, NULL)
+#  if defined(WITH_EACCELERATOR_CONTENT_CACHING) || defined(WITH_EACCELERATOR_SESSIONS) || defined(WITH_EACCELERATOR_SHM)
-  PHP_FE(eaccelerator_list_keys, NULL)
+#  endif
-#endif
-#ifdef WITH_EACCELERATOR_CONTENT_CACHING

eaccelerator/trunk/eaccelerator.h

@@ -439 +439 @@
- */
-ZEND_BEGIN_MODULE_GLOBALS (eaccelerator)
-       
-                       
+
+
-zend_bool enabled;
-zend_bool optimizer_enabled;
@@ -455 +455 @@
-char *mem;
-char *allowed_admin_path;
+time_t req_start;                       /* time of request start (set in RINIT) */
-HashTable strings;
-HashTable restored;
-zend_class_entry *class_entry;
-zend_uint refcount_helper;
+#if defined(WITH_EACCELERATOR_CONTENT_CACHING) || defined(WITH_EACCELERATOR_SESSIONS) || defined(WITH_EACCELERATOR_SHM)
-char hostname[32];
+#endif
-struct ea_pattern_t *pattern_list;
-#ifdef WITH_EACCELERATOR_CRASH_DETECTION