Show
Ignore:
Timestamp:
08/09/2012 11:04:02 AM (10 months ago)
Author:
moo
Message:

refactor: s/mem/allocator/

Location:
trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        11acinclude.m4 
        22aclocal.m4 
         3allocator_test 
        34autom4te.cache 
        45build 
        … …  
        1617conftest.c 
        1718.deps 
         19devel.fpm 
        1820devel.ini 
        1921devel.php 
        20 devel.fpm 
        2122.gdb_history 
        2223include 

  • trunk/processor/head.m4

    r1132 r1135  
    1414/* export: #include "mod_cacher/xc_cache.h" :export */ 
    1515#include "mod_cacher/xc_cache.h" 
    16 #include "util/xc_align.h" 
     16/* export: #include "xcache/xc_shm.h" :export */ 
     17#include "xcache/xc_shm.h" 
     18/* export: #include "xcache/xc_allocator.h" :export */ 
     19#include "xcache/xc_allocator.h" 
    1720#include "xcache/xc_const_string.h" 
    1821#include "xcache/xc_utils.h" 
     22#include "util/xc_align.h" 
    1923#include "xc_processor.h" 
    2024#include "xcache_globals.h" 
    … …  
    9599    const xc_entry_data_php_t *php_dst; 
    96100    xc_shm_t                  *shm; 
    97     xc_mem_t                  *mem; 
     101    xc_allocator_t            *allocator; 
    98102    const zend_class_entry *cache_ce; 
    99103    zend_uint cache_class_index; 
    … …  
    395399dnl ================ export API 
    396400define(`DEFINE_STORE_API', ` 
    397 /* export: $1 *xc_processor_store_$1(xc_shm_t *shm, xc_mem_t *mem, $1 *src TSRMLS_DC); :export {{{ */ 
    398 $1 *xc_processor_store_$1(xc_shm_t *shm, xc_mem_t *mem, $1 *src TSRMLS_DC) { 
     401/* export: $1 *xc_processor_store_$1(xc_shm_t *shm, xc_allocator_t *allocator, $1 *src TSRMLS_DC); :export {{{ */ 
     402$1 *xc_processor_store_$1(xc_shm_t *shm, xc_allocator_t *allocator, $1 *src TSRMLS_DC) { 
    399403    $1 *dst; 
    400404    xc_processor_t processor; 
    … …  
    403407    processor.reference = 1; 
    404408    processor.shm = shm; 
    405     processor.mem = mem; 
     409    processor.allocator = allocator; 
    406410 
    407411    IFAUTOCHECK(`xc_stack_init(&processor.allocsizes);') 
    … …  
    440444        } 
    441445 
    442         /* mem :) */ 
    443         processor.p = (char *) processor.mem->handlers->malloc(processor.mem, processor.size); 
     446        /* allocator :) */ 
     447        processor.p = (char *) processor.allocator->vtable->malloc(processor.allocator, processor.size); 
    444448        if (processor.p == NULL) { 
    445449            dst = NULL;