Changeset 598

Timestamp:

2009-07-05T07:25:36+02:00 (4 years ago)

Author:

moo

Message:

unmerge r321 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• 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) (4 diffs)
• opcode_spec.h (modified) (1 diff)
• xcache.c (modified) (4 diffs)

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

@@ -51 +51 @@
         'Refcount'
         => '引用数',
-        'PhpShared'
-        => '共享',
         'SrcSize'
         => '源大小',

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

@@ -51 +51 @@
         'Refcount'
         => '引用數',
-        'PhpShared'
-        => '共享',
         'SrcSize'
         => '原始檔案大小',

branches/1.3/admin/help-en.lang.php

@@ -23 +23 @@
 <dt><?php echo _T('entry'); ?>: </dt><dd>The entry name or filename</dd>
 <dt><?php echo _T('Hits'); ?>: </dt><dd>Times this entry is hit (loaded from this cache)</dd>
-<dt><?php echo _T('Refcount'); ?>: </dt><dd>Reference count of this entry is holded by a php request</dd>
+<dt><?php echo _T('Refcount'); ?>: </dt><dd>Reference count this entry is holded by a php request</dd>
 <dt><?php echo _T('Size'); ?>: </dt><dd>Size in bytes of this entry in the cache</dd>
-<dt><?php echo _T('PhpShared'); ?>: </dt><dd>Count of entry sharing this php data</dd>
 <dt><?php echo _T('SrcSize'); ?>: </dt><dd>Size of the source file</dd>
 <dt><?php echo _T('Modify'); ?>: </dt><dd>Last modified time of the source file</dd>

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

@@ -25 +25 @@
 <dt><?php echo _T('Refcount'); ?>: </dt><dd>项目依然被其他进程占据的引用次数</dd>
 <dt><?php echo _T('Size'); ?>: </dt><dd>项目在共享内存里占用字节数</dd>
-<dt><?php echo _T('PhpShared'); ?>: </dt><dd>与本项目相同 PHP 代码的个数</dd>
 <dt><?php echo _T('SrcSize'); ?>: </dt><dd>源文件大小</dd>
 <dt><?php echo _T('Modify'); ?>: </dt><dd>源文件最后修改时间</dd>

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

@@ -25 +25 @@
 <dt><?php echo _T('Refcount'); ?>: </dt><dd>項目依然被其他程序佔用的引用次數</dd>
 <dt><?php echo _T('Size'); ?>: </dt><dd>項目在共享記憶體裡佔用位元數</dd>
-<dt><?php echo _T('PhpShared'); ?>: </dt><dd>與本項目相同 PHP 內容的个數</dd>
 <dt><?php echo _T('SrcSize'); ?>: </dt><dd>原始檔案大小</dd>
 <dt><?php echo _T('Modify'); ?>: </dt><dd>原始檔案最後修改時間</dd>

branches/1.3/admin/xcache.tpl.php

@@ -148 +148 @@
             echo '<col align="right" />';
             echo '<col align="right" />';
-            echo '<col align="right" />';
         }
 
@@ -164 +163 @@
             <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('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 +185 @@
             $size     = size($entry['size']);
             if ($isphp) {
-                $sourcesize  = size($entry['sourcesize']);
-                $phprefcount = number_format($entry['phprefcount']);
+                $sourcesize = size($entry['sourcesize']);
             }
 
@@ -220 +217 @@
             if ($isphp) {
                 echo <<<ENTRY
-                <td int="{$entry['phprefcount']}">{$phprefcount}</td>
                 <td int="{$entry['sourcesize']}">{$sourcesize}</td>
                 <td int="{$entry['mtime']}">{$mtime}</td>

branches/1.3/opcode_spec.h

@@ -29 +29 @@
 
 #define OPSPECS_DEF_ENUM(name) OPSPEC_##name,
-typedef enum { OPSPECS(OPSPECS_DEF_ENUM) } xc_op_spec_t;
+typedef enum { OPSPECS(OPSPECS_DEF_ENUM) OPSPEC_DUMMY } xc_op_spec_t;
 
 typedef struct {

branches/1.3/xcache.c

@@ -446 +446 @@
     array_init(ei);
 
+    add_assoc_long_ex(ei, ZEND_STRS("size"),     entry->size);
     add_assoc_long_ex(ei, ZEND_STRS("refcount"), entry->refcount);
     add_assoc_long_ex(ei, ZEND_STRS("hits"),     entry->hits);
@@ -476 +477 @@
         case XC_TYPE_PHP:
             php = entry->data.php;
-            add_assoc_long_ex(ei, ZEND_STRS("size"),          entry->size + php->size);
-            add_assoc_long_ex(ei, ZEND_STRS("phprefcount"),   php->refcount);
             add_assoc_long_ex(ei, ZEND_STRS("sourcesize"),    php->sourcesize);
 #ifdef HAVE_INODE
@@ -494 +493 @@
 #endif
             break;
-
         case XC_TYPE_VAR:
             var = entry->data.var;
-            add_assoc_long_ex(ei, ZEND_STRS("size"),          entry->size);
             break;
 
@@ -1444 +1441 @@
 
 err:
+    xc_destroy();
     if (xc_php_caches || xc_var_caches) {
-        xc_destroy();
         /* shm destroied in xc_destroy() */
     }
     else if (shm) {
-        xc_destroy();
         xc_shm_destroy(shm);
     }