Changeset 162 for eaccelerator/trunk/ea_store.c

Timestamp:

02/17/06 18:35:50 (3 years ago)

Author:

zoeloelip

Message:

Merged PHP_5_1 branch with HEAD

Files:

• eaccelerator/trunk/ea_store.c (modified) (20 diffs)

eaccelerator/trunk/ea_store.c

@@ -83 +83 @@
-        EAG(mem) += sizeof(zend_property_info);
-        calc_string(from->name, from->name_length + 1 TSRMLS_CC);
+#ifdef ZEND_ENGINE_2_1
+        if (from->doc_comment != NULL) {
+                calc_string(from->doc_comment, from->doc_comment_len + 1 TSRMLS_CC);
+        }
+#endif
-}
-
@@ -118 +123 @@
-        case IS_CONSTANT:
-        case IS_STRING:
-               if (zv->value.str.val == NULL || zv->value.str.val == empty_string
-
+/*             if (zv->value.str.val == NULL
+*/
-                        calc_string(zv->value.str.val, zv->value.str.len + 1 TSRMLS_CC);
-
+
-                break;
-        case IS_ARRAY:
@@ -247 +252 @@
-                calc_zval_hash(from->static_variables);
-        }
+#ifdef ZEND_ENGINE_2_1
+        if (from->vars != NULL) {
+                zend_uint i;
+                EACCELERATOR_ALIGN(EAG(mem));
+                EAG(mem) += sizeof(zend_compiled_variable) * from->last_var;
+                for (i = 0; i < from->last_var; i ++) {
+                        calc_string(from->vars[i].name, from->vars[i].name_len+1 TSRMLS_CC);
+                }
+        }
+#endif
-        if (from->filename != NULL)
-                calc_string(from->filename, strlen(from->filename) + 1 TSRMLS_CC);
@@ -270 +285 @@
-                calc_string(from->parent->name, from->parent->name_length + 1 TSRMLS_CC);
-#ifdef ZEND_ENGINE_2
-#if 0
-        // what's problem. why from->interfaces[i] == 0x5a5a5a5a ?
-        for (i = 0; i < from->num_interfaces; i++) {
-                if (from->interfaces[i]) {
-                        calc_string(from->interfaces[i]->name,
-                                                from->interfaces[i]->name_length);
-                }
-        }
-#endif
-        if (from->filename != NULL)
-                calc_string(from->filename, strlen(from->filename) + 1 TSRMLS_CC);
@@ -286 +292 @@
-        calc_zval_hash(&from->constants_table);
-        calc_zval_hash(&from->default_properties);
+
-        calc_hash(&from->properties_info, (calc_bucket_t) calc_property_info);
+
+#  ifdef ZEND_ENGINE_2_1
+        calc_zval_hash(&from->default_static_members);
+        if ((from->static_members != NULL) && (from->static_members != &from->default_static_members)) {
+#  else
-        if (from->static_members != NULL) {
+#  endif
-                EACCELERATOR_ALIGN(EAG(mem));
-                EAG(mem) += sizeof(HashTable);
@@ -368 +381 @@
-
-typedef void *(*store_bucket_t) (void *TSRMLS_DC);
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-#define store_zval_hash(to, from) \
-
+, NULL, NULL
-
-#define store_zval_hash_ex(to, from, start) \
-
+, NULL
-
-static zval *store_zval_ptr(zval * from TSRMLS_DC)
@@ -393 +407 @@
-
-static void store_hash_int(HashTable * target, HashTable * source,
-
+
+
-{
-        Bucket *p, *np, *prev_p;
+        TSRMLS_FETCH();
-
-        memcpy(target, source, sizeof(HashTable));
@@ -416 +432 @@
-                np = NULL;
-                while (p) {
+                        /* If a check function has been defined, run it */
+                        if (check_bucket) {
+                                va_list args;
+                                va_start(args, check_bucket);
+
+                                /* If the check function returns ZEND_HASH_APPLY_REMOVE, don't store this record, skip over it */
+                                if(check_bucket(p, args)) {
+                                        p = p->pListNext;
+                                        target->nNumOfElements--;
+                                        /* skip to next itteration */
+                                        continue;
+                                }
+                                va_end(args);
+                        }
+
-                        EACCELERATOR_ALIGN(EAG(mem));
-                        np = (Bucket *) EAG(mem);
@@ -466 +497 @@
-        case IS_CONSTANT:
-        case IS_STRING:
-
-
-
-
-
-
-
+
-                break;
-        case IS_ARRAY:
@@ -516 +541 @@
-
-        ea_debug_pad(EA_DEBUG TSRMLS_CC);
-
+ type=%x
-            getpid(), from->function_name ? from->function_name : "(top)",
-#ifdef ZEND_ENGINE_2
@@ -523 +548 @@
-                        "NULL"
-#endif
+                        , from->type
-                );
-
@@ -555 +581 @@
-                                to->arg_info[i].class_name_len = from->arg_info[i].class_name_len;
-                        }
+#  ifdef ZEND_ENGINE_2_1
+                        /* php 5.1 introduces this in zend_arg_info for array type hinting */
+                        to->arg_info[i].array_type_hint = from->arg_info[i].array_type_hint;
+#  endif
-                        to->arg_info[i].allow_null = from->arg_info[i].allow_null;
-                        to->arg_info[i].pass_by_reference = from->arg_info[i].pass_by_reference;
@@ -595 +625 @@
-#endif
-
-
-
+
+
+
+
+
+
+
-    
-        to->opcodes = from->opcodes;
@@ -672 +707 @@
-                store_zval_hash(to->static_variables, from->static_variables);
-        }
+#ifdef ZEND_ENGINE_2_1
+        if (from->vars != NULL) {
+                zend_uint i;
+                EACCELERATOR_ALIGN(EAG(mem));
+                to->last_var = from->last_var;
+                to->vars = (zend_compiled_variable*)EAG(mem);
+                EAG(mem) += sizeof(zend_compiled_variable) * from->last_var;
+                        memcpy(to->vars, from->vars, sizeof(zend_compiled_variable) * from->last_var);
+                for (i = 0; i < from->last_var; i ++) {
+                        to->vars[i].name = store_string(from->vars[i].name, from->vars[i].name_len+1 TSRMLS_CC);
+                }
+        } else {
+                to->last_var = 0;
+                to->vars = NULL;
+        }
+#endif
-        if (from->filename != NULL) {
-to
+from
-        }
-#ifdef ZEND_ENGINE_2
@@ -694 +745 @@
-        memcpy(to, from, sizeof(zend_property_info));
-        to->name = store_string(from->name, from->name_length + 1 TSRMLS_CC);
+#ifdef ZEND_ENGINE_2_1
+        to->doc_comment_len = from->doc_comment_len;
+        if (from->doc_comment != NULL) {
+                to->doc_comment = store_string(from->doc_comment, from->doc_comment_len + 1 TSRMLS_CC);
+        }
+#endif
-        return to;
-}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-eaccelerator_class_entry *store_class_entry(zend_class_entry * from TSRMLS_DC)
@@ -705 +853 @@
-        EAG(mem) += sizeof(eaccelerator_class_entry);
-        to->type = from->type;
+        ea_debug_printf(EA_DEBUG, "[%d] store_class_entry: class type=%d\n", getpid(), from->type);
-        to->name = NULL;
-        to->name_length = from->name_length;
@@ -712 +861 @@
-        to->static_members = NULL;
-        to->num_interfaces = from->num_interfaces;
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-#endif
-
@@ -740 +879 @@
-                to->parent = store_string(from->parent->name, from->parent->name_length + 1 TSRMLS_CC);
-
-/*
-  if (!from->constants_updated) {
-    zend_hash_apply_with_argument(&from->default_properties, (apply_func_arg_t) zval_update_constant, (void *) 1 TSRMLS_CC);
-    to->constants_updated = 1;
-  }
-*/
-#ifdef ZEND_ENGINE_2
-        to->line_start = from->line_start;
@@ -762 +895 @@
-        store_zval_hash(&to->constants_table, &from->constants_table);
-        store_zval_hash(&to->default_properties, &from->default_properties);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if (from->static_members != NULL) {
-                EACCELERATOR_ALIGN(EAG(mem));
@@ -769 +920 @@
-                store_zval_hash(to->static_members, from->static_members);
-        }
+#  endif
-#else
-        store_zval_hash(&to->default_properties, &from->default_properties);
-#endif
-
+, (check_bucket_t) store_function_inheritance_check, from
-
-#ifdef DEBUG