* @subpackage Parser

[lhc/web/wiklou.git] / includes / ParserCache.php

diff --git a/includes/ParserCache.php b/includes/ParserCache.php
index fce8ed3..b156ccc 100644 (file)
--- a/includes/ParserCache.php
+++ b/includes/ParserCache.php
@@ -2,6 +2,7 @@
 /**
  *
  * @package MediaWiki
+ * @subpackage Cache
  */
 
 /**
@@ -35,6 +36,7 @@ class ParserCache {
                $hash = $user->getPageRenderingHash();
                $pageid = intval( $article->getID() );
                $key = $this->getKey( $article, $user );
+
                wfDebug( "Trying parser cache $key\n" );
                $value = $this->mMemc->get( $key );
                if ( is_object( $value ) ) {
@@ -43,17 +45,23 @@ class ParserCache {
                        $canCache = $article->checkTouched();
                        $cacheTime = $value->getCacheTime();
                        $touched = $article->mTouched;
-                       if ( !$canCache || $value->getCacheTime() <= $touched || $cacheTime < $wgCacheEpoch ) {
+                       if ( !$canCache || $value->expired( $touched ) ) {
                                if ( !$canCache ) {
+                                       $this->incrStats( "pcache_miss_invalid" );
                                        wfDebug( "Invalid cached redirect, touched $touched, epoch $wgCacheEpoch, cached $cacheTime\n" );
                                } else {
+                                       $this->incrStats( "pcache_miss_expired" );
                                        wfDebug( "Key expired, touched $touched, epoch $wgCacheEpoch, cached $cacheTime\n" );
                                }
                                $this->mMemc->delete( $key );
                                $value = false;
+
+                       } else {
+                               $this->incrStats( "pcache_hit" );
                        }
                } else {
                        wfDebug( "Parser cache miss.\n" );
+                       $this->incrStats( "pcache_miss_absent" );
                        $value = false;
                }
 
@@ -75,6 +83,14 @@ class ParserCache {
                }
                $this->mMemc->set( $key, $parserOutput, $expire );
        }
+
+       function incrStats( $key ) {
+               global $wgDBname, $wgMemc;
+               $key = "$wgDBname:stats:$key";
+               if ( is_null( $wgMemc->incr( $key ) ) ) {
+                       $wgMemc->add( $key, 1 );
+               }
+       }
 }