Changeset 311 for trunk/processor

Timestamp:

12/09/2006 04:27:03 PM (2 years ago)

Author:

moo

Message:

restruct cached compile, add md5 table to recognize and merge file with same content

Location:

trunk/processor

Files:

• dispatch.m4 (modified) (1 diff)
• head.m4 (modified) (11 diffs)
• main.m4 (modified) (2 diffs)
• processor.m4 (modified) (7 diffs)

trunk/processor/dispatch.m4

@@ -23 +23 @@
     , `$1', `xc_entry_type_t',  `PROC_INT(`$2', `d',  `$1')'
     , `$1', `xc_hash_value_t',  `PROC_INT(`$2', `lu', `$1')'
+    , `$1', `xc_md5sum_t',      `/* is copying enough? */COPY(`$2')'
     , `', `', `m4_errprint(`Unknown type "$1"')'
     )

trunk/processor/head.m4

@@ -65 +65 @@
     zend_bool reference; /* enable if to deal with reference */
     zend_bool have_references;
-    const xc_entry_t *xce_src;
-    const xc_entry_t *xce_dst;
+    const xc_entry_data_php_t *php_src;
+    const xc_entry_data_php_t *php_dst;
+    const xc_cache_t          *cache;
     const zend_class_entry *cache_ce;
     zend_uint cache_class_num;
@@ -186 +187 @@
 static zend_ulong xc_get_class_num(xc_processor_t *processor, zend_class_entry *ce) {
     zend_ulong i;
-    const xc_entry_t *xce = processor->xce_src;
+    const xc_entry_data_php_t *php = processor->php_src;
     zend_class_entry *ceptr;
 
@@ -192 +193 @@
         return processor->cache_class_num;
     }
