Changeset 32 in svn for trunk

Timestamp:

2006-05-27T03:05:10Z (13 years ago)

Author:

Xuefer

Message:

optimized xcache_info() to not wake up swapped memory.

Location:

trunk

Files:

• xcache.c (modified) (6 diffs)
• xcache.h (modified) (1 diff)

trunk/xcache.c

@@ -140 +140 @@
     xce->next = *head;
     *head = xce;
+    xce->cache->entries_count ++;
 }
 /* }}} */
@@ -167 +168 @@
         if (xc_entry_equal_dmz(xce, p)) {
             *last = p->next;
+            xce->cache->entries_count ++;
             if (p->refcount == 0) {
                 xc_entry_free_dmz(p);
@@ -174 +176 @@
                 p->cache->deletes = p;
                 p->dtime = XG(request_time);
+                xce->cache->deletes_count ++;
             }
             return;
@@ -224 +227 @@
 #endif
     xc_mem_t *mem = cache->mem;
-    int i, c, count;
-    xc_entry_t *e;
 
     add_assoc_long_ex(return_value, ZEND_STRS("slots"),     cache->hentry->size);
@@ -234 +235 @@
     add_assoc_long_ex(return_value, ZEND_STRS("ooms"),      cache->ooms);
 
-    count = 0;
-    for (i = 0, c = cache->hentry->size; i < c; i ++) {
-        for (e = cache->entries[i]; e; e = e->next) {
-            count ++;
-        }
-    }
-    add_assoc_long_ex(return_value, ZEND_STRS("cached"), count);
-
-    count = 0;
-    for (e = cache->deletes; e; e = e->next) {
-        count ++;
-    }
-    add_assoc_long_ex(return_value, ZEND_STRS("deleted"), count);
+    add_assoc_long_ex(return_value, ZEND_STRS("cached"), cache->entries_count);
+    add_assoc_long_ex(return_value, ZEND_STRS("deleted"), cache->deletes_count);
 
     MAKE_STD_ZVAL(blocks);
@@ -419 +409 @@
                     if (p->refcount == 0) {
                         *last = p->next;
+                        cache->deletes_count --;
                         xc_entry_free_dmz(p);
                     }

trunk/xcache.h

@@ -132 +132 @@
 
     xc_entry_t **entries;
+    int entries_count;
     xc_entry_t *deletes;
+    int deletes_count;
     xc_hash_t  *hentry; /* hash to entry */
 } xc_cache_t;