Changeset 457 for branches/1.2

Show
Ignore:
Timestamp:
07/14/2007 05:10:55 AM (17 months ago)
Author:
moo
Message:

merged [456] from trunk: fixed #133: add "compile failures" in XCache admin stats

Location:
branches/1.2
Files:
9 modified

Legend:

Unmodified
Added
Removed

  • branches/1.2

    • Property svnmerge-integrated changed from /trunk:1-302,344-346,371,374-375,388,391,393,395,398,400,402-405,407,410,416,421,434-435,438,444 to /trunk:1-302,344-346,371,374-375,388,391,393,395,398,400,402-405,407,410,416,421,434-435,438,444,456

  • branches/1.2/admin/common-zh-simplified-utf-8.lang.php

    r373 r457  
    3434        'OOMs' 
    3535        => '内存不足', 
     36        'Errors' 
     37        => '错误', 
    3638        'Protected' 
    3739        => '保护', 

  • branches/1.2/admin/common-zh-traditional-utf-8.lang.php

    r373 r457  
    3434        'OOMs' 
    3535        => '記憶體不足', 
     36        'Errors' 
     37        => '错误', 
    3638        'Protected' 
    3739        => '保護', 

  • branches/1.2/admin/help-en.lang.php

    r123 r457  
    1111<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> 
    1212<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> 
     13<dt><?php echo _T('Errors'); ?>: </dt><dd>Compiler errors, how many times your script is compiled but failed. You should really check what is happening if you see this value increase. See <a href="http://www.php.net/manual/en/ref.errorfunc.php#ini.error-log">ini.error-log</a> and <a href="http://cn2.php.net/manual/en/ref.errorfunc.php#ini.display-errors">ini.display-errors</a></dd> 
    1314<dt><?php echo _T('Protected'); ?>: </dt><dd>Whether <a href="http://trac.lighttpd.net/xcache/wiki/ReadonlyProtection">readonly_protection</a> is available and enable on this cache</dd> 
    1415<dt><?php echo _T('Cached'); ?>: </dt><dd>Number of entries stored in this cache</dd> 

  • branches/1.2/admin/help-zh-simplified-utf-8.lang.php

    r123 r457  
    1111<dt><?php echo _T('Clogs'); ?>: </dt><dd>编译阻塞跳过, 阻塞=当需该共享内存区负责编译时, 其他进程/现成无法访问此共享内存. 跳过=XCache 自动判断阻塞的共享内存区自动跳过阻塞等待, 直接使用非共享内存方式继续处理请求</dd> 
    1212<dt><?php echo _T('OOMs'); ?>: </dt><dd>内存不足次数, 显示需要存储新数据但是共享内存区内存不足的次数. 如果出现太频繁请考虑加大配置中的 xcache.size 或者 xcache.var_size</dd> 
     13<dt><?php echo _T('Errors'); ?>: </dt><dd>编译错误, 显示您的脚本被编译时出错的次数. 如果您发现这个数字不断增长, 您应该检查什么脚本产生错误. 参考 <a href="http://www.php.net/manual/en/ref.errorfunc.php#ini.error-log">ini.error-log</a> and <a href="http://cn2.php.net/manual/en/ref.errorfunc.php#ini.display-errors">ini.display-errors</a></dd> 
    1314<dt><?php echo _T('Protected'); ?>: </dt><dd>显示该 Cache 是否支持并启用 <a href="http://trac.lighttpd.net/xcache/wiki/ReadonlyProtection">readonly_protection</a></dd> 
    1415<dt><?php echo _T('Cached'); ?>: </dt><dd>共享内存于该共享内存区的项目条数</dd> 

  • branches/1.2/admin/help-zh-traditional-utf-8.lang.php

    r135 r457  
    1111<dt><?php echo _T('Clogs'); ?>: </dt><dd>編譯阻塞跳過，阻塞=當需該共享記憶體區負責編譯時，其他程序/現成無法存取此共享記憶體. 跳過=XCache 自動判斷阻塞的共享記憶體區自動跳過阻塞等待，直接使用非共享記憶體方式繼續處理請求</dd> 
    1212<dt><?php echo _T('OOMs'); ?>: </dt><dd>記憶體不足次數，顯示需要儲存新資料但是共享記憶體區記憶體不足的次數. 如果出現太頻繁請考慮加大配置中的 xcache.size 或者 xcache.var_size</dd> 
     13<dt><?php echo _T('Errors'); ?>: </dt><dd>编译错误, 显示您的脚本被编译时出错的次数. 如果您发现这个数字不断增长, 您应该检查什么脚本产生错误. 参考 <a href="http://www.php.net/manual/en/ref.errorfunc.php#ini.error-log">ini.error-log</a> and <a href="http://cn2.php.net/manual/en/ref.errorfunc.php#ini.display-errors">ini.display-errors</a></dd> 
    1314<dt><?php echo _T('Protected'); ?>: </dt><dd>顯示該 Cache 是否支援並啟用 <a href="http://trac.lighttpd.net/xcache/wiki/ReadonlyProtection">readonly_protection</a></dd> 
    1415<dt><?php echo _T('Cached'); ?>: </dt><dd>共享記憶體於該共享記憶體區的項目個數</dd> 

  • branches/1.2/admin/xcache.tpl.php

    r373 r457  
    3535        <th><?php echo _T('Clogs'); ?></th> 
    3636        <th><?php echo _T('OOMs'); ?></th> 
     37        <th><?php echo _T('Errors'); ?></th> 
    3738        <th><?php echo _T('Protected'); ?></th> 
    3839        <th><?php echo _T('Cached'); ?></th> 
    … …  
    4142    </tr> 
    4243    <?php 
    43     $numkeys = explode(',', 'slots,size,avail,hits,misses,clogs,ooms,cached,deleted'); 
     44    $numkeys = explode(',', 'slots,size,avail,hits,misses,clogs,ooms,errors,cached,deleted'); 
    4445    $l_clear = _T('Clear'); 
    4546    $l_clear_confirm = _T('Sure to clear?'); 
    … …  
    7677        <td>{$ci['clogs']}</td> 
    7778        <td>{$ci['ooms']}</td> 
     79        <td>{$ci['errors']}</td> 
    7880        <td>{$ci['can_readonly']}</td> 
    7981        <td>{$ci['cached']}</td> 

  • branches/1.2/xcache.c

    r453 r457  
    417417    add_assoc_long_ex(return_value, ZEND_STRS("clogs"),     cache->clogs); 
    418418    add_assoc_long_ex(return_value, ZEND_STRS("ooms"),      cache->ooms); 
     419    add_assoc_long_ex(return_value, ZEND_STRS("errors"),    cache->errors); 
    419420 
    420421    add_assoc_long_ex(return_value, ZEND_STRS("cached"),    cache->entries_count); 
    … …  
    11621163    } LEAVE_LOCK(cache); 
    11631164    if (catched) { 
     1165        cache->errors ++; 
    11641166        zend_bailout(); 
    11651167    } 

  • branches/1.2/xcache.h

    r445 r457  
    176176    zend_ulong clogs; 
    177177    zend_ulong ooms; 
     178    zend_ulong errors; 
    178179    xc_lock_t  *lck; 
    179180    xc_shm_t   *shm; /* to which shm contains us */