Changeset 344 for eaccelerator/trunk/ea_store.c

Timestamp:

06/19/08 18:01:31 (6 months ago)

Author:

bart

Message:

Remove support for all php versions older than php 5.1

Files:

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

eaccelerator/trunk/ea_store.c

@@ -81 +81 @@
-}
-
-#ifdef ZEND_ENGINE_2
-static size_t calc_property_info(zend_property_info * from TSRMLS_DC)
-{
@@ -90 +89 @@
-    size += calc_string(from->name, from->name_length + 1 TSRMLS_CC);
-#ifdef INCLUDE_DOC_COMMENTS
-#ifdef ZEND_ENGINE_2_1
-     if (from->doc_comment != NULL) {
-        size += calc_string(from->doc_comment, from->doc_comment_len + 1 TSRMLS_CC);
-     }
-#endif
-#endif
-     return size;
-}
-#endif
-
-/* Calculate the size of an HashTable */
@@ -165 +161 @@
-        zend_bailout();
-    }
-#ifdef ZEND_ENGINE_2
-    if (from->num_args > 0) {
-        zend_uint i;
@@ -178 +173 @@
-        }
-    }
-#else
-    if (from->arg_types != NULL) {
-        size += calc_string((char *) from->arg_types, (from->arg_types[0] + 1) * sizeof(zend_uchar) TSRMLS_CC);
-    }
-#endif
-    if (from->function_name != NULL) {
-        size += calc_string(from->function_name, strlen(from->function_name) + 1 TSRMLS_CC);
-    }
-#ifdef ZEND_ENGINE_2
-    if (from->scope != NULL) {
-        // HOESH: the same problem?
@@ -198 +187 @@
-        }
-    }
-#endif
-    if (from->type == ZEND_INTERNAL_FUNCTION) {
-        return size;
@@ -222 +210 @@
-        ADDSIZE(size, sizeof(zend_brk_cont_element) * from->last_brk_cont);
-    }
-#ifdef ZEND_ENGINE_2
-    if (from->try_catch_array != NULL) {
-        ADDSIZE(size, sizeof(zend_try_catch_element) * from->last_try_catch);
-    }
-#endif
-    if (from->static_variables != NULL) {
-        ADDSIZE(size, sizeof(HashTable));
-        size += calc_zval_hash(from->static_variables);
-    }
-#ifdef ZEND_ENGINE_2_1
-    if (from->vars != NULL) {
-        int i;
@@ -239 +224 @@
-        }
-    }
-#endif
-    if (from->filename != NULL) {
-        size += calc_string(from->filename, strlen(from->filename) + 1 TSRMLS_CC);
-    }
-#ifdef INCLUDE_DOC_COMMENTS
-#ifdef ZEND_ENGINE_2
-    if (from->doc_comment != NULL) {
-        size += calc_string(from->doc_comment, from->doc_comment_len + 1 TSRMLS_CC);
-    }
-#endif
-#endif
-
@@ -270 +252 @@
-        size += calc_string(from->parent->name, from->parent->name_length + 1 TSRMLS_CC);
-    }
-#ifdef ZEND_ENGINE_2
-    if (from->filename != NULL) {
-        size += calc_string(from->filename, strlen(from->filename) + 1 TSRMLS_CC);
@@ -284 +265 @@
-    size += calc_hash(&from->properties_info, (calc_bucket_t) calc_property_info);
-
-#  ifdef ZEND_ENGINE_2_1
-    size += 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
-        ADDSIZE(size, sizeof(HashTable));
-        size += calc_zval_hash(from->static_members);
-    }
-#else
-    size += calc_zval_hash(&from->default_properties);
-#endif
-    size += calc_hash(&from->function_table, (calc_bucket_t) calc_op_array);
-
@@ -331 +305 @@
-    }
-    while (c != NULL) {
-#ifdef ZEND_ENGINE_2
-        size += calc_class_entry(*(zend_class_entry **) c->pData TSRMLS_CC);
-#else
-        size += calc_class_entry((zend_class_entry *) c->pData TSRMLS_CC);
-#endif
-        c = c->pListNext;
-    }
@@ -504 +474 @@
-
-    DBG(ea_debug_pad, (EA_DEBUG TSRMLS_CC));
-#ifdef ZEND_ENGINE_2
-    DBG(ea_debug_printf, (EA_DEBUG, "[%d] store_op_array: %s [scope=%s type=%x]\n", 
-            getpid(), from->function_name ? from->function_name : "(top)",
@@ -510 +479 @@
-            , from->type
-        ));
-#else
-    DBG(ea_debug_printf, (EA_DEBUG, "[%d] store_op_array: %s [scope=%s type=%x]\n", 
-            getpid(), from->function_name ? from->function_name : "(top)",
-            "NULL"
-            , from->type
-        ));
-#endif      
-
-    if (from->type == ZEND_INTERNAL_FUNCTION) {
@@ -527 +489 @@
-
-    to->type = from->type;
-#ifdef ZEND_ENGINE_2
-    to->num_args = from->num_args;
-    to->required_num_args = from->required_num_args;
@@ -543 +504 @@
-                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;
@@ -553 +512 @@
-    }
-    to->pass_rest_by_reference = from->pass_rest_by_reference;
-#else
-    if (from->arg_types != NULL)
-        to->arg_types = (unsigned char *)store_string(at, (char *)from->arg_types, (from->arg_types[0] + 1) * sizeof(zend_uchar) TSRMLS_CC);
-#endif
-    if (from->function_name != NULL)
-        to->function_name = store_string(at, from->function_name, strlen(from->function_name) + 1 TSRMLS_CC);
-#ifdef ZEND_ENGINE_2
-    to->fn_flags = from->fn_flags;
-    to->scope_name = NULL;
@@ -585 +539 @@
-        }
-    }
-#endif
-
-    if (from->type == ZEND_INTERNAL_FUNCTION) {
-#ifdef ZEND_ENGINE_2
-        /* zend_internal_function also contains return_reference in ZE2 */
-        to->return_reference = from->return_reference;
-
-
+
-    }
-    
@@ -600 +551 @@
-    to->brk_cont_array = from->brk_cont_array;
-    to->last_brk_cont = from->last_brk_cont;
-#ifdef ZEND_ENGINE_2
-    to->try_catch_array = from->try_catch_array;
-    to->last_try_catch = from->last_try_catch;
@@ -610 +560 @@
-        to->last_try_catch = 0;
-    }
-#else
-    to->uses_globals = from->uses_globals;
-#endif
-
-    to->static_variables = from->static_variables;
@@ -632 +579 @@
-                store_zval(at, &opline->op2.u.constant TSRMLS_CC);
-            }
-#ifdef ZEND_ENGINE_2
-            switch (opline->opcode) {
-            case ZEND_JMP:
@@ -644 +590 @@
-                break;
-            }
-#endif
-        }
-        EAG(compress) = 1;
@@ -659 +604 @@
-        store_zval_hash(at, to->static_variables, from->static_variables);
-    }
-#ifdef ZEND_ENGINE_2_1
-    if (from->vars != NULL) {
-            int i;
@@ -674 +618 @@
-    to->line_start = from->line_start;
-    to->line_end = from->line_end;
-  
+
-    to->doc_comment_len = from->doc_comment_len;
-    if (from->doc_comment != NULL) {
-        to->doc_comment = store_string(at, from->doc_comment, from->doc_comment_len + 1 TSRMLS_CC);
-    }
-#  endif
-#endif
-
@@ -688 +631 @@
-}
-
-#ifdef ZEND_ENGINE_2
-static zend_property_info *store_property_info(char **at, zend_property_info * from TSRMLS_DC)
-{
@@ -697 +639 @@
-    memcpy(to, from, sizeof(zend_property_info));
-    to->name = store_string(at, from->name, from->name_length + 1 TSRMLS_CC);
-
-
+
-    to->doc_comment_len = from->doc_comment_len; 
-    if (from->doc_comment != NULL) { 
-       to->doc_comment = store_string(at, from->doc_comment, from->doc_comment_len + 1 TSRMLS_CC);
-    }
-  
+
-    to->doc_comment_len = 0;
-    to->doc_comment = NULL;
-#endif
-#endif
-    return to;
@@ -770 +710 @@
-            }
-            /* If the static member points to the same value in parent and child, remove for proper inheritance during restore */
-#  ifdef ZEND_ENGINE_2_1
-            if(zend_hash_quick_find(&parent->default_static_members, p->arKey, p->nKeyLength, p->h, &pprop.ptr) == SUCCESS) {
-#  else
-            if(zend_hash_quick_find(parent->static_members, p->arKey, p->nKeyLength, p->h, &pprop.ptr) == SUCCESS) {
-#  endif
-                if(*pprop.v == *cprop.v) {
-                    return ZEND_HASH_APPLY_REMOVE;
@@ -802 +738 @@
-    return ZEND_HASH_APPLY_REMOVE;
-}
-#endif
-
-static ea_class_entry *store_class_entry(char **at, zend_class_entry * from TSRMLS_DC)
@@ -831 +766 @@
-    }
-
-#ifdef ZEND_ENGINE_2 /* php >= 5.0 */
-    to->ce_flags = from->ce_flags;
-    to->static_members = NULL;
@@ -868 +802 @@
-    store_hash(at, &to->properties_info, &from->properties_info, (store_bucket_t) store_property_info, (check_bucket_t) store_property_access_check, from);
-    
-#  ifdef ZEND_ENGINE_2_1 /* php >= 5.1 */
-    if ((from->static_members != NULL) && (from->static_members != &from->default_static_members)) {
-        store_zval_hash(at, &to->default_static_members, &from->default_static_members);
@@ -879 +812 @@
-        to->static_members = &to->default_static_members;
-    }
-#  else /* php == 5.0 */
-    if (from->static_members != NULL) {
-        to->static_members = (HashTable *)ALLOCATE(at, sizeof(HashTable));
-
-        store_hash(at, to->static_members, from->static_members, (store_bucket_t) store_zval_ptr, (check_bucket_t) store_static_member_access_check, from);
-    }   
-#  endif
-    store_hash(at, &to->function_table, &from->function_table, (store_bucket_t) store_op_array, (check_bucket_t) store_function_inheritance_check, from);
-    
-#else /* PHP 4 */
-    store_zval_hash(at, &to->default_properties, &from->default_properties);
-    store_hash(at, &to->function_table, &from->function_table, (store_bucket_t) store_op_array, NULL, NULL);
-#endif
-
-#ifdef DEBUG
-    EAG(xpad)--;
@@ -940 +861 @@
-        fc->htablen = c->nKeyLength;
-        fc->next = NULL;
-#ifdef ZEND_ENGINE_2
-        fc->fc = *(zend_class_entry **) c->pData;
-#else
-        fc->fc = c->pData;
-#endif
-        c = c->pListNext;
-        x = fc->htabkey;