Changeset 1118

Timestamp:

2012-08-03T05:52:01+02:00 (11 months ago)

Author:

moo

Message:

typo

Location:

trunk

Files:

• mod_cacher/xc_cacher.c (modified) (2 diffs)
• mod_coverager/xc_coverager.c (modified) (6 diffs)
• xcache_globals.h (modified) (1 diff)

trunk/mod_cacher/xc_cacher.c

@@ -3163 +3163 @@
 #endif
 PHP_INI_BEGIN()
+    PHP_INI_ENTRY1     ("xcache.shm_scheme",          "mmap", PHP_INI_SYSTEM, xcache_OnUpdateString,   &xc_shm_scheme)
     PHP_INI_ENTRY1     ("xcache.mmap_path",     DEFAULT_PATH, PHP_INI_SYSTEM, xcache_OnUpdateString,   &xc_mmap_path)
     PHP_INI_ENTRY1_EX  ("xcache.readonly_protection",    "0", PHP_INI_SYSTEM, xcache_OnUpdateBool,     &xc_readonly_protection, zend_ini_boolean_displayer_cb)
@@ -3170 +3171 @@
     PHP_INI_ENTRY1     ("xcache.count",                  "1", PHP_INI_SYSTEM, xcache_OnUpdateDummy,    NULL)
     PHP_INI_ENTRY1     ("xcache.slots",                 "8K", PHP_INI_SYSTEM, xcache_OnUpdateDummy,    NULL)
-    PHP_INI_ENTRY1     ("xcache.shm_scheme",          "mmap", PHP_INI_SYSTEM, xcache_OnUpdateString,   &xc_shm_scheme)
     PHP_INI_ENTRY1     ("xcache.ttl",                    "0", PHP_INI_SYSTEM, xcache_OnUpdateULong,    &xc_php_ttl)
     PHP_INI_ENTRY1     ("xcache.gc_interval",            "0", PHP_INI_SYSTEM, xcache_OnUpdateULong,    &xc_php_gc_interval)

trunk/mod_coverager/xc_coverager.c

@@ -243 +243 @@
 /* }}} */
 
-static void xc_coverager_enable(TSRMLS_D) /* {{{ */
-{
-    XG(coverager_enabled) = 1;
-}
-/* }}} */
-static void xc_coverager_disable(TSRMLS_D) /* {{{ */
-{
-    XG(coverager_enabled) = 0;
+static void xc_coverager_start(TSRMLS_D) /* {{{ */
+{
+    XG(coverager_started) = 1;
+}
+/* }}} */
+static void xc_coverager_stop(TSRMLS_D) /* {{{ */
+{
+    XG(coverager_started) = 0;
 }
 /* }}} */
@@ -258 +258 @@
     if (XG(coverager)) {
         if (XG(coverager_autostart)) {
-            xc_coverager_enable(TSRMLS_C);
+            xc_coverager_start(TSRMLS_C);
         }
 #ifdef ZEND_COMPILE_EXTENDED_INFO
@@ -267 +267 @@
     }
     else {
-        XG(coverager_enabled) = 0;
+        XG(coverager_started) = 0;
     }
     return SUCCESS;
@@ -471 +471 @@
     TSRMLS_FETCH();
 
-    if (XG(coverages) && XG(coverager_enabled)) {
+    if (XG(coverages) && XG(coverager_started)) {
         int size = xc_coverager_get_op_array_size_no_tail(op_array);
         int oplineno = (*EG(opline_ptr)) - op_array->opcodes;
@@ -528 +528 @@
 
     if (XG(coverager)) {
-        xc_coverager_enable(TSRMLS_C);
+        xc_coverager_start(TSRMLS_C);
     }
     else {
@@ -546 +546 @@
     }
 
-    xc_coverager_disable(TSRMLS_C);
+    xc_coverager_stop(TSRMLS_C);
     if (clean) {
         xc_coverager_clean(TSRMLS_C);

trunk/xcache_globals.h

@@ -12 +12 @@
     zend_bool coverager;
     zend_bool coverager_autostart;
-    zend_bool coverager_enabled;
+    zend_bool coverager_started;
     HashTable *coverages;  /* coverages[file][line] = times */
 #endif