Changeset 1117 for trunk/mod_coverager/xc_coverager.c

Timestamp:

2012-08-02T08:27:41+02:00 (10 months ago)

Author:

moo

Message:

fixed #39: ini_set never work for xcache.coverager setting

File:

• trunk/mod_coverager/xc_coverager.c (modified) (6 diffs)

trunk/mod_coverager/xc_coverager.c

@@ -245 +245 @@
 static void xc_coverager_enable(TSRMLS_D) /* {{{ */
 {
-    XG(coverage_enabled) = 1;
+    XG(coverager_enabled) = 1;
 }
 /* }}} */
 static void xc_coverager_disable(TSRMLS_D) /* {{{ */
 {
-    XG(coverage_enabled) = 0;
+    XG(coverager_enabled) = 0;
 }
 /* }}} */
@@ -257 +257 @@
 {
     if (XG(coverager)) {
-        xc_coverager_enable(TSRMLS_C);
+        if (XG(coverager_autostart)) {
+            xc_coverager_enable(TSRMLS_C);
+        }
 #ifdef ZEND_COMPILE_EXTENDED_INFO
         CG(compiler_options) |= ZEND_COMPILE_EXTENDED_INFO;
@@ -265 +267 @@
     }
     else {
-        XG(coverage_enabled) = 0;
+        XG(coverager_enabled) = 0;
     }
     return SUCCESS;
@@ -469 +471 @@
     TSRMLS_FETCH();
 
-    if (XG(coverages) && XG(coverage_enabled)) {
+    if (XG(coverages) && XG(coverager_enabled)) {
         int size = xc_coverager_get_op_array_size_no_tail(op_array);
         int oplineno = (*EG(opline_ptr)) - op_array->opcodes;
@@ -631 +633 @@
 /* {{{ PHP_INI */
 PHP_INI_BEGIN()
-    STD_PHP_INI_BOOLEAN("xcache.coverager"      ,        "0", PHP_INI_ALL,    OnUpdateBool,         coverager,         zend_xcache_globals, xcache_globals)
+    STD_PHP_INI_BOOLEAN("xcache.coverager",              "0", PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateBool, coverager,           zend_xcache_globals, xcache_globals)
+    STD_PHP_INI_BOOLEAN("xcache.coverager_autostart",    "1", PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateBool, coverager_autostart, zend_xcache_globals, xcache_globals)
     PHP_INI_ENTRY1     ("xcache.coveragedump_directory",  "", PHP_INI_SYSTEM, xcache_OnUpdateDummy, NULL)
 PHP_INI_END()
@@ -644 +647 @@
         covdumpdir = NULL;
     }
-    php_info_print_table_row(2, "Coverage Auto Dumper", XG(coverager) && covdumpdir ? "enabled" : "disabled");
+    php_info_print_table_row(2, "Coverage Started", XG(coverager_started) && covdumpdir ? "On" : "Off");
     php_info_print_table_end();