Changeset 212 for trunk/xcache.c

Timestamp:

10/04/2006 12:38:45 AM (2 years ago)

Author:

moo

Message:

fixed #41, early class binding

Files:

• trunk/xcache.c (modified) (10 diffs)

trunk/xcache.c

@@ -66 +66 @@
     } \
 } while(0)
+
+#ifndef max
+#define max(a, b) ((a) < (b) ? (b) : (a))
+#endif
 
 /* }}} */
@@ -542 +546 @@
 #endif
 
+    CG(active_op_array) = p->op_array;
+
 #ifdef HAVE_XCACHE_CONSTANT
     /* install constant */
@@ -571 +577 @@
         new_cest_ptrs[i] =
 #endif
-        xc_install_class(xce->name.str.val, &ci->cest,
+        xc_install_class(xce->name.str.val, &ci->cest, ci->oplineno,
                 UNISW(0, ci->type), ci->key, ci->key_size TSRMLS_CC);
     }
@@ -771 +777 @@
     xce->type = XC_TYPE_PHP;
     return 1;
+}
+/* }}} */
+static void xc_cache_early_binding_class_cb(zend_op *opline, int oplineno, void *data TSRMLS_DC) /* {{{ */
+{
+    char *class_name;
+    int i, class_len;
+    xc_cest_t cest;
+    xc_entry_data_php_t *php = (xc_entry_data_php_t *) data;
+
+    class_name = opline->op1.u.constant.value.str.val;
+    class_len  = opline->op1.u.constant.value.str.len;
+    if (zend_hash_find(CG(class_table), class_name, class_len, (void **) &cest) == FAILURE) {
+        assert(0);
+    }
+#ifdef DEBUG
+    fprintf(stderr, "got ZEND_DECLARE_INHERITED_CLASS: %s\n", class_name + 1);
+#endif
+    /* let's see which class */
+    for (i = 0; i < php->classinfo_cnt; i ++) {
+        if (memcmp(ZSTR_S(php->classinfos[i].key), class_name, class_len) == 0) {
+            php->classinfos[i].oplineno = oplineno;
+            php->have_early_binding = 1;
+            break;
+        }
+    }
+
+    if (i == php->classinfo_cnt) {
+        assert(0);
+    }
 }
 /* }}} */
@@ -785 +820 @@
     char opened_path_buffer[MAXPATHLEN];
     int old_constinfo_cnt, old_funcinfo_cnt, old_classinfo_cnt;
+    int i;
 
     if (!xc_initized) {
@@ -895 +931 @@
 #ifdef HAVE_INODE
     if (xce.data.php->inode)
-#endif
     {
         if (xce.name.str.val != filename) {
@@ -902 +937 @@
         }
     }
+#endif
 
 #ifdef HAVE_XCACHE_OPTIMIZER
@@ -908 +944 @@
     }
 #endif
-
+    /* }}} */
+    /* {{{ prepare */
     php.op_array      = op_array;
 
@@ -972 +1009 @@
     }
     /* }}} */
+    /* {{{ find inherited classes that should be early-binding */
+    php.have_early_binding = 0;
+    for (i = 0; i < php.classinfo_cnt; i ++) {
+        php.classinfos[i].oplineno = -1;
+    }
+
+    xc_undo_pass_two(php.op_array TSRMLS_CC);
+    xc_foreach_early_binding_class(php.op_array, xc_cache_early_binding_class_cb, (void *) &php TSRMLS_CC);
+    xc_redo_pass_two(php.op_array TSRMLS_CC);
+    /* }}} */
     ENTER_LOCK_EX(cache) { /* {{{ store/add entry */
         stored_xce = xc_entry_store_dmz(&xce TSRMLS_CC);
@@ -1001 +1048 @@
     }
     else {
+        CG(active_op_array) = op_array;
         xc_sandbox_free(&sandbox, 1 TSRMLS_CC);
     }