Changeset 309

Timestamp:

05/10/07 23:30:16 (3 years ago)

Author:

bart

Message:

Commit patch from ticket #252: Don't make eA stop init of php when eA fails.

Location:

eaccelerator/trunk

Files:

• eaccelerator.c (modified) (2 diffs)
• optimize.c (modified) (17 diffs)

eaccelerator/trunk/eaccelerator.c

@@ -1749 +1749 @@
       ret = 1;
     } else {
-      zend_error(E_CORE_WARNING,"[%s] This build of \"%s\" was compiled for PHP version %s. Rebuild it for your PHP version (%s) or download precompiled binaries.\n", EACCELERATOR_EXTENSION_NAME,EACCELERATOR_EXTENSION_NAME,PHP_VERSION,Z_STRVAL(v));
+      ea_debug_error("[%s] This build of \"%s\" was compiled for PHP version %s. Rebuild it for your PHP version (%s) or download precompiled binaries.\n", 
+                                        EACCELERATOR_EXTENSION_NAME, EACCELERATOR_EXTENSION_NAME,PHP_VERSION,Z_STRVAL(v));
     }
     zval_dtor(&v);
   } else {
-    zend_error(E_CORE_WARNING,"[%s] This build of \"%s\" was compiled for PHP version %s. Rebuild it for your PHP version.\n", EACCELERATOR_EXTENSION_NAME,EACCELERATOR_EXTENSION_NAME,PHP_VERSION);
+    ea_debug_error("[%s] This build of \"%s\" was compiled for PHP version %s. Rebuild it for your PHP version.\n",
+                                EACCELERATOR_EXTENSION_NAME, EACCELERATOR_EXTENSION_NAME, PHP_VERSION);
   }
   return ret;
@@ -1792 +1794 @@
   }
   if (!eaccelerator_check_php_version(TSRMLS_C)) {
-    return FAILURE;
+    /* 
+                 * do not return FAILURE, because it causes PHP to completely fail.
+                 * Just disable eAccelerator instead of making eA fail starting php
+                 */
+    return SUCCESS;
   }
   ZEND_INIT_MODULE_GLOBALS(eaccelerator, eaccelerator_init_globals, NULL);

eaccelerator/trunk/optimize.c

@@ -28 +28 @@
 #include "eaccelerator.h"
 
-#ifdef HAVE_EACCELERATOR
-#ifdef WITH_EACCELERATOR_OPTIMIZER
+//#ifdef HAVE_EACCELERATOR
+//#ifdef WITH_EACCELERATOR_OPTIMIZER
 
 #include "zend.h"
@@ -46 +46 @@
   /*
    * HOESH: To protect merging. Primary
-   * it abblies to try & catch blocks.
+   * it applies to try & catch blocks.
    * ZEND_ENGINE_2 specific, but can take place
    */
@@ -63 +63 @@
 } BBlink;
 
-#if 0
 static void dump_bb(BB* bb, zend_op_array *op_array) {
   BB* p = bb;
@@ -69 +68 @@
   zend_printf("<pre>%s:%s\n", op_array->filename, op_array->function_name);
   while (p != NULL) {
-    zend_printf("  bb%u start=%u len=%d used=%d\n",
+    zend_printf("  <strong>bb%u</strong> start=%u len=%d used=%d protected=%d\n",
                  (unsigned int)(p-bb),
                  (unsigned int)(p->start-op_array->opcodes),
                  p->len,
-                 p->used);
+                 p->used,
+                 p->protect_merge);
     if (p->jmp_1) {
       zend_printf("    jmp_1 bb%u start=%u  len=%d used=%d\n",
@@ -168 +168 @@
    zend_printf("<br>\n");
 }
-#endif
 
 #define SET_TO_NOP(op) \
@@ -249 +248 @@
 #ifdef ZEND_ENGINE_2
              (end->opcode == ZEND_RECV || end->opcode == ZEND_RECV_INIT ||
-              (end->result.u.EA.type & EXT_TYPE_UNUSED) == 0)) ||
+             (end->result.u.EA.type & EXT_TYPE_UNUSED) == 0)) ||
 #else
              (end->result.u.EA.type & EXT_TYPE_UNUSED) == 0) ||
 #endif
              (end->result.op_type == IS_TMP_VAR)) &&
-            !global[VAR_NUM(end->result.u.var)] && !used[VAR_NUM(end->result.u.var)]) {
+             !global[VAR_NUM(end->result.u.var)] && !used[VAR_NUM(end->result.u.var)]) {
            switch(end->opcode) {
              case ZEND_JMPZ_EX:
@@ -549 +548 @@
     p = bb;
     while (p->next != NULL) {
-      if (p->next->used && p->next->pred) {
+      if (p->next->used && (p->next->pred || p->protect_merge)) {
         p = p->next;
       } else {
@@ -581 +580 @@
     p = bb;
     while (p != NULL) {
-      while (p->next != NULL && (!p->next->used || p->next->pred == NULL)) {
+      while (p->next != NULL && (!p->next->used || p->next->pred == NULL) && !p->protect_merge) {
         del_bb(p->next);
         p->next = p->next->next;
@@ -2715 +2714 @@
                         bb[tc_element->catch_op].start = &op_array->opcodes[tc_element->catch_op];
                         bb[tc_element->catch_op].protect_merge = 1;
+            bb[tc_element->catch_op].used = 1;
                 }
         }
+    
+    dump_bb(bb, op_array);
+    
 #endif
         /* Find Starts of Basic Blocks */
@@ -3175 +3178 @@
 #define FREE_REG(R) reg_pool[(R)] = 0;
 
-
-void reassign_registers(zend_op_array *op_array, BB* p, char *global) {
+static void reassign_registers(zend_op_array *op_array, BB* p, char *global) {
   zend_uint i;
   zend_uint n = 0;
@@ -3298 +3300 @@
 }
 
-void restore_operand_types(zend_op_array *op_array) {
+static void restore_operand_types(zend_op_array *op_array) {
         zend_op* op = op_array->opcodes;
         int len = op_array->last;
@@ -3322 +3324 @@
 
   TSRMLS_FETCH();
-/*???
-#ifdef ZEND_ENGINE_2
-  return;
-#endif
-*/
+
   if (!EAG(compiler) || op_array->type != ZEND_USER_FUNCTION) {
     return;
@@ -3337 +3335 @@
   /* Find All Basic Blocks and build CFG */
   if (build_cfg(op_array, bb)) {
+    dump_bb(bb, op_array);
     char *global = do_alloca(op_array->T * sizeof(char));
     if (global == NULL) return;
@@ -3343 +3342 @@
       /* Determine Used Blocks and its Predcessors */
       mark_used_bb(bb);
+      dump_bb(bb, op_array);
 
       /* JMP Optimization */
@@ -3355 +3355 @@
       }
 
-      /* Mark All Basik Blocks as Unused. Free Predcessors Links. */
+      /* Mark All Basic Blocks as Unused. Free Predcessors Links. */
       p = bb;
       while (p != NULL) {
@@ -3368 +3368 @@
     p = bb;
     while (p->next != NULL) {
-      if (p->next->used) {
+      if (p->next->used || p->protect_merge) {
         p = p->next;
       } else {
@@ -3398 +3398 @@
   free_alloca(bb);
 }
-#endif
-#endif /* #ifdef HAVE_EACCELERATOR */
+//#endif
+//#endif /* #ifdef HAVE_EACCELERATOR */