Changeset 522 for trunk/xcache.c

Timestamp:

02/17/2008 04:49:46 PM (10 months ago)

Author:

moo

Message:

slide hits per second and hour

Files:

• trunk/xcache.c (modified) (6 diffs)

trunk/xcache.c

@@ -313 +313 @@
 /* }}} */
 #endif
+static inline zend_uint advance_wrapped(zend_uint val, zend_uint count) /* {{{ */
+{
+    if (val + 1 >= count) {
+        return 0;
+    }
+    return val + 1;
+}
+/* }}} */
+static void xc_counters_inc(time_t *curtime, zend_uint *curslot, time_t period, zend_ulong *counters, zend_uint count TSRMLS_DC) /* {{{ */
+{
+    time_t n = XG(request_time) / period;
+    if (*curtime != n) {
+        zend_uint target_slot = n % count;
+        if (n - *curtime > period) {
+            memset(counters, 0, sizeof(counters[0]) * count);
+        }
+        else {
+            zend_uint slot;
+            for (slot = advance_wrapped(*curslot, count);
+                    slot != target_slot;
+                    slot = advance_wrapped(slot, count)) {
+                counters[slot] = 0;
+            }
+            counters[target_slot] = 0;
+        }
+        *curtime = n;
+        *curslot = target_slot;
+    }
+    counters[*curslot] ++;
+}
+/* }}} */
+static void xc_cache_hit_dmz(xc_cache_t *cache TSRMLS_DC) /* {{{ */
+{
+    cache->hits ++;
+
+    xc_counters_inc(&cache->hits_by_hour_cur_time
+            , &cache->hits_by_hour_cur_slot, 60 * 60
+            , cache->hits_by_hour
+            , sizeof(cache->hits_by_hour) / sizeof(cache->hits_by_hour[0])
+            TSRMLS_CC);
+
+    xc_counters_inc(&cache->hits_by_second_cur_time
+            , &cache->hits_by_second_cur_slot
+            , 1
+            , cache->hits_by_second
+            , sizeof(cache->hits_by_second) / sizeof(cache->hits_by_second[0])
+            TSRMLS_CC);
+}
+/* }}} */
 
 /* helper function that loop through each entry */
@@ -455 +504 @@
 static void xc_fillinfo_dmz(int cachetype, xc_cache_t *cache, zval *return_value TSRMLS_DC) /* {{{ */
 {
-    zval *blocks;
+    zval *blocks, *hits;
+    int i;
     const xc_block_t *b;
 #ifndef NDEBUG
@@ -487 +537 @@
         add_assoc_null_ex(return_value, ZEND_STRS("gc"));
     }
+    MAKE_STD_ZVAL(hits);
+    array_init(hits);
+    for (i = 0; i < sizeof(cache->hits_by_hour) / sizeof(cache->hits_by_hour[0]); i ++) {
+        add_next_index_long(hits, (long) cache->hits_by_hour[i]);
+    }
+    add_assoc_zval_ex(return_value, ZEND_STRS("hits_by_hour"), hits);
+
+    MAKE_STD_ZVAL(hits);
+    array_init(hits);
+    for (i = 0; i < sizeof(cache->hits_by_second) / sizeof(cache->hits_by_second[0]); i ++) {
+        add_next_index_long(hits, (long) cache->hits_by_second[i]);
+    }
+    add_assoc_zval_ex(return_value, ZEND_STRS("hits_by_second"), hits);
 
     MAKE_STD_ZVAL(blocks);
@@ -1257 +1320 @@
         stored_xce = xc_entry_find_dmz(&xce TSRMLS_CC);
         if (stored_xce) {
-            cache->hits ++;
+            xc_cache_hit_dmz(cache TSRMLS_CC);
 
             TRACE("hit %s, holding", stored_xce->name.str.val);
@@ -2113 +2176 @@
     } LEAVE_LOCK(xce.cache);
     if (found) {
-        xce.cache->hits ++;
+        xc_cache_hit_dmz(xce.cache TSRMLS_CC);
     }
     else {
@@ -2194 +2257 @@
     } LEAVE_LOCK(xce.cache);
     if (found) {
-        xce.cache->hits ++;
+        xc_cache_hit_dmz(xce.cache TSRMLS_CC);
     }
     else {