Changeset 1057 for trunk/mod_cacher/xc_cacher.c

Timestamp:

07/27/2012 09:52:12 AM (10 months ago)

Author:

moo

Message:

cacher: reduce branch checking for counter

Files:

• trunk/mod_cacher/xc_cacher.c (modified) (3 diffs)

trunk/mod_cacher/xc_cacher.c

@@ -389 +389 @@
 }
 /* }}} */
-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;
+static inline void xc_counters_inc(time_t *curtime, zend_uint *curslot, time_t interval, zend_ulong *counters, zend_uint count TSRMLS_DC) /* {{{ */
+{
+    time_t n = XG(request_time) / interval;
     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;
-        }
+        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;
@@ -412 +407 @@
 }
 /* }}} */
-static void xc_cache_hit_unlocked(xc_cache_t *cache TSRMLS_DC) /* {{{ */
+static inline void xc_cache_hit_unlocked(xc_cache_t *cache TSRMLS_DC) /* {{{ */
 {
     cache->hits ++;
@@ -423 +418 @@
 
     xc_counters_inc(&cache->hits_by_second_cur_time
-            , &cache->hits_by_second_cur_slot
-            , 1
+            , &cache->hits_by_second_cur_slot, 1
             , cache->hits_by_second
             , sizeof(cache->hits_by_second) / sizeof(cache->hits_by_second[0])