Changeset 992

Timestamp:

2012-07-18T10:00:28+02:00 (10 months ago)

Author:

moo

Message:

refactor mshutdown minit

Location:

trunk

Files:

• submodules/xc_coverager.c (modified) (2 diffs)
• submodules/xc_coverager.h (modified) (1 diff)
• xcache.c (modified) (2 diffs)
• xcache/xc_sandbox.c (modified) (3 diffs)
• xcache/xc_sandbox.h (modified) (1 diff)
• xcache/xc_utils.h (modified) (1 diff)

trunk/submodules/xc_coverager.c

@@ -469 +469 @@
 /* }}} */
 
-/* init/destroy */
-int xc_coverager_init(int module_number TSRMLS_DC) /* {{{ */
+/* MINIT/MSHUTDOWN */
+int xc_coverager_module_init(int module_number TSRMLS_DC) /* {{{ */
 {
     old_compile_file = zend_compile_file;
@@ -493 +493 @@
 }
 /* }}} */
-void xc_coverager_destroy() /* {{{ */
+void xc_coverager_module_shutdown() /* {{{ */
 {
     if (old_compile_file == xc_compile_file_for_coverage) {

trunk/submodules/xc_coverager.h

@@ -3 +3 @@
 
 void xc_coverager_handle_ext_stmt(zend_op_array *op_array, zend_uchar op);
-int xc_coverager_init(int module_number TSRMLS_DC);
-void xc_coverager_destroy();
+int xc_coverager_module_init(int module_number TSRMLS_DC);
+void xc_coverager_module_shutdown();
 void xc_coverager_request_init(TSRMLS_D);
 void xc_coverager_request_shutdown(TSRMLS_D);

trunk/xcache.c

@@ -3940 +3940 @@
     }
 
-    xc_util_init(module_number TSRMLS_CC);
+    xc_sandbox_module_init(module_number TSRMLS_CC);
 #ifdef HAVE_XCACHE_COVERAGER
-    xc_coverager_init(module_number TSRMLS_CC);
+    xc_coverager_module_init(module_number TSRMLS_CC);
 #endif
 
@@ -3955 +3955 @@
 {
 #ifdef HAVE_XCACHE_COVERAGER
-    xc_coverager_destroy();
-#endif
-    xc_util_destroy();
+    xc_coverager_module_shutdown();
+#endif
+    xc_sandbox_module_shutdown();
 
     if (xc_initized) {

trunk/xcache/xc_sandbox.c

@@ -434 +434 @@
 #endif
 
-/* init/destroy */
-int xc_util_init(int module_number TSRMLS_DC) /* {{{ */
+/* MINIT/MSHUTDOWN */
+int xc_sandbox_module_init(int module_number TSRMLS_DC) /* {{{ */
 {
 #ifdef XCACHE_ERROR_CACHING
@@ -445 +445 @@
 }
 /* }}} */
-void xc_util_destroy() /* {{{ */
+void xc_sandbox_module_shutdown() /* {{{ */
 {
 #ifdef XCACHE_ERROR_CACHING
@@ -454 +454 @@
 }
 /* }}} */
-

trunk/xcache/xc_sandbox.h

@@ -8 +8 @@
 /* Purpose: run specified function in compiler sandbox, restore everything to previous state after it returns
  */
+
+int xc_sandbox_module_init(int module_number TSRMLS_DC);
+void xc_sandbox_module_shutdown();
 
 /* return op_array to install */

trunk/xcache/xc_utils.h

@@ -1 +1 @@
 #include "php.h"
 #include "xcache.h"
-
-int xc_util_init(int module_number TSRMLS_DC);
-void xc_util_destroy();
 
 typedef struct {