Changeset 1480


Ignore:
Timestamp:
2013-12-13T08:39:33+01:00 (12 months ago)
Author:
moo
Message:

MFT, fixed #333: reduce memory usage for small or empty files

Location:
branches/3.2
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/3.2

    • Property svn:mergeinfo changed
      /trunkmerged: 1478
  • branches/3.2/ChangeLog

    r1434 r1480  
     13.2.0 2013-??-?? 
     2ChangeLog 
     3======== 
     4 * cacher: 
     5   * fixed #333: reduce memory usage for small or empty files 
     6 
    173.1.1 2013-??-?? 
    28ChangeLog 
  • branches/3.2/NEWS

    r1434 r1480  
     13.2.1 2013-??-?? 
     2======== 
     3 
    143.1.1 2013-??-?? 
     5======== 
    26 * compatible with bcompiler 
    37 
  • branches/3.2/mod_cacher/xc_cacher.c

    r1433 r1480  
    824824    } 
    825825    CG(zend_lineno) = 0; 
    826 #endif 
    827  
    828     i = 1; 
    829 #ifndef ZEND_ENGINE_2_2 
    830     zend_hash_add(&EG(included_files), entry_php->entry.name.str.val, entry_php->entry.name.str.len+1, (void *)&i, sizeof(int), NULL); 
    831826#endif 
    832827 
     
    21472142    /* found entry */ 
    21482143    if (stored_entry && stored_php) { 
    2149         zend_llist_add_element(&CG(open_files), h); 
    21502144        return xc_compile_restore(stored_entry, stored_php TSRMLS_CC); 
    21512145    } 
  • branches/3.2/processor/processor.m4

    r1406 r1480  
    751751        STRUCT_P(HashTable, static_variables, HashTable_zval_ptr) 
    752752#ifdef ZEND_ENGINE_2 
    753         STRUCT_ARRAY(zend_uint, num_args, zend_arg_info, arg_info) 
    754         gc_arg_info = 1; 
     753        if (SRC(`arg_info')) { 
     754            gc_arg_info = 1; 
     755            STRUCT_ARRAY(zend_uint, num_args, zend_arg_info, arg_info) 
     756        } 
    755757#endif 
    756758        DST(`filename') = processor->entry_php_src->filepath; 
    757 #ifdef ZEND_ENGINE_2_4 
    758         if (SRC(`literals')) { 
     759 
     760#ifdef ZEND_ENGINE_2_4 
     761        if (SRC(`literals') && op_array_info->literalinfo_cnt) { 
    759762            gc_opcodes = 1; 
    760             if (op_array_info->literalinfo_cnt) { 
    761                 gc_literals = 1; 
    762             } 
     763            gc_literals = 1; 
    763764        } 
    764765#else 
     
    767768        } 
    768769#endif 
     770 
    769771#ifdef ZEND_ENGINE_2_4 
    770772        if (gc_literals) { 
Note: See TracChangeset for help on using the changeset viewer.