Changeset 851 for trunk/processor/head.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/head.m4 (modified) (7 diffs)

trunk/processor/head.m4

@@ -82 +82 @@
     zend_bool reference; /* enable if to deal with reference */
     zend_bool have_references;
-    const xc_entry_t *entry_src;
-    const xc_entry_t *entry_dst;
+    const xc_entry_php_t *entry_php_src;
+    const xc_entry_php_t *entry_php_dst;
     const xc_entry_data_php_t *php_src;
     const xc_entry_data_php_t *php_dst;
@@ -396 +396 @@
     memset(&processor, 0, sizeof(processor));
     processor.reference = 1;
-    processor.cache = src->cache;
+    processor.cache = src->ifelse(`$1', `xc_entry_php_t', entry.)cache;
 
     IFASSERT(`xc_stack_init(&processor.allocsizes);')
@@ -416 +416 @@
         zend_hash_destroy(&processor.strings);
     }
-    src->size = processor.size;
-    ifelse(`$1', `xc_entry_t', `
-        src->data.var->have_references = processor.have_references;
-    ', `
-        src->have_references = processor.have_references;
-    ')
+    src->ifelse(`$1', `xc_entry_php_t', entry.)size = processor.size;
+    ifelse(
+        `$1', `xc_entry_t', `src->data.var.have_references = processor.have_references;',
+        `$1', `xc_entry_data_php_t', `src->have_references = processor.have_references;'
+    )
 
     IFASSERT(`xc_stack_reverse(&processor.allocsizes);')
@@ -469 +468 @@
 ')
 DEFINE_STORE_API(`xc_entry_t')
+DEFINE_STORE_API(`xc_entry_php_t')
 DEFINE_STORE_API(`xc_entry_data_php_t')
-/* export: xc_entry_t *xc_processor_restore_xc_entry_t(xc_entry_t *dst, const xc_entry_t *src TSRMLS_DC); :export {{{ */
-xc_entry_t *xc_processor_restore_xc_entry_t(xc_entry_t *dst, const xc_entry_t *src TSRMLS_DC) {
+/* export: xc_entry_php_t *xc_processor_restore_xc_entry_php_t(xc_entry_php_t *dst, const xc_entry_php_t *src TSRMLS_DC); :export {{{ */
+xc_entry_php_t *xc_processor_restore_xc_entry_php_t(xc_entry_php_t *dst, const xc_entry_php_t *src TSRMLS_DC) {
     xc_processor_t processor;
 
     memset(&processor, 0, sizeof(processor));
-    xc_restore_xc_entry_t(&processor, dst, src TSRMLS_CC);
+    xc_restore_xc_entry_php_t(&processor, dst, src TSRMLS_CC);
 
     return dst;
 }
 /* }}} */
-/* export: xc_entry_data_php_t *xc_processor_restore_xc_entry_data_php_t(const xc_entry_t *xce, xc_entry_data_php_t *dst, const xc_entry_data_php_t *src, zend_bool readonly_protection TSRMLS_DC); :export {{{ */
-xc_entry_data_php_t *xc_processor_restore_xc_entry_data_php_t(const xc_entry_t *xce, xc_entry_data_php_t *dst, const xc_entry_data_php_t *src, zend_bool readonly_protection TSRMLS_DC) {
+/* export: xc_entry_data_php_t *xc_processor_restore_xc_entry_data_php_t(const xc_entry_php_t *xce, xc_entry_data_php_t *dst, const xc_entry_data_php_t *src, zend_bool readonly_protection TSRMLS_DC); :export {{{ */
+xc_entry_data_php_t *xc_processor_restore_xc_entry_data_php_t(const xc_entry_php_t *xce, xc_entry_data_php_t *dst, const xc_entry_data_php_t *src, zend_bool readonly_protection TSRMLS_DC) {
     xc_processor_t processor;
 
@@ -490 +490 @@
         processor.reference = 1;
     }
-    processor.entry_src = xce;
+    processor.entry_php_src = xce;
 
     if (processor.reference) {
@@ -499 +499 @@
         zend_hash_destroy(&processor.zvalptrs);
     }
+    return dst;
+}
+/* }}} */
+/* export: xc_entry_t *xc_processor_restore_xc_entry_t(xc_entry_t *dst, const xc_entry_t *src TSRMLS_DC); :export {{{ */
+xc_entry_t *xc_processor_restore_xc_entry_t(xc_entry_t *dst, const xc_entry_t *src TSRMLS_DC) {
+    xc_processor_t processor;
+
+    memset(&processor, 0, sizeof(processor));
+    xc_restore_xc_entry_t(&processor, dst, src TSRMLS_CC);
+
     return dst;
 }
@@ -522 +532 @@
 }
 /* }}} */
-/* export: void xc_dprint(xc_entry_t *src, int indent TSRMLS_DC); :export {{{ */
+/* export: void xc_dprint(xc_entry_php_t *src, int indent TSRMLS_DC); :export {{{ */
 #ifdef HAVE_XCACHE_DPRINT
-void xc_dprint(xc_entry_t *src, int indent TSRMLS_DC) {
+void xc_dprint(xc_entry_php_t *src, int indent TSRMLS_DC) {
     IFDPRINT(`INDENT()`'fprintf(stderr, "xc_entry_t:src");')
     xc_dprint_xc_entry_t(src, indent TSRMLS_CC);