Browse Source

refcount is no longer available for var cache

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@931 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
3.0
Xuefer 9 years ago
parent
commit
8de45373f4
  1. 6
      admin/xcache.tpl.php
  2. 9
      xcache.c

6
admin/xcache.tpl.php

@ -163,9 +163,9 @@ if ($cachelist) {
<th><a href="javascript:" onclick="resort(this); return false"><?php echo _T('Cache'); ?></a></th>
<th><a href="javascript:" onclick="resort(this); return false"><?php echo _T('entry'); ?></a></th>
<th><a href="javascript:" onclick="resort(this); return false"><?php echo _T('Hits'); ?></a></th>
<th><a href="javascript:" onclick="resort(this); return false"><?php echo _T('Refcount'); ?></a></th>
<th><a href="javascript:" onclick="resort(this); return false"><?php echo _T('Size'); ?></a></th>
<?php if ($isphp) { ?>
<th><a href="javascript:" onclick="resort(this); return false"><?php echo _T('Refcount'); ?></a></th>
<th><a href="javascript:" onclick="resort(this); return false"><?php echo _T('PhpShared'); ?></a></th>
<th><a href="javascript:" onclick="resort(this); return false"><?php echo _T('SrcSize'); ?></a></th>
<th><a href="javascript:" onclick="resort(this); return false"><?php echo _T('Modify'); ?></a></th>
@ -187,7 +187,6 @@ if ($cachelist) {
<tr ", $a->next(), ">";
$name = htmlspecialchars($entry['name']);
$hits = number_format($entry['hits']);
$refcount = number_format($entry['refcount']);
$size = size($entry['size']);
if ($isphp) {
$file_size = size($entry['file_size']);
@ -218,11 +217,12 @@ ENTRY;
<td>{$entry['cache_name']} {$i}</td>
<td>{$namelink}</td>
<td align="right" int="{$entry['hits']}">{$entry['hits']}</td>
<td align="right" int="{$entry['refcount']}">{$entry['refcount']}</td>
<td align="right" int="{$entry['size']}">{$size}</td>
ENTRY;
if ($isphp) {
$refcount = number_format($entry['refcount']);
echo <<<ENTRY
<td align="right" int="{$entry['refcount']}">{$entry['refcount']}</td>
<td align="right" int="{$entry['phprefcount']}">{$phprefcount}</td>
<td align="right" int="{$entry['file_size']}">{$file_size}</td>
<td align="right" int="{$entry['file_mtime']}">{$file_mtime}</td>

9
xcache.c

@ -650,12 +650,10 @@ static void xc_fillentry_unlocked(xc_entry_type_t type, const xc_entry_t *entry,
{
zval* ei;
const xc_entry_data_php_t *php;
xc_entry_php_t *entry_php = (xc_entry_php_t *) entry;
ALLOC_INIT_ZVAL(ei);
array_init(ei);
add_assoc_long_ex(ei, ZEND_STRS("refcount"), entry_php->refcount);
add_assoc_long_ex(ei, ZEND_STRS("hits"), entry->hits);
add_assoc_long_ex(ei, ZEND_STRS("ctime"), entry->ctime);
add_assoc_long_ex(ei, ZEND_STRS("atime"), entry->atime);
@ -669,7 +667,7 @@ static void xc_fillentry_unlocked(xc_entry_type_t type, const xc_entry_t *entry,
ALLOC_INIT_ZVAL(zv);
switch (entry->name_type) {
case IS_UNICODE:
ZVAL_UNICODEL(zv, entry->name.ustr.val, entry->name.ustr.len, 1);
ZVAL_UNICODEL(zv, entry->name.ustr.val, entry->name.ustr.len, 1);
break;
case IS_STRING:
ZVAL_STRINGL(zv, entry->name.str.val, entry->name.str.len, 1);
@ -684,9 +682,11 @@ static void xc_fillentry_unlocked(xc_entry_type_t type, const xc_entry_t *entry,
add_assoc_stringl_ex(ei, ZEND_STRS("name"), entry->name.str.val, entry->name.str.len, 1);
#endif
switch (type) {
case XC_TYPE_PHP:
case XC_TYPE_PHP: {
xc_entry_php_t *entry_php = (xc_entry_php_t *) entry;
php = entry_php->php;
add_assoc_long_ex(ei, ZEND_STRS("size"), entry->size + php->size);
add_assoc_long_ex(ei, ZEND_STRS("refcount"), entry_php->refcount);
add_assoc_long_ex(ei, ZEND_STRS("phprefcount"), php->refcount);
add_assoc_long_ex(ei, ZEND_STRS("file_mtime"), entry_php->file_mtime);
add_assoc_long_ex(ei, ZEND_STRS("file_size"), entry_php->file_size);
@ -704,6 +704,7 @@ static void xc_fillentry_unlocked(xc_entry_type_t type, const xc_entry_t *entry,
add_assoc_long_ex(ei, ZEND_STRS("autoglobal_cnt"),php->autoglobal_cnt);
#endif
break;
}
case XC_TYPE_VAR:
add_assoc_long_ex(ei, ZEND_STRS("size"), entry->size);

Loading…
Cancel
Save