X-Git-Url: https://scripts.mit.edu/gitweb/autoinstallsdev/mediawiki.git/blobdiff_plain/d7967d5e4460e08b6b258307afbca0596b18a3dd..19e297c21b10b1b8a3acad5e73fc71dcb35db44a:/includes/ObjectCache.php

diff --git a/includes/ObjectCache.php b/includes/ObjectCache.php
index 7d9caf8a..05ae9c9c 100644
--- a/includes/ObjectCache.php
+++ b/includes/ObjectCache.php
@@ -1,6 +1,9 @@
 <?php
 /**
- * @addtogroup Cache
+ * Functions to get cache objects
+ *
+ * @file
+ * @ingroup Cache
  */
 
 /**
@@ -8,7 +11,7 @@
  * It acts as a memcached server with no RAM, that is, all objects are
  * cleared the moment they are set. All set operations succeed and all
  * get operations return null.
- * @addtogroup Cache
+ * @ingroup Cache
  */
 class FakeMemCachedClient {
 	function add ($key, $val, $exp = 0) { return true; }
@@ -31,7 +34,10 @@ class FakeMemCachedClient {
 global $wgCaches;
 $wgCaches = array();
 
-/** @todo document */
+/**
+ * Get a cache object.
+ * @param $inputType Integer: cache type, one the the CACHE_* constants. 
+ */
 function &wfGetCache( $inputType ) {
 	global $wgCaches, $wgMemCachedServers, $wgMemCachedDebug, $wgMemCachedPersistent;
 	$cache = false;
@@ -47,33 +53,23 @@ function &wfGetCache( $inputType ) {
 	}
 
 	if ( $type == CACHE_MEMCACHED ) {
-		if ( !array_key_exists( CACHE_MEMCACHED, $wgCaches ) ){
-			require_once( 'memcached-client.php' );
-
-			if (!class_exists("MemcachedClientforWiki")) {
-				class MemCachedClientforWiki extends memcached {
-					function _debugprint( $text ) {
-						wfDebug( "memcached: $text\n" );
-					}
-				}
-			}
-
-			$wgCaches[CACHE_DB] = new MemCachedClientforWiki(
+		if ( !array_key_exists( CACHE_MEMCACHED, $wgCaches ) ) {
+			$wgCaches[CACHE_MEMCACHED] = new MemCachedClientforWiki(
 				array('persistant' => $wgMemCachedPersistent, 'compress_threshold' => 1500 ) );
-			$cache =& $wgCaches[CACHE_DB];
-			$cache->set_servers( $wgMemCachedServers );
-			$cache->set_debug( $wgMemCachedDebug );
+			$wgCaches[CACHE_MEMCACHED]->set_servers( $wgMemCachedServers );
+			$wgCaches[CACHE_MEMCACHED]->set_debug( $wgMemCachedDebug );
 		}
+		$cache =& $wgCaches[CACHE_MEMCACHED];
 	} elseif ( $type == CACHE_ACCEL ) {
 		if ( !array_key_exists( CACHE_ACCEL, $wgCaches ) ) {
 			if ( function_exists( 'eaccelerator_get' ) ) {
 				$wgCaches[CACHE_ACCEL] = new eAccelBagOStuff;
 			} elseif ( function_exists( 'apc_fetch') ) {
 				$wgCaches[CACHE_ACCEL] = new APCBagOStuff;
-			} elseif( function_exists( 'xcache_get' ) ) {
+			} elseif( function_exists( 'xcache_get' ) && wfIniGetBool( 'xcache.var_size' ) ) {
 				$wgCaches[CACHE_ACCEL] = new XCacheBagOStuff();
-			} elseif ( function_exists( 'mmcache_get' ) ) {
-				$wgCaches[CACHE_ACCEL] = new TurckBagOStuff;
+			} elseif( function_exists( 'wincache_ucache_get' ) ) {
+				$wgCaches[CACHE_ACCEL] = new WinCacheBagOStuff();
 			} else {
 				$wgCaches[CACHE_ACCEL] = false;
 			}
@@ -87,10 +83,10 @@ function &wfGetCache( $inputType ) {
 		}
 		$cache =& $wgCaches[CACHE_DBA];
 	}
-	
+
 	if ( $type == CACHE_DB || ( $inputType == CACHE_ANYTHING && $cache === false ) ) {
 		if ( !array_key_exists( CACHE_DB, $wgCaches ) ) {
-			$wgCaches[CACHE_DB] = new MediaWikiBagOStuff('objectcache');
+			$wgCaches[CACHE_DB] = new SqlBagOStuff('objectcache');
 		}
 		$cache =& $wgCaches[CACHE_DB];
 	}
@@ -105,22 +101,23 @@ function &wfGetCache( $inputType ) {
 	return $cache;
 }
 
+/** Get the main cache object */
 function &wfGetMainCache() {
 	global $wgMainCacheType;
 	$ret =& wfGetCache( $wgMainCacheType );
 	return $ret;
 }
 
+/** Get the cache object used by the message cache */
 function &wfGetMessageCacheStorage() {
 	global $wgMessageCacheType;
 	$ret =& wfGetCache( $wgMessageCacheType );
 	return $ret;
 }
 
+/** Get the cache object used by the parser cache */
 function &wfGetParserCacheStorage() {
 	global $wgParserCacheType;
 	$ret =& wfGetCache( $wgParserCacheType );
 	return $ret;
 }
-
-