Changeset 120 in tests

Timestamp:

12/05/2007 06:52:09 AM (19 years ago)

Author:

tellyworth

Message:

profiler: record cache info

File:

• wp-testlib/wp-profiler.php (modified) (6 diffs)

wp-testlib/wp-profiler.php

@@ -42 +42 @@
         }
         $wpdb->queries = array();
+        
+        global $wp_object_cache;
 
         $this->stack[] = array(
             'start' => $time,
             'name' => $name,
+            'cache_cold_hits' => $wp_object_cache->cold_cache_hits,
+            'cache_warm_hits' => $wp_object_cache->warm_cache_hits,
+            'cache_misses' => $wp_object_cache->cache_misses,
+            'cache_dirty_objects' => $this->_dirty_objects_count($wp_object_cache->dirty_objects),
             'actions' => array(),
             'filters' => array(),
@@ -60 +66 @@
         global $wpdb;
         $item['queries'] = $wpdb->queries;
+        global $wp_object_cache;
+        
+        $cache_dirty_count = $this->_dirty_objects_count($wp_object_cache->dirty_objects);
+        $cache_dirty_delta = $this->array_sub($cache_dirty_count, $item['cache_dirty_objects']);
 
         if (isset($this->profile[$name])) {
             $this->profile[$name]['time'] += $time;
-            $this->profile[$name]['actions'] = array_merge( $this->profile[$name]['actions'], $item['actions'] );
-            $this->profile[$name]['filters'] = array_merge( $this->profile[$name]['filters'], $item['filters'] );
-            #$this->profile[$name]['queries'] = array_merge( $this->profile[$name]['queries'], $item['queries'] );
-            $this->_query_summary($item['queries'], $this->profile[$name]['queries']);
+            $this->profile[$name]['calls'] ++;
+            $this->profile[$name]['cache_cold_hits'] += ($wp_object_cache->cold_cache_hits - $item['cache_cold_hits']);
+            $this->profile[$name]['cache_warm_hits'] += ($wp_object_cache->warm_cache_hits - $item['cache_warm_hits']);
+            $this->profile[$name]['cache_misses'] += ($wp_object_cache->cache_misses - $item['cache_misses']);
+            $this->profile[$name]['cache_dirty_objects'] = array_add( $this->profile[$name]['cache_dirty_objects'], $cache_dirty_delta) ;
+            $this->profile[$name]['actions'] = array_add( $this->profile[$name]['actions'], $item['actions'] );
+            $this->profile[$name]['filters'] = array_add( $this->profile[$name]['filters'], $item['filters'] );
+            $this->profile[$name]['queries'] = array_add( $this->profile[$name]['queries'], $item['queries'] );
+            #$this->_query_summary($item['queries'], $this->profile[$name]['queries']);
 
         }
@@ -74 +89 @@
             $this->profile[$name] = array(
                 'time' => $time,
+                'calls' => 1,
+                'cache_cold_hits' => ($wp_object_cache->cold_cache_hits - $item['cache_cold_hits']),
+                'cache_warm_hits' => ($wp_object_cache->warm_cache_hits - $item['cache_warm_hits']),
+                'cache_misses' => ($wp_object_cache->cache_misses - $item['cache_misses']),
+                'cache_dirty_objects' => $cache_dirty_delta,
                 'actions' => $item['actions'],
                 'filters' => $item['filters'],
@@ -126 +146 @@
         asort($out);
         return;
-
-
+    }
+
+    function _query_count($queries) {
         // this requires the savequeries patch at http://trac.wordpress.org/ticket/5218
         $out = array();
@@ -138 +159 @@
         return $out;
     }
-
-    function print_results() {
+    
+    function _dirty_objects_count($dirty_objects) {
+        $out = array();
+        foreach (array_keys($dirty_objects) as $group)
+            $out[$group] = count($dirty_objects[$group]);
+        return $out;
+    }
+    
+    function array_add($a, $b) {
+        $out = $a;
+        foreach (array_keys($b) as $key)
+            if (array_key_exists($key, $out))
+                $out[$key] += $b[$key];
+            else
+                $out[$key] = $b[$key];
+        return $out;
+    }
+    
+    function array_sub($a, $b) {
+        $out = $a;
+        foreach (array_keys($b) as $key)
+            if (array_key_exists($key, $b))
+                $out[$key] -= $b[$key];
+        return $out;
+    }
+
+    function print_summary() {
+        $results = $this->results();
+        
+        printf("\nname                      calls   time action filter   warm   cold misses  dirty\n");
+        foreach ($results as $name=>$stats) {
+            printf("%24.24s %6d %6.4f %6d %6d %6d %6d %6d %6d\n", $name, $stats['calls'], $stats['time'], array_sum($stats['actions']), array_sum($stats['filters']), $stats['cache_warm_hits'], $stats['cache_cold_hits'], $stats['cache_misses'], array_sum($stats['cache_dirty_objects']));
+        }
     }
 }
@@ -158 +210 @@
 }
 
+function wppf_print_summary() {
+    $GLOBALS['wppf']->print_summary();
+}
+
 ?>