Changeset 936

Timestamp:

06/28/2012 09:45:40 AM (11 months ago)

Author:

moo

Message:

change misses to updates. misses is kept for compatibility reason but deprecated

Location:

trunk

Files:

• admin/common-zh-simplified-utf-8.lang.php (modified) (1 diff)
• admin/common-zh-traditional-utf-8.lang.php (modified) (1 diff)
• admin/help-en.lang.php (modified) (1 diff)
• admin/help-zh-simplified-utf-8.lang.php (modified) (1 diff)
• admin/help-zh-traditional-utf-8.lang.php (modified) (1 diff)
• admin/xcache.tpl.php (modified) (3 diffs)
• xcache.c (modified) (17 diffs)
• xcache.h (modified) (1 diff)

trunk/admin/common-zh-simplified-utf-8.lang.php

@@ -36 +36 @@
         'Hits/S'
         => '命中/S',
-        'Misses'
-        => '错过',
+        'Updates'
+        => '更新',
         'Clogs'
         => '阻塞',

trunk/admin/common-zh-traditional-utf-8.lang.php

@@ -36 +36 @@
         'Hits/S'
         => '命中/S',
-        'Misses'
-        => '錯過',
+        'Updates'
+        => '更新',
         'Clogs'
         => '阻塞',

trunk/admin/help-en.lang.php

@@ -11 +11 @@
 <dt><?php echo _T('Hits 24H'); ?>: </dt><dd>Hits 24 Hours. Hits graph of last 24 hours</dd>
 <dt><?php echo _T('Hits/S'); ?>: </dt><dd>Average Hits per Second. Only last 5 seconds is logged</dd>
-<dt><?php echo _T('Misses'); ?>: </dt><dd>Cache Misses, miss=a var/php is requested but not in the cache</dd>
+<dt><?php echo _T('Updates'); ?>: </dt><dd>Cache Updates, miss=a var/php is requested but not in the cache</dd>
 <dt><?php echo _T('Clogs'); ?>: </dt><dd>Compiling Clogs, clog=compiling is needed but avoided to wait(be blocked) when the cache is busy compiling already</dd>
 <dt><?php echo _T('OOMs'); ?>: </dt><dd>Out Of Memory, how many times a new item should be stored but there isn't enough memory in the cache, think of increasing the xcache.size or xcache.var_size</dd>

trunk/admin/help-zh-simplified-utf-8.lang.php

@@ -11 +11 @@
 <dt><?php echo _T('Hits 24H'); ?>: </dt><dd>24 小时命中分布图. 图表现是最后 24 小时的命中次数</dd>
 <dt><?php echo _T('Hits/S'); ?>: </dt><dd>每秒命中次数. 只统计最后 5 秒</dd>
-<dt><?php echo _T('Misses'); ?>: </dt><dd>共享内存错过次数, 错过=请求的php或者变量并不在该共享内存内</dd>
+<dt><?php echo _T('Updates'); ?>: </dt><dd>共享内存更新次数</dd>
 <dt><?php echo _T('Clogs'); ?>: </dt><dd>编译阻塞跳过, 阻塞=当需该共享内存区负责编译时, 其他进程/现成无法访问此共享内存. 跳过=XCache 自动判断阻塞的共享内存区自动跳过阻塞等待, 直接使用非共享内存方式继续处理请求</dd>
 <dt><?php echo _T('OOMs'); ?>: </dt><dd>内存不足次数, 显示需要存储新数据但是共享内存区内存不足的次数. 如果出现太频繁请考虑加大配置中的 xcache.size 或者 xcache.var_size</dd>

trunk/admin/help-zh-traditional-utf-8.lang.php

@@ -8 +8 @@
 <dt><?php echo _T('Compiling'); ?>: </dt><dd>編譯標記，當共享記憶體區正在編譯 php 指令時標記為 "yes"</dd>
 <dt><?php echo _T('Hits'); ?>: </dt><dd>共享記憶體命中次數，命中=從該共享記憶體載入php或者變數</dd>
