From: RouL <roul@codingcorner.info>
Date: Thu, 14 Jul 2011 18:28:51 +0000 (+0200)
Subject: Implemented APC cache source.
X-Git-Tag: 2.0.0_Beta_1~2033^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cb61f06339f03d70109a5902ff4e7667deb036bf;p=GitHub%2FWoltLab%2FWCF.git

Implemented APC cache source.
---

diff --git a/com.woltlab.wcf/options.xml b/com.woltlab.wcf/options.xml
index e24eed6179..8cee348477 100644
--- a/com.woltlab.wcf/options.xml
+++ b/com.woltlab.wcf/options.xml
@@ -301,9 +301,11 @@ debug:mail_debug_logfile_path,!mail_use_f_param,!mail_smtp_host,!mail_smtp_port,
 				<optiontype>radiobuttons</optiontype>
 				<defaultvalue><![CDATA[disk]]></defaultvalue>
 				<selectoptions><![CDATA[disk:wcf.acp.option.cache_source_type.disk
-memcache:wcf.acp.option.cache_source_type.memcache]]></selectoptions>
+memcache:wcf.acp.option.cache_source_type.memcache
+apc:wcf.acp.option.cache_source_type.apc]]></selectoptions>
 				<enableoptions><![CDATA[disk:!cache_source_memcache_host,!cache_source_memcache_use_pconnect,!enable_session_data_cache
-memcache:cache_source_memcache_host,cache_source_memcache_use_pconnect,enable_session_data_cache]]></enableoptions>
+memcache:cache_source_memcache_host,cache_source_memcache_use_pconnect,enable_session_data_cache
+apc:!cache_source_memcache_host,!cache_source_memcache_use_pconnect,!enable_session_data_cache]]></enableoptions>
 			</option>
 			
 			<option name="enable_session_data_cache">
diff --git a/wcfsetup/install/files/lib/system/cache/source/ApcCacheSource.class.php b/wcfsetup/install/files/lib/system/cache/source/ApcCacheSource.class.php
new file mode 100644
index 0000000000..adc3bec53b
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/cache/source/ApcCacheSource.class.php
@@ -0,0 +1,100 @@
+<?php
+namespace wcf\system\cache\source;
+use wcf\system\exception\SystemException;
+use wcf\util\FileUtil;
+
+/**
+ * ApcCacheSource is an implementation of CacheSource that uses APC to store cached variables.
+ * 
+ * @author	Markus Bartz
+ * @copyright	2011 Markus Bartz
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package	com.woltlab.wcf
+ * @subpackage	system.cache.source
+ * @category 	Community Framework
+ */
+class ApcCacheSource implements CacheSource {
+	/**
+	 * Creates a new ApcCacheSource object.
+	 */
+	public function __construct() {
+		if (!function_exists('apc_exists')) {
+			throw new SystemException('APC support is not enabled.');
+		}
+	}
+	
+	/**
+	 * @see CacheSource::get()
+	 */
+	public function get($cacheResource) {
+		if (!apc_exists($cacheResource['file'])) {
+			return null;
+		}
+		
+		return apc_fetch($cacheResource['file']);
+	}
+	
+	/**
+	 * @see CacheSource::set()
+	 */
+	public function set($cacheResource, $value) {
+		apc_store($cacheResource['file'], $value, $cacheResource['maxLifetime']);
+	}
+	
+	/**
+	 * @see CacheSource::delete()
+	 */
+	public function delete($cacheResource, $ignoreLifetime = false) {
+		if ($ignoreLifetime || ($cacheResource['minLifetime'] == 0 || $this->checkMinLifetime($cacheResource))) {
+			apc_delete($cacheResource['file']);
+		}
+	}
+	
+	/**
+	 * Checks if the minimum lifetime is expired.
+	 * 
+	 * @param	array		$cacheResource
+	 */
+	public function checkMinLifetime($cacheResource) {
+		$apcinfo = apc_cache_info('user');
+		$cacheList = $apcinfo['cache_list'];
+		
+		foreach ($cacheList as $cache) {
+			if ($cache['info'] == $cacheResource['file']) {
+				return ((TIME_NOW - $cache['mtime']) >= $cacheResource['minLifetime']);
+			}
+		}
+		
+		return true;
+	}
+	
+	/**
+	 * @see CacheSource::clear()
+	 */
+	public function clear($directory, $filepattern, $forceDelete = false) {
+		$pattern = preg_quote(FileUtil::addTrailingSlash($directory), '%').str_replace('*', '.*', str_replace('.', '\.', $filepattern));
+		
+		$apcinfo = apc_cache_info('user');
+		$cacheList = $apcinfo['cache_list'];
+		foreach ($cacheList as $cache) {
+			if (preg_match('%^'.$pattern.'$%i', $cache['info'])) {
+				apc_delete($cache['info']);
+			}
+		}
+	}
+	
+	/**
+	 * @see CacheSource::close()
+	 */
+	public function close() {
+		// does nothing
+	}
+	
+	/**
+	 * @see CacheSource::flush()
+	 */
+	public function flush() {
+		apc_clear_cache('user');
+	}
+}
+?>
diff --git a/wcfsetup/install/lang/de-informal.xml b/wcfsetup/install/lang/de-informal.xml
index bcac8b75df..9452b34bcd 100644
--- a/wcfsetup/install/lang/de-informal.xml
+++ b/wcfsetup/install/lang/de-informal.xml
@@ -255,6 +255,7 @@
 		<item name="wcf.acp.option.cache_source_memcache_use_pconnect"><![CDATA[Persistente Verbindungen aktivieren]]></item>
 		<item name="wcf.acp.option.cache_source_memcache_use_pconnect.description"><![CDATA[Sollen beim Verbinden mit dem Memcache-Server persistente Verbindungen genutzt werden?]]></item>
 		<item name="wcf.acp.option.cache_source_type"><![CDATA[Cache-Methode]]></item>
