Changeset 294

Timestamp:

02/13/07 18:39:01 (1 year ago)

Author:

bart

Message:

Revert some changes form changeset @256 to fix bug #199

Files:

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

eaccelerator/trunk/ChangeLog

@@ -8 +8 @@
-            reordered some conditional includes to reduce ifdef statements
-        * Check if those array indices are set before testing them in control.php
+        * Revert some changes form changeset @256 to fix bug #199
-
-2007-01-29  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>

eaccelerator/trunk/eaccelerator.c

@@ -92 +92 @@
-static int eaccelerator_is_extension      = 0;
-zend_extension* ZendOptimizer = NULL;
+
+static HashTable eaccelerator_global_function_table;
+static HashTable eaccelerator_global_class_table;
-
-int binary_eaccelerator_version[2];
@@ -1253 +1256 @@
-    return t;
-  } else { // not in cache or must be recompiled
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-#ifdef DEBUG
@@ -1269 +1279 @@
-#endif
-
+
+    zend_hash_init_ex(&tmp_function_table, 100, NULL, ZEND_FUNCTION_DTOR, 1, 0);
+    zend_hash_copy(&tmp_function_table, &eaccelerator_global_function_table, NULL, &tmp_func, sizeof(zend_function));
+    orig_function_table = CG(function_table);
+    CG(function_table) = &tmp_function_table;
+
+    zend_hash_init_ex(&tmp_class_table, 10, NULL, ZEND_CLASS_DTOR, 1, 0);
+    zend_hash_copy(&tmp_class_table, &eaccelerator_global_class_table, NULL, &tmp_class, sizeof(zend_class_entry));
+
+    orig_class_table = CG(class_table);;
+    CG(class_table) = &tmp_class_table;
+#ifdef ZEND_ENGINE_2
+    orig_eg_class_table = EG(class_table);;
+    EG(class_table) = &tmp_class_table;
+#endif
+
-    /* Storing global pre-compiled functions and classes */
-    function_table_tail = CG(function_table)->pListTail;
@@ -1284 +1310 @@
-      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();
@@ -1315 +1346 @@
-      class_table_tail = class_table_tail ? class_table_tail->pListNext : CG(class_table)->pListHead;
-    }
+    CG(function_table) = orig_function_table;
+    CG(class_table) = orig_class_table;
+#ifdef ZEND_ENGINE_2
+    EG(class_table) = orig_eg_class_table;
+    DBG(ea_debug_printf, (EA_DEBUG, "\t[%d] restoring CG(class_table)[%08x] != EG(class_table)[%08x]\n", 
+                getpid(), CG(class_table), EG(class_table)));
+#endif
+    while (function_table_tail != NULL) {
+      zend_op_array *op_array = (zend_op_array*)function_table_tail->pData;
+      if (op_array->type == ZEND_USER_FUNCTION) {
+        if (zend_hash_add(CG(function_table), function_table_tail->arKey, function_table_tail->nKeyLength, op_array, 
+                    sizeof(zend_op_array), NULL) == FAILURE && function_table_tail->arKey[0] != '\000') {
+          CG(in_compilation) = 1;
+          CG(compiled_filename) = file_handle->opened_path;
+#ifdef ZEND_ENGINE_2
+          CG(zend_lineno) = op_array->line_start;
+#else
+          CG(zend_lineno) = op_array->opcodes[0].lineno;
+#endif
+          zend_error(E_ERROR, "Cannot redeclare %s()", function_table_tail->arKey);
+        }
+      }
+      function_table_tail = function_table_tail->pListNext;
+    }
+    while (class_table_tail != NULL) {
+#ifdef ZEND_ENGINE_2
+      zend_class_entry **ce = (zend_class_entry**)class_table_tail->pData;
+      if ((*ce)->type == ZEND_USER_CLASS) {
+        if (zend_hash_add(CG(class_table), class_table_tail->arKey, class_table_tail->nKeyLength, 
+                    ce, sizeof(zend_class_entry*), NULL) == FAILURE && class_table_tail->arKey[0] != '\000') {
+          CG(in_compilation) = 1;
+          CG(compiled_filename) = file_handle->opened_path;
+          CG(zend_lineno) = (*ce)->line_start;
+#else
+      zend_class_entry *ce = (zend_class_entry*)class_table_tail->pData;
+      if (ce->type == ZEND_USER_CLASS) {
+        if (ce->parent != NULL) {
+          if (zend_hash_find(CG(class_table), (void*)ce->parent->name, ce->parent->name_length+1, (void **)&ce->parent) != SUCCESS) {
+            ce->parent = NULL;
+          }
+        }
+        if (zend_hash_add(CG(class_table), class_table_tail->arKey, class_table_tail->nKeyLength, ce, 
+                    sizeof(zend_class_entry), NULL) == FAILURE && class_table_tail->arKey[0] != '\000') {
+          CG(in_compilation) = 1;
+          CG(compiled_filename) = file_handle->opened_path;
+          CG(zend_lineno) = 0;
+#endif
+          zend_error(E_ERROR, "Cannot redeclare class %s", class_table_tail->arKey);
+        }
+      }
+      class_table_tail = class_table_tail->pListNext;
+    }
+    tmp_function_table.pDestructor = NULL;
+    tmp_class_table.pDestructor = NULL;
+    zend_hash_destroy(&tmp_function_table);
+    zend_hash_destroy(&tmp_class_table);
-  }
-  DBG(ea_debug_printf, (EA_TEST_PERFORMANCE, "\t[%d] compile_file: end (%ld)\n", getpid(), ea_debug_elapsed_time(&tv_start)));