-<dt><?php echo _T('Misses'); ?>: </dt><dd>共享記憶體錯過次數，錯過=請求的php或者變數並不在該共享記憶體內</dd>
+<dt><?php echo _T('Updates'); ?>: </dt><dd>共享記憶更新過次數</dd>
 <dt><?php echo _T('Clogs'); ?>: </dt><dd>編譯阻塞跳過，阻塞=當需該共享記憶體區負責編譯時，其他程序/現成無法存取此共享記憶體. 跳過=XCache 自動判斷阻塞的共享記憶體區自動跳過阻塞等待，直接使用非共享記憶體方式繼續處理請求</dd>
 <dt><?php echo _T('OOMs'); ?>: </dt><dd>記憶體不足次數，顯示需要儲存新資料但是共享記憶體區記憶體不足的次數. 如果出現太頻繁請考慮加大配置中的 xcache.size 或者 xcache.var_size</dd>

trunk/admin/xcache.tpl.php

@@ -40 +40 @@
         <th><?php echo _T('Hits 24H'); ?></th>
         <th><?php echo _T('Hits/S'); ?></th>
-        <th><?php echo _T('Misses'); ?></th>
+        <th><?php echo _T('Updates'); ?></th>
         <th><?php echo _T('Clogs'); ?></th>
         <th><?php echo _T('OOMs'); ?></th>
@@ -50 +50 @@
     </tr>
     <?php
-    $numkeys = explode(',', 'slots,size,avail,hits,misses,clogs,ooms,errors,cached,deleted');
+    $numkeys = explode(',', 'slots,size,avail,hits,updates,clogs,ooms,errors,cached,deleted');
     $l_clear = _T('Clear');
     $l_clear_confirm = _T('Sure to clear?');
@@ -117 +117 @@
         <td><div class="hitsgraph" style="width: {$hits_graph_h_w}px">{$hits_graph_h}</div></td>
         <td>{$hits_avg_s}</td>
-        <td>{$ci['misses']}</td>
+        <td>{$ci['updates']}</td>
         <td>{$ci['clogs']}</td>
         <td>{$ci['ooms']}</td>

trunk/xcache.c

@@ -281 +281 @@
     if (stored_entry) {
         xc_entry_add_unlocked(cache, entryslotid, stored_entry);
+        ++cache->updates;
         return stored_entry;
     }
@@ -592 +593 @@
     add_assoc_long_ex(return_value, ZEND_STRS("slots"),     cache->hentry->size);
     add_assoc_long_ex(return_value, ZEND_STRS("compiling"), cache->compiling);
-    add_assoc_long_ex(return_value, ZEND_STRS("misses"),    cache->misses);
+    add_assoc_long_ex(return_value, ZEND_STRS("updates"),   cache->updates);
+    add_assoc_long_ex(return_value, ZEND_STRS("misses"),    cache->updates); /* deprecated */
     add_assoc_long_ex(return_value, ZEND_STRS("hits"),      cache->hits);
     add_assoc_long_ex(return_value, ZEND_STRS("clogs"),     cache->clogs);
@@ -1601 +1603 @@
 }
 /* }}} */
-static zend_op_array *xc_compile_php(xc_compiler_t *compiler, zend_file_handle *h, int type TSRMLS_DC) /* {{{ */
-{
-    zend_op_array *op_array;
+static void xc_compile_php(xc_compiler_t *compiler, zend_file_handle *h, int type TSRMLS_DC) /* {{{ */
+{
     zend_uint old_constinfo_cnt, old_funcinfo_cnt, old_classinfo_cnt;
     zend_bool catched = 0;
@@ -1614 +1615 @@
     old_constinfo_cnt = zend_hash_num_elements(EG(zend_constants));
 
-    compiler->new_php.op_array = NULL;
-    XG(initial_compile_file_called) = 0;
     zend_try {
-        op_array = old_compile_file(h, type TSRMLS_CC);
+        compiler->new_php.op_array = old_compile_file(h, type TSRMLS_CC);
     } zend_catch {
         catched = 1;
@@ -1626 +1625 @@
     }
 
-    if (op_array == NULL) {
+    if (compiler->new_php.op_array == NULL) {
         goto err_op_array;
     }
 
     if (!XG(initial_compile_file_called)) {
-        return op_array;
+        return;
     }
 
@@ -1637 +1636 @@
     /* {{{ prepare */
     zend_restore_compiled_filename(h->opened_path ? h->opened_path : (char *) h->filename TSRMLS_CC);
-    compiler->new_php.op_array = op_array;
 
 #ifdef HAVE_XCACHE_CONSTANT
@@ -1819 +1817 @@
 #endif
 
-    return op_array;
+    return;
 
 err_alloc:
@@ -1830 +1828 @@
         zend_bailout();
     }
-
-    return op_array;
 }
 /* }}} */
@@ -1912 +1908 @@
     */
 
-    zend_op_array *op_array;
     xc_entry_php_t *stored_entry;
     xc_entry_data_php_t *stored_php;
@@ -1956 +1951 @@
         }
 