+		<item name="wcf.acp.option.cache_source_type.apc"><![CDATA[Alternative PHP Cache]]></item>
 		<item name="wcf.acp.option.cache_source_type.description"><![CDATA[Bitte wähle die gewünschte Cache-Methode aus! Beachte, dass einige Methoden spezielle Anforderungen an das Server-System stellen und nicht auf jedem Server zur Verfügung stehen.]]></item>
 		<item name="wcf.acp.option.cache_source_type.disk"><![CDATA[Dateisystem (Standard)]]></item>
 		<item name="wcf.acp.option.cache_source_type.memcache"><![CDATA[Memcache (Experimentell)]]></item>
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index b2acdba7dd..68e34ccb69 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -255,6 +255,7 @@
 		<item name="wcf.acp.option.cache_source_memcache_use_pconnect"><![CDATA[Persistente Verbindungen aktivieren]]></item>
 		<item name="wcf.acp.option.cache_source_memcache_use_pconnect.description"><![CDATA[Sollen beim Verbinden mit dem Memcache-Server persistente Verbindungen genutzt werden?]]></item>
 		<item name="wcf.acp.option.cache_source_type"><![CDATA[Cache-Methode]]></item>
+		<item name="wcf.acp.option.cache_source_type.apc"><![CDATA[Alternative PHP Cache]]></item>
 		<item name="wcf.acp.option.cache_source_type.description"><![CDATA[Bitte wählen Sie die gewünschte Cache-Methode aus! Beachten Sie, dass einige Methoden spezielle Anforderungen an das Server-System stellen und nicht auf jedem Server zur Verfügung stehen.]]></item>
 		<item name="wcf.acp.option.cache_source_type.disk"><![CDATA[Dateisystem (Standard)]]></item>
 		<item name="wcf.acp.option.cache_source_type.memcache"><![CDATA[Memcache (Experimentell)]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index a676ad8fb3..ce5c59e375 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -255,6 +255,7 @@
 		<item name="wcf.acp.option.cache_source_memcache_use_pconnect"><![CDATA[Use persistent connections]]></item>
 		<item name="wcf.acp.option.cache_source_memcache_use_pconnect.description"><![CDATA[By enabling this option a persistent connection to the memcache server will be used.]]></item>
 		<item name="wcf.acp.option.cache_source_type"><![CDATA[Cache type]]></item>
+		<item name="wcf.acp.option.cache_source_type.apc"><![CDATA[Alternative PHP Cache]]></item>
 		<item name="wcf.acp.option.cache_source_type.description"><![CDATA[Please select the type of cache you want to use. Some of the types have special requirements to the server system and cannot be used in your environment.]]></item>
 		<item name="wcf.acp.option.cache_source_type.disk"><![CDATA[File system (default)]]></item>
 		<item name="wcf.acp.option.cache_source_type.memcache"><![CDATA[Memcache (experimental)]]></item>