Changeset 477

Timestamp:

08/19/2007 02:15:51 PM (16 months ago)

Author:

moo

Message:

opcodes data is copied but not the op_array. use op_array_handler instead

Location:

trunk

Files:

• optimizer.c (modified) (4 diffs)
• optimizer.h (modified) (1 diff)
• xcache.c (modified) (3 diffs)

trunk/optimizer.c

@@ -7 +7 @@
 /* the "vector" stack */
 #include "stack.h"
+#include "xcache_globals.h"
 
 #ifdef DEBUG
@@ -19 +20 @@
 #   define XCACHE_IS_CV 16
 #endif
-#define optimized_flag done_pass_two
 
 typedef int bbid_t;
@@ -516 +516 @@
     }
 
-    /* don't optimize twice */
-    if (op_array->optimized_flag) {
-        return 0;
-    }
-    op_array->optimized_flag = 1;
-
 #ifdef DEBUG
 #   if 0
@@ -557 +551 @@
 }
 /* }}} */
-static int xc_clear_flag_optimized(zend_op_array *op_array TSRMLS_DC) /* {{{ */
-{
-    op_array->done_pass_two = 0;
-    return 0;
-}
-/* }}} */
-void xc_optimize(zend_op_array *op_array TSRMLS_DC) /* {{{ */
-{
-    xc_compile_result_t cr;
-
-    if (!op_array) {
-        return;
-    }
-
-    xc_compile_result_init_cur(&cr, op_array TSRMLS_CC);
-
-    xc_apply_op_array(&cr, (apply_func_t) xc_undo_pass_two TSRMLS_CC);
-    /* op_array->done_pass_two is now used as if it's op_array->flag_optimized */
-    xc_apply_op_array(&cr, (apply_func_t) xc_optimize_op_array TSRMLS_CC);
-    xc_apply_op_array(&cr, (apply_func_t) xc_clear_flag_optimized TSRMLS_CC);
-    xc_apply_op_array(&cr, (apply_func_t) xc_redo_pass_two TSRMLS_CC);
-
-    xc_compile_result_free(&cr);
-}
-/* }}} */
+void xc_optimizer_op_array_handler(zend_op_array *op_array) /* {{{ */
+{
+    TSRMLS_FETCH();
+    if (XG(optimizer)) {
+        xc_optimize_op_array(op_array TSRMLS_CC);
+    }
+}
+/* }}} */

trunk/optimizer.h

@@ -2 +2 @@
 #include "xcache.h"
 
-void xc_optimize(zend_op_array *op_array TSRMLS_DC);
+void xc_optimizer_op_array_handler(zend_op_array *op_array);

trunk/xcache.c

@@ -1000 +1000 @@
     }
 
-#ifdef HAVE_XCACHE_OPTIMIZER
-    if (XG(optimizer)) {
-        xc_optimize(op_array TSRMLS_CC);
-    }
-#endif
     /* }}} */
     /* {{{ prepare */
@@ -1200 +1195 @@
     if (!XG(cacher)) {
         op_array = old_compile_file(h, type TSRMLS_CC);
-#ifdef HAVE_XCACHE_OPTIMIZER
-        if (XG(optimizer)) {
-            xc_optimize(op_array TSRMLS_CC);
-        }
-#endif
         return op_array;
     }
@@ -3051 +3041 @@
     NULL,           /* deactivate_func_t */
     NULL,           /* message_handler_func_t */
+#ifdef HAVE_XCACHE_OPTIMIZER
+    xc_optimizer_op_array_handler,
+#else
     NULL,           /* op_array_handler_func_t */
+#endif
     xcache_statement_handler,
     xcache_fcall_begin_handler,