-    for (i = 0; i < xce->data.php->classinfo_cnt; i ++) {
-        ceptr = CestToCePtr(xce->data.php->classinfos[i].cest);
+    for (i = 0; i < php->classinfo_cnt; i ++) {
+        ceptr = CestToCePtr(php->classinfos[i].cest);
         if (ZCEP_REFCOUNT_PTR(ceptr) == ZCEP_REFCOUNT_PTR(ce)) {
             processor->cache_ce = ceptr;
@@ -209 +210 @@
     /* must be parent or currrent class */
     assert(class_num <= processor->active_class_num);
-    return CestToCePtr(processor->xce_dst->data.php->classinfos[class_num - 1].cest);
+    return CestToCePtr(processor->php_dst->classinfos[class_num - 1].cest);
 }
 #endif
@@ -275 +276 @@
 /* }}} */
 dnl ================ export API
-/* export: xc_entry_t *xc_processor_store_xc_entry_t(xc_entry_t *src TSRMLS_DC); :export {{{ */
-xc_entry_t *xc_processor_store_xc_entry_t(xc_entry_t *src TSRMLS_DC) {
-    xc_entry_t *dst;
+define(`DEFINE_STORE_API', `
+/* export: $1 *xc_processor_store_$1($1 *src TSRMLS_DC); :export {{{ */
+$1 *xc_processor_store_$1($1 *src TSRMLS_DC) {
+    $1 *dst;
     xc_processor_t processor;
 
     memset(&processor, 0, sizeof(processor));
     processor.reference = 1;
+    processor.cache = src->cache;
 
     IFASSERT(`xc_stack_init(&processor.allocsizes);')
@@ -295 +298 @@
         processor.size = ALIGN(processor.size + sizeof(src[0]));
 
-        xc_calc_xc_entry_t(&processor, src TSRMLS_CC);
+        xc_calc_$1(&processor, src TSRMLS_CC);
         if (processor.reference) {
             zend_hash_destroy(&processor.zvalptrs);
@@ -302 +305 @@
     }
     src->size = processor.size;
-    src->have_references = processor.have_references;
+    ifelse(`$1', `xc_entry_t', `
+        src->data.var->have_references = processor.have_references;
+    ', `
+        src->have_references = processor.have_references;
+    ')
 
     IFASSERT(`xc_stack_reverse(&processor.allocsizes);')
@@ -314 +321 @@
 
         /* mem :) */
-        processor.p = (char *) src->cache->mem->handlers->malloc(src->cache->mem, processor.size);
+        processor.p = (char *) processor.cache->mem->handlers->malloc(processor.cache->mem, processor.size);
         if (processor.p == NULL) {
             dst = NULL;
@@ -323 +330 @@
 
         /* allocate */
-        dst = (xc_entry_t *) processor.p;
+        dst = ($1 *) processor.p;
         processor.p = (char *) ALIGN(processor.p + sizeof(dst[0]));
 
-        xc_store_xc_entry_t(&processor, dst, src TSRMLS_CC);
+        xc_store_$1(&processor, dst, src TSRMLS_CC);
         IFASSERT(` {
             int real = processor.p - oldp;
@@ -348 +355 @@
 }
 /* }}} */
-/* export: xc_entry_t *xc_processor_restore_xc_entry_t(xc_entry_t *dst, const xc_entry_t *src, zend_bool readonly_protection TSRMLS_DC); :export {{{ */
-xc_entry_t *xc_processor_restore_xc_entry_t(xc_entry_t *dst, const xc_entry_t *src, zend_bool readonly_protection TSRMLS_DC) {
+')
+DEFINE_STORE_API(`xc_entry_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) {
+    xc_processor_t processor;
+
+    memset(&processor, 0, sizeof(processor));
+    xc_restore_xc_entry_t(&processor, dst, src TSRMLS_CC);
+
+    return dst;
+}
+/* }}} */
+/* export: xc_entry_data_php_t *xc_processor_restore_xc_entry_data_php_t(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(xc_entry_data_php_t *dst, const xc_entry_data_php_t *src, zend_bool readonly_protection TSRMLS_DC) {
     xc_processor_t processor;
 
     memset(&processor, 0, sizeof(processor));
     processor.readonly_protection = readonly_protection;
+    /* this function is used for php data only */
     if (src->have_references) {
         processor.reference = 1;
@@ -361 +382 @@
         zend_hash_init(&processor.zvalptrs, 0, NULL, NULL, 0);
     }
-    xc_restore_xc_entry_t(&processor, dst, src TSRMLS_CC);
+    xc_restore_xc_entry_data_php_t(&processor, dst, src TSRMLS_CC);
     if (processor.reference) {
         zend_hash_destroy(&processor.zvalptrs);

trunk/processor/main.m4

@@ -136 +136 @@
 define(`FIXPOINTER', `FIXPOINTER_EX(`$1', `dst->$2')')
 define(`FIXPOINTER_EX', `IFSTORE(`
-    $2 = ($1 *) processor->xce_src->cache->shm->handlers->to_readonly(processor->xce_src->cache->shm, (char *)$2);
+    $2 = ($1 *) processor->cache->shm->handlers->to_readonly(processor->cache->shm, (char *)$2);
 ')')
 define(`UNFIXPOINTER', `UNFIXPOINTER_EX(`$1', `dst->$2')')
 define(`UNFIXPOINTER_EX', `IFSTORE(`
-    $2 = ($1 *) processor->xce_src->cache->shm->handlers->to_readwrite(processor->xce_src->cache->shm, (char *)$2);
+    $2 = ($1 *) processor->cache->shm->handlers->to_readwrite(processor->cache->shm, (char *)$2);
 ')')
 dnl }}}
 dnl {{{ COPY
 define(`COPY', `IFNOTMEMCPY(`IFCOPY(`dst->$1 = src->$1;')')DONE(`$1')')
+dnl }}}
+dnl {{{ COPYPOINTER
+define(`COPYPOINTER', `COPY(`$1')')
+dnl }}}
+dnl {{{ COPYARRAY
+define(`COPYARRAY', `IFNOTMEMCPY(`IFCOPY(`memcpy(dst->$1, src->$1, sizeof(dst->$1));')')DONE(`$1')')
 dnl }}}
 dnl {{{ SETNULL_EX
@@ -223 +229 @@
 EXPORT(`xc_funcinfo_t')
 EXPORT(`xc_entry_t')
+EXPORT(`xc_entry_data_php_t')
 EXPORT(`zval')
 

trunk/processor/processor.m4

@@ -479 +479 @@
     dnl readonly_protection=on
     dnl main op_array && have early binding
-    if (!processor->readonly_protection && !(src == processor->xce_src->data.php->op_array && processor->xce_src->data.php->have_early_binding)) {
+    if (!processor->readonly_protection && !(src == processor->php_src->op_array && processor->php_src->have_early_binding)) {
         /* really fast shallow copy */
         memcpy(dst, src, sizeof(src[0]));
@@ -719 +719 @@
     zend_uint i;
 
-#ifdef HAVE_INODE
-    DISPATCH(int, device)
-    DISPATCH(int, inode)
-#endif
+    IFCOPY(`
+        processor->php_dst = dst;
+        processor->php_src = src;
+    ')
+
+    DISPATCH(xc_hash_value_t, hvalue)
+    /* skip */
+    DONE(next)
+    COPY(cache)
+    DISPATCH(xc_md5sum_t, md5)
+    DISPATCH(zend_ulong, refcount)
+
     DISPATCH(size_t, sourcesize)
-
-    DISPATCH(time_t, mtime)
+    DISPATCH(zend_ulong, hits)
+    DISPATCH(size_t, size)
 
     STRUCT_P(zend_op_array, op_array)
@@ -750 +758 @@
     DISPATCH(zend_bool, have_early_binding)
     popdef(`BEFORE_LOOP')
+    DISPATCH(zend_bool, have_references)
 ')
 dnl }}}
@@ -755 +764 @@
     IFDPRINT(`INDENT()`'fprintf(stderr, "zval:value");')
     STRUCT_P_EX(zval_ptr, dst->value, src->value, `value', `', `&')
+    DISPATCH(zend_bool, have_references)
     DONE(value)
 ')
@@ -760 +770 @@
 dnl {{{ xc_entry_t
 DEF_STRUCT_P_FUNC(`xc_entry_t', , `
-    IFCOPY(`
-        processor->xce_dst = dst;
-        processor->xce_src = src;
-    ')
     DISPATCH(xc_entry_type_t, type)
     DISPATCH(size_t, size)
@@ -809 +815 @@
         switch (src->type) {
         case XC_TYPE_PHP:
-            STRUCT_P(xc_entry_data_php_t, data.php)
+            IFCALCCOPY(`DONE(data.php)', `STRUCT_P(xc_entry_data_php_t, data.php)')
             break;
+
         case XC_TYPE_VAR:
             STRUCT_P(xc_entry_data_var_t, data.var)
             break;
+
         default:
             assert(0);
@@ -820 +828 @@
     DONE(data)
     dnl }}}
-    DISPATCH(zend_bool, have_references)
+    DISPATCH(time_t, mtime)
+#ifdef HAVE_INODE
+    DISPATCH(int, device)
+    DISPATCH(int, inode)
+#endif
 ')
 dnl }}}