Changeset 992


Ignore:
Timestamp:
2012-07-18T10:00:28+02:00 (22 months ago)
Author:
moo
Message:

refactor mshutdown minit

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/submodules/xc_coverager.c

    r982 r992  
    469469/* }}} */ 
    470470 
    471 /* init/destroy */ 
    472 int xc_coverager_init(int module_number TSRMLS_DC) /* {{{ */ 
     471/* MINIT/MSHUTDOWN */ 
     472int xc_coverager_module_init(int module_number TSRMLS_DC) /* {{{ */ 
    473473{ 
    474474    old_compile_file = zend_compile_file; 
     
    493493} 
    494494/* }}} */ 
    495 void xc_coverager_destroy() /* {{{ */ 
     495void xc_coverager_module_shutdown() /* {{{ */ 
    496496{ 
    497497    if (old_compile_file == xc_compile_file_for_coverage) { 
  • trunk/submodules/xc_coverager.h

    r982 r992  
    33 
    44void xc_coverager_handle_ext_stmt(zend_op_array *op_array, zend_uchar op); 
    5 int xc_coverager_init(int module_number TSRMLS_DC); 
    6 void xc_coverager_destroy(); 
     5int xc_coverager_module_init(int module_number TSRMLS_DC); 
     6void xc_coverager_module_shutdown(); 
    77void xc_coverager_request_init(TSRMLS_D); 
    88void xc_coverager_request_shutdown(TSRMLS_D); 
  • trunk/xcache.c

    r987 r992  
    39403940    } 
    39413941 
    3942     xc_util_init(module_number TSRMLS_CC); 
     3942    xc_sandbox_module_init(module_number TSRMLS_CC); 
    39433943#ifdef HAVE_XCACHE_COVERAGER 
    3944     xc_coverager_init(module_number TSRMLS_CC); 
     3944    xc_coverager_module_init(module_number TSRMLS_CC); 
    39453945#endif 
    39463946 
     
    39553955{ 
    39563956#ifdef HAVE_XCACHE_COVERAGER 
    3957     xc_coverager_destroy(); 
    3958 #endif 
    3959     xc_util_destroy(); 
     3957    xc_coverager_module_shutdown(); 
     3958#endif 
     3959    xc_sandbox_module_shutdown(); 
    39603960 
    39613961    if (xc_initized) { 
  • trunk/xcache/xc_sandbox.c

    r991 r992  
    434434#endif 
    435435 
    436 /* init/destroy */ 
    437 int xc_util_init(int module_number TSRMLS_DC) /* {{{ */ 
     436/* MINIT/MSHUTDOWN */ 
     437int xc_sandbox_module_init(int module_number TSRMLS_DC) /* {{{ */ 
    438438{ 
    439439#ifdef XCACHE_ERROR_CACHING 
     
    445445} 
    446446/* }}} */ 
    447 void xc_util_destroy() /* {{{ */ 
     447void xc_sandbox_module_shutdown() /* {{{ */ 
    448448{ 
    449449#ifdef XCACHE_ERROR_CACHING 
     
    454454} 
    455455/* }}} */ 
    456  
  • trunk/xcache/xc_sandbox.h

    r991 r992  
    88/* Purpose: run specified function in compiler sandbox, restore everything to previous state after it returns 
    99 */ 
     10 
     11int xc_sandbox_module_init(int module_number TSRMLS_DC); 
     12void xc_sandbox_module_shutdown(); 
    1013 
    1114/* return op_array to install */ 
  • trunk/xcache/xc_utils.h

    r991 r992  
    11#include "php.h" 
    22#include "xcache.h" 
    3  
    4 int xc_util_init(int module_number TSRMLS_DC); 
    5 void xc_util_destroy(); 
    63 
    74typedef struct { 
Note: See TracChangeset for help on using the changeset viewer.