Changeset 1117

Timestamp:

08/02/2012 08:27:41 AM (10 months ago)

Author:

moo

Message:

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

Location:

trunk

Files:

• ChangeLog (modified) (2 diffs)
• mod_coverager/xc_coverager.c (modified) (6 diffs)
• xcache-zh-gb2312.ini (modified) (1 diff)
• xcache.ini (modified) (1 diff)
• xcache_globals.h (modified) (1 diff)

trunk/ChangeLog

@@ -8 +8 @@
 ========
  * new: xcache.disable_on_crash = Off
+ * new: xcache.coverager_autostart = On
 
 ChangeLog
@@ -14 +15 @@
  * closes #73: warn for improper PHP_FCGI_CHILDREN setting fcgi mode (>=PHP_5_3)
  * closes #174: updated api to support "clear all cache"
+ * fixed #39: ini_set never work for xcache.coverager setting. use API instead
  * code refactor
    * uses extension to load XCache. load via zend_extension is unsupported

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();
 

trunk/xcache-zh-gb2312.ini

@@ -69 +69 @@
 ; per request settings. ���� ini_set, .htaccess ��
 ; ���ô������̸�������Ϣ�ɼ��Լ� xcache_coverager_start/stop/get/clean() �Ⱥ���
-xcache.coverager =          Off
+xcache.coverager =           Off
+xcache.coverager_autostart =  On
 
 ; ���� php ini �ļ�������

trunk/xcache.ini

@@ -65 +65 @@
 [xcache.coverager]
 ; enabling this feature will impact performance
-; enable only if xcache.coverager == On && xcache.coveragedump_directory == "non-empty-value"
+; enabled only if xcache.coverager == On && xcache.coveragedump_directory == "non-empty-value"
 
 ; per request settings. can ini_set, .htaccess etc
 ; enable coverage data collecting and xcache_coverager_start/stop/get/clean() functions
-xcache.coverager =          Off
+xcache.coverager =           Off
+xcache.coverager_autostart =  On
 
 ; set in php ini file only

trunk/xcache_globals.h

@@ -11 +11 @@
 #ifdef HAVE_XCACHE_COVERAGER
     zend_bool coverager;
-    zend_bool coverage_enabled;
+    zend_bool coverager_autostart;
+    zend_bool coverager_enabled;
     HashTable *coverages;  /* coverages[file][line] = times */
 #endif