Merge "hierarchicalize(!) stat names"

diff --cc includes/resourceloader/ResourceLoader.php
index ccc7a17,9970a89..5bc9dc3
--- 1/includes/resourceloader/ResourceLoader.php
--- 2/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@@ -195,11 -195,12 +195,11 @@@ 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" );
+                               wfIncrStats( "resourceloader_cache.$filter.hit" );
                                return $cacheEntry;
                        }
                        $result = '';