Changeset 854 for trunk/processor/processor.m4

Timestamp:

03/28/2012 10:48:20 AM (14 months ago)

Author:

moo

Message:

remove type/cache/hvalue from cached copy to reduce memory usage a little bit

Files:

• trunk/processor/processor.m4 (modified) (4 diffs)

trunk/processor/processor.m4

@@ -1067 +1067 @@
     ')
 
-    PROCESS(xc_hash_value_t, hvalue)
     /* skip */
     DONE(next)
-    COPY(cache)
+    PROCESS(xc_hash_value_t, hvalue)
     PROCESS(xc_md5sum_t, md5)
     PROCESS(zend_ulong, refcount)
@@ -1119 +1118 @@
 ')
 dnl }}}
-DEF_STRUCT_P_FUNC(`xc_entry_data_var_t', , `dnl {{{
-    IFDPRINT(`INDENT()`'fprintf(stderr, "zval:value");')
-    STRUCT_P_EX(zval_ptr, dst->value, src->value, `value', `', `&')
-    PROCESS(zend_bool, have_references)
-    DONE(value)
-')
-dnl }}}
 DEF_STRUCT_P_FUNC(`xc_entry_t', , `dnl {{{
-    PROCESS(xc_hash_value_t, hvalue)
     /* skip */
     DONE(next)
-    COPY(cache)
-    PROCESS(xc_entry_type_t, type)
     PROCESS(size_t, size)
 
@@ -1164 +1153 @@
     DONE(name)
     dnl }}}
-
-    dnl {{{ data
-    DISABLECHECK(`
-        switch (src->type) {
-        case XC_TYPE_PHP:
-            IFCALCCOPY(`COPY(data.php)', `STRUCT_P(xc_entry_data_php_t, data.php)')
-            break;
-
-        case XC_TYPE_VAR:
-            STRUCT(xc_entry_data_var_t, data.var)
-            break;
-
-        default:
-            assert(0);
-        }
-    ')
-    DONE(data)
-    dnl }}}
 ')
 dnl }}}
 DEF_STRUCT_P_FUNC(`xc_entry_php_t', , `dnl {{{
     STRUCT(xc_entry_t, entry)
+    IFCALCCOPY(`COPY(php)', `STRUCT_P(xc_entry_data_php_t, php)')
 
     IFSTORE(`dst->refcount = 0; DONE(refcount)', `PROCESS(long, refcount)')
@@ -1194 +1166 @@
 #endif
 
-    if (src->entry.type == XC_TYPE_PHP) {
-        PROCESS(int, filepath_len)
-        IFRESTORE(`COPY(filepath)', `PROC_STRING_L(filepath, filepath_len)')
-        PROCESS(int, dirpath_len)
-        IFRESTORE(`COPY(dirpath)', `PROC_STRING_L(dirpath, dirpath_len)')
+    PROCESS(int, filepath_len)
+    IFRESTORE(`COPY(filepath)', `PROC_STRING_L(filepath, filepath_len)')
+    PROCESS(int, dirpath_len)
+    IFRESTORE(`COPY(dirpath)', `PROC_STRING_L(dirpath, dirpath_len)')
 #ifdef IS_UNICODE
-        PROCESS(int, ufilepath_len)
-        IFRESTORE(`COPY(ufilepath)', `PROC_USTRING_L(ufilepath, ufilepath_len)')
-        PROCESS(int, udirpath_len)
-        IFRESTORE(`COPY(udirpath)', `PROC_USTRING_L(udirpath, udirpath_len)')
-#endif
-    }
-    else {
-        DONE(filepath_len)
-        DONE(filepath)
-        DONE(dirpath_len)
-        DONE(dirpath)
-#ifdef IS_UNICODE
-        DONE(ufilepath_len)
-        DONE(ufilepath)
-        DONE(udirpath_len)
-        DONE(udirpath)
-#endif
-    }
+    PROCESS(int, ufilepath_len)
+    IFRESTORE(`COPY(ufilepath)', `PROC_USTRING_L(ufilepath, ufilepath_len)')
+    PROCESS(int, udirpath_len)
+    IFRESTORE(`COPY(udirpath)', `PROC_USTRING_L(udirpath, udirpath_len)')
+#endif
+')
+dnl }}}
+DEF_STRUCT_P_FUNC(`xc_entry_var_t', , `dnl {{{
+    STRUCT(xc_entry_t, entry)
+
+    IFDPRINT(`INDENT()`'fprintf(stderr, "zval:value");')
+    STRUCT_P_EX(zval_ptr, dst->value, src->value, `value', `', `&')
+    PROCESS(zend_bool, have_references)
+    DONE(value)
 ')
 dnl }}}