3 files changed, 243 insertions, 1 deletions
diff --git a/phpBB/includes/acm/acm_eaccelerator.php b/phpBB/includes/acm/acm_eaccelerator.php
new file mode 100644
index 0000000000..3697fb5202
--- /dev/null
+++ b/phpBB/includes/acm/acm_eaccelerator.php
@@ -0,0 +1,123 @@
+<?php
+/**
+*
+* @package acm
+* @version $Id$
+* @copyright (c) 2005, 2009 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+// Include the abstract base
+if (!class_exists('acm_memory'))
+{
+	require("${phpbb_root_path}includes/acm/acm_memory.$phpEx");
+}
+
+/**
+* ACM for eAccelerator
+* @package acm
+* @todo Missing locks from destroy() talk with David
+*/
+class acm extends acm_memory
+{
+	var $serialize_header = '#phpbb-serialized#';
+
+	function acm()
+	{
+		// Call the parent constructor
+		parent::acm_memory();
+	}
+
+	/**
+	* Purge cache data
+	*
+	* @return void
+	*/
+	function purge()
+	{
+		foreach (eaccelerator_list_keys() as $var)
+		{
+			// @todo Check why the substr()
+			eaccelerator_rm(substr($var['name'], 1));
+		}
+
+		parent::purge();
+	}
+
+	/**
+	 * Perform cache garbage collection
+	 *
+	 * @return void
+	 */
+	function tidy()
+	{
+		eaccelerator_gc();
+
+		set_config('cache_last_gc', time(), true);
+	}
+
+	/**
+	* Fetch an item from the cache
+	*
+	* @access protected
+	* @param string $var Cache key
+	* @return mixed Cached data
+	*/
+	function _read($var)
+	{
+		$result = eaccelerator_get($var);
+
+		if ($result === null)
+		{
+			return false;
+		}
+
+		// Handle serialized objects
+		if (is_string($result) && strpos($result, $this->serialize_header . 'O:') === 0)
+		{
+			$result = unserialize(substr($result, strlen($this->serialize_header)));
+		}
+
+		return $result;
+	}
+
+	/**
+	* Store data in the cache
+	*
+	* @access protected
+	* @param string $var Cache key
+	* @param mixed $data Data to store
+	* @param int $ttl Time-to-live of cached data
+	* @return bool True if the operation succeeded
+	*/
+	function _write($var, $data, $ttl = 2592000)
+	{
+		// Serialize objects and make them easy to detect
+		$data = (is_object($data)) ? $this->serialize_header . serialize($data) : $data;
+
+		return eaccelerator_put($var, $data, $ttl);
+	}
+
+	/**
+	* Remove an item from the cache
+	*
+	* @access protected
+	* @param string $var Cache key
+	* @return bool True if the operation succeeded
+	*/
+	function _delete($var)
+	{
+		return eaccelerator_rm($var);
+	}
+}
+
+?>
+\ No newline at end of file
diff --git a/phpBB/includes/acm/acm_memory.php b/phpBB/includes/acm/acm_memory.php
index 7875c3441e..a97f680d1e 100644
--- a/phpBB/includes/acm/acm_memory.php
+++ b/phpBB/includes/acm/acm_memory.php
@@ -228,7 +228,7 @@ class acm_memory
 	{
 		if ($var_name[0] == '_')
 		{
-			return true;
+			return $this->_isset($var_name);
 		}
 		else
 		{
@@ -398,6 +398,19 @@ class acm_memory
 
 		return @unlink($filename);
 	}
+
+	/**
+	* Check if a cache var exists
+	*
+	* @access protected
+	* @param string $var Cache key
+	* @return bool True if it exists, otherwise false
+	*/	
+	function _isset($var)
+	{
+		// Most caches don't need to check
+		return true;
+	}
 }
 
 ?>
 \ No newline at end of file
diff --git a/phpBB/includes/acm/acm_xcache.php b/phpBB/includes/acm/acm_xcache.php
new file mode 100644
index 0000000000..36a32c167e
--- /dev/null
+++ b/phpBB/includes/acm/acm_xcache.php
@@ -0,0 +1,106 @@
+<?php
+/**
+*
+* @package acm
+* @version $Id$
+* @copyright (c) 2005, 2009 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+// Include the abstract base
+if (!class_exists('acm_memory'))
+{
+	require("${phpbb_root_path}includes/acm/acm_memory.$phpEx");
+}
+
+/**
+* ACM for XCache
+* @package acm
+*/
+class acm extends acm_memory
+{
+	function acm()
+	{
+		// Call the parent constructor
+		parent::acm_memory();
+	}
+
+	/**
+	* Purge cache data
+	*
+	* @return void
+	*/
+	function purge()
+	{
+		$n = xcache_count(XC_TYPE_VAR);
+
+		for ($i = 0; $i < $n; $i++)
+		{
+			xcache_clear_cache(XC_TYPE_VAR, $i);
+		}
+
+		parent::purge();
+	}
+
+	/**
+	* Fetch an item from the cache
+	*
+	* @access protected
+	* @param string $var Cache key
+	* @return mixed Cached data
+	*/
+	function _read($var)
+	{
+		return xcache_get($var);
+	}
+
+	/**
+	* Store data in the cache
+	*
+	* @access protected
+	* @param string $var Cache key
+	* @param mixed $data Data to store
+	* @param int $ttl Time-to-live of cached data
+	* @return bool True if the operation succeeded
+	*/
+	function _write($var, $data, $ttl = 2592000)
+	{
+		return xcache_set($var, $data, $ttl);
+	}
+
+	/**
+	* Remove an item from the cache
+	*
+	* @access protected
+	* @param string $var Cache key
+	* @return bool True if the operation succeeded
+	*/
+	function _delete($var)
+	{
+		return xcache_unset($var);
+	}
+
+	/**
+	* Check if a cache var exists
+	*
+	* @access protected
+	* @param string $var Cache key
+	* @return bool True if it exists, otherwise false
+	*/	
+	function _isset($var)
+	{
+		// Most caches don't need to check
+		return xcache_isset($var);
+	}
+}
+
+?>
+\ No newline at end of file