Changeset 291

Timestamp:

02/13/07 16:11:14 (1 year ago)

Author:

bart

Message:

Cleanup: Removed some commented out code, changed some debug statements,

reordered some conditional includes to reduce ifdef statements

Files:

• eaccelerator/trunk/ChangeLog (modified) (1 diff)
• eaccelerator/trunk/ea_restore.c (modified) (8 diffs)
• eaccelerator/trunk/ea_store.c (modified) (21 diffs)
• eaccelerator/trunk/eaccelerator.c (modified) (2 diffs)

eaccelerator/trunk/ChangeLog

@@ -5 +5 @@
-        * Fixed a nullpointer dereference in some special cases in ea_restore.c:509
-        * Always compile a ea_debug_error message in ea_restore.c
+        * Cleanup: Removed some commented out code, changed some debug statements,
+            reordered some conditional includes to reduce ifdef statements
-
-2007-01-29  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>

eaccelerator/trunk/ea_restore.c

@@ -583 +583 @@
-        }
-#endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        to->uses_this = from->uses_this;
-
@@ -639 +632 @@
-        to->last_var         = from->last_var;
-        to->size_var         = 0;
-/*      if (from->vars) {
-                zend_uint i;
-                to->vars = (zend_compiled_variable*)emalloc(from->last_var*sizeof(zend_compiled_variable));             
-                memcpy(to->vars, from->vars, sizeof(zend_compiled_variable) * from->last_var);
-                for (i = 0; i < from->last_var; i ++) {
-                        to->vars[i].name = estrndup(from->vars[i].name, from->vars[i].name_len);
-                }
-        }*/
-#endif
-
@@ -795 +780 @@
-        memset(to, 0, sizeof(zend_class_entry));
-        to->type = from->type;
-        /*
-           to->name        = NULL;
-           to->name_length = from->name_length;
-           to->constants_updated = 0;
-           to->parent      = NULL;
-         */
-#ifdef ZEND_ENGINE_2
-        to->ce_flags = from->ce_flags;
-        to->num_interfaces = from->num_interfaces;
-        to->interfaces = NULL;
-
-        if (to->num_interfaces > 0) {
-                /* hrak: Allocate the slots which will later be populated by ZEND_ADD_INTERFACE */
-                to->interfaces = (zend_class_entry **) emalloc(sizeof(zend_class_entry *) * to->num_interfaces);
-                memset(to->interfaces, 0, sizeof(zend_class_entry *) * to->num_interfaces);
-        }
-#endif
-
-        if (from->name != NULL) {
@@ -823 +791 @@
-
-#ifdef ZEND_ENGINE_2
+    to->ce_flags = from->ce_flags;
+    to->num_interfaces = from->num_interfaces;
+    to->interfaces = NULL;
-        to->refcount = 1;
-
-        to->line_start = from->line_start;
-        to->line_end = from->line_end;
+    
+    if (to->num_interfaces > 0) {
+        /* hrak: Allocate the slots which will later be populated by ZEND_ADD_INTERFACE */
+        to->interfaces = (zend_class_entry **) emalloc(sizeof(zend_class_entry *) * to->num_interfaces);
+        memset(to->interfaces, 0, sizeof(zend_class_entry *) * to->num_interfaces);
+    }
-#ifdef INCLUDE_DOC_COMMENTS
-        to->doc_comment_len = from->doc_comment_len;
+    if (from->doc_comment != NULL) {
+        to->doc_comment = emalloc(from->doc_comment_len + 1);
+        memcpy(to->doc_comment, from->doc_comment, from->doc_comment_len + 1);
+    }
-#else
-        to->doc_comment_len = 0;
-    to->doc_comment = NULL;
-#endif
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-        /* restore constants table */
@@ -853 +823 @@
-        to->default_properties.pDestructor = ZVAL_PTR_DTOR;
-        /* restore properties */
-
-
+
-        to->properties_info.pDestructor = properties_info_dtor;
-
@@ -891 +860 @@
-        }
-#endif
+
-        if (from->parent != NULL) {
-                restore_class_parent(from->parent, strlen(from->parent), to TSRMLS_CC);
@@ -905 +875 @@
-        restore_class_methods(to TSRMLS_CC);
-#endif
-
+
+
-#ifdef ZEND_ENGINE_2
-                zend_do_inheritance(to, to->parent TSRMLS_CC);
@@ -911 +882 @@
-        zend_do_inheritance(to, to->parent);
-#endif
+    }
-        EAG(class_entry) = old;
-

