Changeset 256

Timestamp:

07/29/06 14:28:19 (2 years ago)

Author:

bart

Message:

Remove some leftovers from restoring encoded scripts which only create

overhead without the loader.

Files:

• eaccelerator/trunk/ChangeLog (modified) (1 diff)
• eaccelerator/trunk/eaccelerator.c (modified) (18 diffs)

eaccelerator/trunk/ChangeLog

@@ -7 +7 @@
-        * Move some functions around to make more of them static, this reduces
-          the binary size and load times.
-
+
+
+
-2006-07-29  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>
-

eaccelerator/trunk/eaccelerator.c

@@ -4 +4 @@
-   +----------------------------------------------------------------------+
-   | Copyright (c) 2004 - 2006 eAccelerator                               |
-                      
+
-   +----------------------------------------------------------------------+
-   | This program is free software; you can redistribute it and/or        |
@@ -920 +920 @@
-#ifndef ZEND_WIN32
-  if (file_handle->type == ZEND_HANDLE_FP && file_handle->handle.fp != NULL) {
-
-
+
-      if (file_handle->opened_path != NULL) {
-
+ 
-      }
-      return 0;
@@ -930 +929 @@
-#endif
-  if (file_handle->opened_path != NULL) {
-
-
+
-       strcpy(realname,file_handle->opened_path);
-       return 0;
-    }
-
-          
+ 
+                     
-             IS_SLASH(file_handle->filename[0]) ||
-             IS_ABSOLUTE_PATH(file_handle->filename,strlen(file_handle->filename))) {
-
-
+
-       return 0;
-    }
@@ -953 +950 @@
-      end = strchr(ptr, DEFAULT_DIR_SEPARATOR);
-      if (end != NULL) {
--
+ - 
-        end++;
-      } else {
-        len = strlen(ptr);
-+
-
-+filename_len+
+ + 
+
+ + filename_len + 
-        memcpy(tryname, ptr, len);
-        tryname[len] = '/';
-
-
-
-
+
+
+
-          return 0;
-        }
@@ -978 +974 @@
-                tryname_length = strlen(tryname);
-
-
+ {
-                        tryname_length--;
+                }
-                if (tryname_length > 0 && tryname[0] != '[' // [no active file]
-                        && tryname_length + filename_len + 1 < MAXPATHLEN)
-                {
-                        strncpy(tryname + tryname_length + 1, file_handle->filename, filename_len + 1);
-
+ {
-                                return 0;
+                        }
-                }
-        }
@@ -997 +995 @@
-      if (!eaccelerator_check_mtime) {
-        return 0;
-
-
+
-        return 0;
-      } else {
@@ -1006 +1003 @@
-      if (!eaccelerator_check_mtime) {
-        return 0;
-
-
+
-        return 0;
-      } else {
@@ -1016 +1012 @@
-    if (!eaccelerator_check_mtime) {
-      return 0;
-
-
+
-      return 0;
-    } else {
@@ -1025 +1020 @@
-  } else if (file_handle->filename == NULL) {
-    return -1;
-
+ 
-             file_handle->filename[0] == '.' ||
-             IS_SLASH(file_handle->filename[0]) ||
@@ -1032 +1027 @@
-      if (!eaccelerator_check_mtime) {
-        return 0;
-
-
+
-        return 0;
-      } else {
@@ -1049 +1043 @@
-      end = strchr(ptr, DEFAULT_DIR_SEPARATOR);
-      if (end != NULL) {
--
+ - 
-        end++;
-      } else {
-        len = strlen(ptr);
-+
+ + 
-      }
-      if (len+filename_len+2 < MAXPATHLEN) {
-        memcpy(tryname, ptr, len);
-        tryname[len] = '/';
-+len+
-+filename_len+
+ + len + 
+ + filename_len + 
-        if (VCWD_REALPATH(tryname, realname)) {
-#ifdef ZEND_WIN32
-
-
+
-            return 0;
-          }
@@ -1069 +1062 @@
-          if (!eaccelerator_check_mtime) {
-            return 0;
-
-
+
-            return 0;
-          } else {
@@ -1107 +1099 @@
-  realname[0] = '\000';
-#endif
+
-  DBG(ea_debug_start_time, (&tv_start));
-  DBG(ea_debug_printf, (EA_DEBUG, "[%d] Enter COMPILE\n",getpid()));
@@ -1195 +1188 @@
-    int ea_bailout;
-
-
+
+
-    if (CG(class_table) != EG(class_table)) {
-
-
-
-
+
+
+
-    } else {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-#endif
-
@@ -1226 +1204 @@
-    class_table_tail = CG(class_table)->pListTail;
-
-
-
-
+
+
-    if (EAG(optimizer_enabled) && eaccelerator_mm_instance->optimizer_enabled) {
-      EAG(compiler) = 1;
-    }
-
+        /* try to compile the script */
-    ea_bailout = 0;
-    zend_try {
-      t = mm_saved_zend_compile_file(file_handle, type TSRMLS_CC);
-    } zend_catch {
-      CG(function_table) = orig_function_table;
-      CG(class_table) = orig_class_table;
-#ifdef ZEND_ENGINE_2
-      EG(class_table) = orig_eg_class_table;
-#endif
-      ea_bailout = 1;
-    } zend_end_try();
@@ -1249 +1222 @@
-    DBG(ea_debug_log_hashkeys, ("class_table\n", CG(class_table)));
-
-/*???
-    if (file_handle->opened_path == NULL && t != NULL) {
-      file_handle->opened_path = t->filename;
-    }
-*/
-    EAG(compiler) = 0;
-    if (t != NULL && file_handle->opened_path != NULL && (eaccelerator_check_mtime ||
@@ -1259 +1227 @@
-      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->pListNext:
-?class_table_tail->pListNext:
+ ? function_table_tail->pListNext : 
+ ? class_table_tail->pListNext : 
-      if (eaccelerator_store(file_handle->opened_path, &buf, nreloads, t, function_table_tail, class_table_tail TSRMLS_CC)) {
-#ifdef DEBUG
@@ -1275 +1243 @@
-      }
-    } else {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-  }
-  DBG(ea_debug_printf, (EA_TEST_PERFORMANCE, "\t[%d] compile_file: end (%ld)\n", getpid(), ea_debug_elapsed_time(&tv_start)));