-        cache->misses ++;
         TRACE("miss entry %d:%s", compiler->new_entry.file_inode, compiler->new_entry.entry.name.str.val);
 
@@ -2008 +2002 @@
     /* }}} */
 
-    op_array = NULL;
     /* {{{ compile */
     /* make compile inside sandbox */
-    xc_sandbox_init(&sandbox, h->opened_path ? h->opened_path : h->filename TSRMLS_CC);
 
 #ifdef HAVE_XCACHE_CONSTANT
@@ -2023 +2015 @@
     memset(&compiler->new_php.op_array_info, 0, sizeof(compiler->new_php.op_array_info));
 
+    XG(initial_compile_file_called) = 0;
     zend_try {
-        op_array = xc_compile_php(compiler, h, type TSRMLS_CC);
+        xc_sandbox_init(&sandbox, h->opened_path ? h->opened_path : h->filename TSRMLS_CC);
+        compiler->new_php.op_array = NULL;
+        xc_compile_php(compiler, h, type TSRMLS_CC);
     } zend_catch {
         catched = 1;
     } zend_end_try();
 
-    if (catched || !op_array) {
+    if (catched
+     || !compiler->new_php.op_array /* possible ? */
+     || !XG(initial_compile_file_called)) {
         goto err_aftersandbox;
     }
 
-    /* not cachable */
-    if (!compiler->new_php.op_array) {
-        cache->compiling = 0;
-        /* it's not cachable, but don't scare the users with high misses */
-        cache->misses --;
-        xc_sandbox_free(&sandbox, XC_InstallNoBinding TSRMLS_CC);
-        return op_array;
-    }
     /* }}} */
 #ifdef SHOW_DPRINT
@@ -2065 +2054 @@
     TRACE("%s", stored_entry ? "stored" : "store failed");
 
+    if (catched || !stored_php) {
+        goto err_aftersandbox;
+    }
+
     cache->compiling = 0;
-    if (catched) {
-        goto err_aftersandbox;
-    }
-
     xc_free_php(&compiler->new_php TSRMLS_CC);
 
     if (stored_entry) {
-        if (op_array) {
+        if (compiler->new_php.op_array) {
 #ifdef ZEND_ENGINE_2
-            destroy_op_array(op_array TSRMLS_CC);
+            destroy_op_array(compiler->new_php.op_array TSRMLS_CC);
 #else
-            destroy_op_array(op_array);
-#endif
-            efree(op_array);
+            destroy_op_array(compiler->new_php.op_array);
+#endif
+            efree(compiler->new_php.op_array);
+            compiler->new_php.op_array = NULL;
             h = NULL;
         }
@@ -2088 +2078 @@
         zend_op_array *old_active_op_array = CG(active_op_array);
         /* install it */
-        CG(active_op_array) = op_array;
+        CG(active_op_array) = compiler->new_php.op_array;
         xc_sandbox_free(&sandbox, XC_Install TSRMLS_CC);
         CG(active_op_array) = old_active_op_array;
     }
-    return op_array;
+    return compiler->new_php.op_array;
 
 err_aftersandbox:
@@ -2098 +2088 @@
     xc_sandbox_free(&sandbox, XC_NoInstall TSRMLS_CC);
 
+    cache->compiling = 0;
     if (catched) {
-        cache->compiling = 0;
         cache->errors ++;
         zend_bailout();
     }
-    return op_array;
+    return compiler->new_php.op_array;
 }
 /* }}} */
@@ -2839 +2829 @@
         else {
             RETVAL_NULL();
-            cache->misses ++;
         }
     } LEAVE_LOCK(cache);
@@ -3025 +3014 @@
                 zv = (zval *) cache->shm->handlers->to_readwrite(cache->shm, (char *) stored_entry_var->value);
                 Z_LVAL_P(zv) = value;
+                ++cache->updates;
                 break; /* leave lock */
             }

trunk/xcache.h

@@ -261 +261 @@
 
     time_t     compiling;
-    zend_ulong misses;
+    zend_ulong updates;
     zend_ulong hits;
     zend_ulong clogs;