From eb6637682ec835d9ec50612b59637e8b9ff5f6f6 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@owncloud.com>
Date: Mon, 21 Oct 2013 14:04:07 +0200
Subject: Inject memoryCache into Autoloader. Remove recursion-prevention hack.

---
 lib/autoloader.php | 55 +++++++++++++++++++++++++++---------------------------
 1 file changed, 28 insertions(+), 27 deletions(-)

(limited to 'lib/autoloader.php')

diff --git a/lib/autoloader.php b/lib/autoloader.php
index b5b58918372..b0dc8904098 100644
--- a/lib/autoloader.php
+++ b/lib/autoloader.php
@@ -15,6 +15,12 @@ class Autoloader {
 
 	private $classPaths = array();
 
+	/**
+	 * Optional low-latency memory cache for class to path mapping.
+	 * @var \OC\Memcache\Cache
+	 */
+	protected $memoryCache;
+
 	/**
 	 * Add a custom prefix to the autoloader
 	 *
@@ -112,44 +118,39 @@ class Autoloader {
 	 * @param string $class
 	 * @return bool
 	 */
-	protected $memoryCache = null;
-	protected $constructingMemoryCache = true; // hack to prevent recursion
 	public function load($class) {
-		// Does this PHP have an in-memory cache? We cache the paths there
-		if ($this->constructingMemoryCache && !$this->memoryCache) {
-			$this->constructingMemoryCache = false;
-			try {
-				$this->memoryCache = \OC\Memcache\Factory::createLowLatency('Autoloader');
-			} catch(\Exception $ex) {
-				// no caching then - fine with me
-			}
-		}
+		$pathsToRequire = null;
 		if ($this->memoryCache) {
 			$pathsToRequire = $this->memoryCache->get($class);
-			if (is_array($pathsToRequire)) {
-				foreach ($pathsToRequire as $path) {
-					require_once $path;
-				}
-				return false;
-			}
 		}
 
-		// Use the normal class loading path
-		$paths = $this->findClass($class);
-		if (is_array($paths)) {
+		if (!is_array($pathsToRequire)) {
+			// No cache or cache miss
 			$pathsToRequire = array();
-			foreach ($paths as $path) {
-				if ($fullPath = stream_resolve_include_path($path)) {
-					require_once $fullPath;
+			foreach ($this->findClass($class) as $path) {
+				$fullPath = stream_resolve_include_path($path);
+				if ($fullPath) {
 					$pathsToRequire[] = $fullPath;
 				}
 			}
+		}
 
-			// Save in our memory cache
-			if ($this->memoryCache) {
-				$this->memoryCache->set($class, $pathsToRequire, 60); // cache 60 sec
-			}
+		if ($this->memoryCache) {
+			$this->memoryCache->set($class, $pathsToRequire, 60); // cache 60 sec
+		}
+
+		foreach ($pathsToRequire as $fullPath) {
+			require_once $fullPath;
 		}
+
 		return false;
 	}
+
+	/**
+	 * @brief Sets the optional low-latency cache for class to path mapping.
+	 * @param \OC\Memcache\Cache $memoryCache Instance of memory cache.
+	 */
+	public function setMemoryCache(\OC\Memcache\Cache $memoryCache) {
+		$this->memoryCache = $memoryCache;
+	}
 }
-- 
cgit v1.2.3


From dde832b76cf9dc17be03491e7130790269843d43 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@owncloud.com>
Date: Mon, 21 Oct 2013 15:35:52 +0200
Subject: Only write-back on cache miss.

---
 lib/autoloader.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/autoloader.php')

diff --git a/lib/autoloader.php b/lib/autoloader.php
index b0dc8904098..3228ca29b22 100644
--- a/lib/autoloader.php
+++ b/lib/autoloader.php
@@ -133,10 +133,10 @@ class Autoloader {
 					$pathsToRequire[] = $fullPath;
 				}
 			}
-		}
 
-		if ($this->memoryCache) {
-			$this->memoryCache->set($class, $pathsToRequire, 60); // cache 60 sec
+			if ($this->memoryCache) {
+				$this->memoryCache->set($class, $pathsToRequire, 60); // cache 60 sec
+			}
 		}
 
 		foreach ($pathsToRequire as $fullPath) {
-- 
cgit v1.2.3


From c85cc13d1ab926e6b75728ff45b84f4a53a724af Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@owncloud.com>
Date: Tue, 22 Oct 2013 11:16:08 +0200
Subject: Allow null as cache parameter (if no cache was found) and for cache
 removal.

---
 lib/autoloader.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/autoloader.php')

diff --git a/lib/autoloader.php b/lib/autoloader.php
index 3228ca29b22..3451f799e18 100644
--- a/lib/autoloader.php
+++ b/lib/autoloader.php
@@ -150,7 +150,7 @@ class Autoloader {
 	 * @brief Sets the optional low-latency cache for class to path mapping.
 	 * @param \OC\Memcache\Cache $memoryCache Instance of memory cache.
 	 */
-	public function setMemoryCache(\OC\Memcache\Cache $memoryCache) {
+	public function setMemoryCache(\OC\Memcache\Cache $memoryCache = null) {
 		$this->memoryCache = $memoryCache;
 	}
 }
-- 
cgit v1.2.3