eaccelerator/trunk/ea_store.c

@@ -191 +191 @@
-                EAG(compress) = 0;
-                for (; opline < end; opline++) {
-/*
-      if (opline->result.op_type == IS_CONST) calc_zval(&opline->result.u.constant  TSRMLS_CC);
-*/
-                        if (opline->op1.op_type == IS_CONST)
-                                calc_zval(&opline->op1.u.constant TSRMLS_CC);
@@ -206 +203 @@
-        }
-#ifdef ZEND_ENGINE_2
-        /* HOESH: try & catch support */
-        if (from->try_catch_array != NULL) {
-                EACCELERATOR_ALIGN(EAG(mem));
@@ -261 +257 @@
-    calc_zval_hash(&from->constants_table);
-        calc_zval_hash(&from->default_properties);
-
-        calc_hash(&from->properties_info, (calc_bucket_t) calc_property_info);
-
@@ -592 +587 @@
-        to->last_try_catch = from->last_try_catch;
-        to->uses_this = from->uses_this;
+    if (from->try_catch_array != NULL) {
+        EACCELERATOR_ALIGN(EAG(mem));
+        to->try_catch_array = (zend_try_catch_element *) EAG(mem);
+        EAG(mem) += sizeof(zend_try_catch_element) * from->last_try_catch;
+        memcpy(to->try_catch_array, from->try_catch_array, sizeof(zend_try_catch_element) * from->last_try_catch);
+    } else {
+        to->last_try_catch = 0;
+    }
-#else
-        to->uses_globals = from->uses_globals;
-#endif
+
-        to->static_variables = from->static_variables;
-        to->return_reference = from->return_reference;
@@ -609 +613 @@
-                EAG(compress) = 0;
-                for (; opline < end; opline++) {
-                        /*
-                           if (opline->result.op_type == IS_CONST) 
-                           store_zval(&opline->result.u.constant TSRMLS_CC);
-                         */
-                        if (opline->op1.op_type == IS_CONST)
-                                store_zval(&opline->op1.u.constant TSRMLS_CC);
@@ -641 +641 @@
-                to->last_brk_cont = 0;
-        }
-
-
-
-
-
-
-
-
-
-
+
-        if (from->static_variables != NULL) {
-                EACCELERATOR_ALIGN(EAG(mem));
@@ -672 +663 @@
-                to->vars = NULL;
-        }
-
-
-
-
-
-
-
-
+
+
+
-    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);
-
-
+
+
+
+
+
+
-        return to;
-}
@@ -698 +688 @@
-        to->name = store_string(from->name, from->name_length + 1 TSRMLS_CC);
-#ifdef ZEND_ENGINE_2_1
-
-
-
+  
+    
+    
-       to->doc_comment = store_string(from->doc_comment, from->doc_comment_len + 1 TSRMLS_CC);
-
-
+    
+  
-        to->doc_comment_len = 0;
-        to->doc_comment = NULL;
@@ -816 +806 @@
-        to->name_length = from->name_length;
-        to->parent = NULL;
-#ifdef ZEND_ENGINE_2
-        to->ce_flags = from->ce_flags;
-        to->static_members = NULL;
-
-        /*
-         * Scan the interfaces looking for the first one which isn't 0
-         * This is the first inherited interface and should not be counted in the stored object
-         */
-        for (i = 0 ; i < from->num_interfaces ; i++) {
-                if (from->interfaces[i] != 0) {
-                        break;
-                }
-        }
-        to->num_interfaces = i;
-        DBG(ea_debug_printf, (EA_DEBUG, "from->num_interfaces=%d, to->num_interfaces=%d\n", from->num_interfaces, to->num_interfaces));
-
-        /*
-         * hrak: no need to really store the interfaces since these get populated
-         * at/after restore by zend_do_inheritance and ZEND_ADD_INTERFACE
-         */
-#endif
-
-        DBG(ea_debug_pad, (EA_DEBUG TSRMLS_CC));
@@ -846 +815 @@
-#endif
-
-
+ {
-                to->name = store_string(from->name, from->name_length + 1 TSRMLS_CC);
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        to->line_start = from->line_start;
-        to->line_end = from->line_end;
@@ -867 +857 @@
-        store_zval_hash(&to->constants_table, &from->constants_table);
-        store_zval_hash(&to->default_properties, &from->default_properties);
-        //store_hash(&to->properties_info, &from->properties_info, (store_bucket_t) store_property_info, NULL, NULL);
-        store_hash(&to->properties_info, &from->properties_info, (store_bucket_t) store_property_info, (check_bucket_t) store_property_access_check, from);
-
-
+
+
+
-                store_zval_hash(&to->default_static_members, &from->default_static_members);
-                EACCELERATOR_ALIGN(EAG(mem));
@@ -877 +867 @@
-                store_hash(to->static_members, from->static_members, (store_bucket_t) store_zval_ptr, (check_bucket_t) store_static_member_access_check, from);
-        } else {
-                /*EACCELERATOR_ALIGN(EAG(mem));
-                to->static_members = (HashTable *) EAG(mem);
-                EAG(mem) += sizeof(HashTable);*/
-                store_hash(&to->default_static_members, &from->default_static_members, (store_bucket_t) store_zval_ptr, (check_bucket_t) store_static_member_access_check, from);
-                to->static_members = &to->default_static_members;
-        }
-
-
-
+
+
-                EACCELERATOR_ALIGN(EAG(mem));
-                to->static_members = (HashTable *) EAG(mem);
@@ -892 +878 @@
-        }       
-#  endif
-
+
+
+
-        store_zval_hash(&to->default_properties, &from->default_properties);
-
-
-
-
-
-
+
-#endif
-
@@ -911 +894 @@
-/* Create a cache entry from the given op_array, functions and classes of a
-   script */
- 
+
-        zend_op_array *op_array, Bucket *f, Bucket *c TSRMLS_DC)
-{
@@ -920 +903 @@
-
-    DBG(ea_debug_pad, (EA_DEBUG TSRMLS_CC));
-
-
-
-
-
+
+
+
+
-    p = (ea_cache_entry *) EAG (mem);
- (mem) += offsetof 
+(mem) += offsetof
-
-    p->nhits = 0;
@@ -933 +915 @@
-    p->f_head = NULL;
-    p->c_head = NULL;
- 
+
-    x = p->realfilename;
- (&EAG (strings), key, len + 1, &x, sizeof 
+(&EAG(strings), key, len + 1, &x, sizeof
-
-    q = NULL;
-    while (c != NULL) {
-        DBG(ea_debug_pad, (EA_DEBUG TSRMLS_CC));
-
-
+
-        DBG(ea_debug_binary_print, (EA_DEBUG, c->arKey, c->nKeyLength));
-
- (EAG 
- 
- (mem) += offsetof 
- 
+(EAG
+
+(mem) += offsetof
+
-        fc->htablen = c->nKeyLength;
-        fc->next = NULL;
@@ -957 +938 @@
-        c = c->pListNext;
-        x = fc->htabkey;
-
-
+
-        if (q == NULL) {
-            p->c_head = fc;
@@ -970 +950 @@
-    while (f != NULL) {
-        DBG(ea_debug_pad, (EA_DEBUG TSRMLS_CC));
-
-
-
-
-
-
-
+
+
+
+
+
+
-        fc->htablen = f->nKeyLength;
-        fc->next = NULL;
@@ -982 +961 @@
-        f = f->pListNext;
-        x = fc->htabkey;
-
-
+
-        if (q == NULL) {
-            p->f_head = fc;
@@ -994 +972 @@
-    q = p->c_head;
-    while (q != NULL) {
- 
+
-        q = q->next;
-    }
@@ -1000 +978 @@
-    q = p->f_head;
-    while (q != NULL) {
- 
+
-        q = q->next;
-    }
- 
-
- (&EAG 
+
+
+(&EAG
-    return p;
-}

eaccelerator/trunk/eaccelerator.c

@@ -803 +803 @@
-    return 0;
-  }
-
+
+
+
+
-  EACCELERATOR_UNPROTECT();
-  EAG(mem) = eaccelerator_malloc(size);
@@ -1361 +1364 @@
-  for (i=0;i<EAG(profile_level);i++)
-    DBG(ea_debug_put, (EA_PROFILE_OPCODES, "  "));
-  ea_debug_printf(EA_DEBUG, "zend_op_array compile: %s (%ld)\n", file_handle->filename, usec);
-  return t;
-}