Changeset 1135 in svn for trunk/xcache/xc_shm_mmap.c


Ignore:
Timestamp:
2012-08-09T09:04:02Z (3 years ago)
Author:
Xuefer
Message:

refactor: s/mem/allocator/

Location:
trunk
Files:
2 edited

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/xcache/xc_shm_mmap.c

    r983 r1135  
    295295static XC_SHM_MEMINIT(xc_mmap_meminit) /* {{{ */
    296296{
    297     xc_mem_t *mem;
     297    void *mem;
    298298    if (shm->memoffset + size > shm->size) {
    299299        zend_error(E_ERROR, "XCache: internal error at %s#%d", __FILE__, __LINE__);
    300300        return NULL;
    301301    }
    302     mem = (xc_mem_t *) PTR_ADD(shm->ptr, shm->memoffset);
     302    mem = PTR_ADD(shm->ptr, shm->memoffset);
    303303    shm->memoffset += size;
    304     mem->handlers = shm->handlers->memhandlers;
    305     mem->handlers->init(shm, mem, size);
    306304    return mem;
    307305}
     
    315313void xc_shm_mmap_register() /* {{{ */
    316314{
    317     CHECK(xc_shm_mmap_handlers.memhandlers = xc_mem_scheme_find("mem"), "cannot find mem handlers");
    318315    if (xc_shm_scheme_register("mmap", &xc_shm_mmap_handlers) == 0) {
    319316        zend_error(E_ERROR, "XCache: failed to register mmap shm_scheme");
    320317    }
    321 err:
    322318    return;
    323319}
Note: See TracChangeset for help on using the changeset viewer.