From: Ori Livneh <ori@wikimedia.org>
Date: Wed, 13 May 2015 03:45:01 +0000 (-0700)
Subject: ResourceLoader::filter: use APC when running under HHVM
X-Git-Tag: 1.31.0-rc.0~11188^2
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=458e7cabbbafd;p=lhc%2Fweb%2Fwiklou.git

ResourceLoader::filter: use APC when running under HHVM

On HHVM, (a) the cost of a ResourceLoader::filter cache miss is smaller, and
(b) APC is faster and more resilient than PHP's. These two things tilt the
scales in favor of using APC rather than Memcached.

Change-Id: I30b490e5bc815849d4b0bb06f2dbbb68825ed225
---

diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php
index b4b5a2e2c2..ccc7a1796a 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -195,9 +195,8 @@ class ResourceLoader {
 		if ( !$options['cache'] ) {
 			$result = $this->applyFilter( $filter, $data );
 		} else {
-			// Use CACHE_ANYTHING since filtering is very slow compared to DB queries
 			$key = wfMemcKey( 'resourceloader', 'filter', $filter, self::$filterCacheVersion, md5( $data ) );
-			$cache = wfGetCache( CACHE_ANYTHING );
+			$cache = wfGetCache( wfIsHHVM() ? CACHE_ACCEL : CACHE_ANYTHING );
 			$cacheEntry = $cache->get( $key );
 			if ( is_string( $cacheEntry ) ) {
 				wfIncrStats( "rl-$filter-cache-hits" );