Changeset 851 for trunk/processor/processor.m4

Timestamp:

2012-03-27T18:07:50+02:00 (14 months ago)

Author:

moo

Message:

more readability cache property. reduce memory footprint for data caching

File:

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

trunk/processor/processor.m4

@@ -431 +431 @@
 #   ifdef ZEND_ENGINE_2_4
     DISABLECHECK(`
-    IFRESTORE(`dst->info.user.filename = processor->entry_src->filepath;', `PROC_STRING(info.user.filename)')
+    IFRESTORE(`dst->info.user.filename = processor->entry_php_src->filepath;', `PROC_STRING(info.user.filename)')
     PROCESS(zend_uint, info.user.line_start)
     PROCESS(zend_uint, info.user.line_end)
@@ -439 +439 @@
     DONE(info)
 #   else
-    IFRESTORE(`dst->filename = processor->entry_src->filepath;DONE(filename)', `PROC_STRING(filename)')
+    IFRESTORE(`dst->filename = processor->entry_php_src->filepath;DONE(filename)', `PROC_STRING(filename)')
     PROCESS(zend_uint, line_start)
     PROCESS(zend_uint, line_end)
@@ -709 +709 @@
         gc_arg_info = 1;
 #endif
-        dst->filename = processor->entry_src->filepath;
+        dst->filename = processor->entry_php_src->filepath;
 #ifdef ZEND_ENGINE_2_4
         if (src->literals /* || op_array_info->literalsinfo_cnt */) {
@@ -886 +886 @@
 #endif
 
-    IFRESTORE(`dst->filename = processor->entry_src->filepath;DONE(filename)', `PROC_STRING(filename)')
+    IFRESTORE(`dst->filename = processor->entry_php_src->filepath;DONE(filename)', `PROC_STRING(filename)')
 #ifdef IS_UNICODE
     IFRESTORE(`
@@ -914 +914 @@
 #endif
     } while (0);
-    IFRESTORE(`xc_fix_op_array_info(processor->entry_src, processor->php_src, dst, shallow_copy, op_array_info TSRMLS_CC);')
+    IFRESTORE(`xc_fix_op_array_info(processor->entry_php_src, processor->php_src, dst, shallow_copy, op_array_info TSRMLS_CC);')
 
 #ifdef ZEND_ENGINE_2
@@ -1074 +1074 @@
     PROCESS(zend_ulong, refcount)
 
-    PROCESS(size_t, sourcesize)
+    PROCESS(size_t, file_size)
     PROCESS(zend_ulong, hits)
     PROCESS(size_t, size)
@@ -1127 +1127 @@
 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)
-
-    PROCESS(xc_hash_value_t, hvalue)
-    COPY(cache)
-    /* skip */
-    DONE(next)
-
-    IFSTORE(`dst->refcount = 0; DONE(refcount)', `PROCESS(long, refcount)')
 
     PROCESS(time_t, ctime)
@@ -1176 +1173 @@
 
         case XC_TYPE_VAR:
-            STRUCT_P(xc_entry_data_var_t, data.var)
+            STRUCT(xc_entry_data_var_t, data.var)
             break;
 
@@ -1185 +1182 @@
     DONE(data)
     dnl }}}
-    PROCESS(time_t, mtime)
+')
+dnl }}}
+DEF_STRUCT_P_FUNC(`xc_entry_php_t', , `dnl {{{
+    STRUCT(xc_entry_t, entry)
+
+    IFSTORE(`dst->refcount = 0; DONE(refcount)', `PROCESS(long, refcount)')
+    PROCESS(time_t, file_mtime)
 #ifdef HAVE_INODE
-    PROCESS(int, device)
-    PROCESS(int, inode)
-#endif
-
-    if (src->type == XC_TYPE_PHP) {
+    PROCESS(int, file_device)
+    PROCESS(int, file_inode)
+#endif
+
+    if (src->entry.type == XC_TYPE_PHP) {
         PROCESS(int, filepath_len)
         IFRESTORE(`COPY(filepath)', `PROC_STRING_L(filepath, filepath_len)')