Ticket #580: cache.patch

application/config/config.php

@@ -67 +67 @@
 $config['extension_prefix'] = 'MY_';
 
 /**
+ * Length of time of the internal cache in seconds. 0 or FALSE means no caching.
+ * The internal cache stores file paths and config entries across requests
+ * and can give significant speed improvements at the expense of delayed updating.
+ */
+$config['internal_cache'] = 60;
+
+/**
  * Additional resource paths, or "modules". Each path can either be absolute
  * or relative to the docroot. Modules can include any resource that can exist
  * in your application directory, configuration files, controllers, views, etc.

system/core/Config.php

@@ -1 +1 @@
 <?php defined('SYSPATH') or die('No direct script access.');
 /**
  * Loads configuration files and retrieves keys. This class is declared as final.
- * 
+ *
  * $Id$
  *
  * @package    Core
@@ -185 +185 @@
                         return $config;
                 }
 
+                static $found;
+
+                if ($found === NULL)
+                {
+                        // First load, try to fetch from cache
+                        $found = Kohana::load_cache('configs');
+                }
+
+                if (isset($found[$name]))
+                        return $found[$name];
+
                 $configuration = array();
 
                 // Find all the configuartion files matching the name
@@ -200 +211 @@
                         }
                 }
 
+                // Add merged configuration to cache and save it
+                $found[$name] = $configuration;
+                Kohana::save_cache('configs', $found);
+
                 return $configuration;
         }
 

system/core/Kohana.php

@@ -688 +688 @@
          */
         public static function find_file($directory, $filename, $required = FALSE, $ext = FALSE, $use_cache = TRUE)
         {
-                static $found = array();
+                static $found;
 
-                $search = $directory.'/'.$filename;
-                $hash   = sha1($search.$ext);
+                if ($found === NULL)
+                {
+                        // First load, try to fetch from cache
+                        $found = Kohana::load_cache('file_paths');
+                }
 
-                if ($use_cache AND isset($found[$hash]))
-                        return $found[$hash];
+                // Users can define their own extensions, css, xml, html, etc
+                $ext = ($ext == FALSE) ? EXT : '.'.ltrim($ext, '.');
 
+                $search = $directory.'/'.$filename.$ext;
+                //$hash   = sha1($search.$ext); this doesn't seem to be needed
+
+                if ($use_cache AND isset($found[$search]))
+                        return $found[$search];
+
                 if ($directory === 'config' OR $directory === 'i18n' OR $directory === 'l10n')
                 {
                         $fnd = array();
@@ -703 +712 @@
                         // Search from SYSPATH up
                         foreach (array_reverse(Config::include_paths()) as $path)
                         {
-                                if (is_file($path.$search.EXT)) $fnd[] = $path.$search.EXT;
+                                if (is_file($path.$search)) $fnd[] = $path.$search;
                         }
 
                         // If required and nothing was found, throw an exception
                         if ($required == TRUE AND $fnd === array())
                                 throw new Kohana_Exception('core.resource_not_found', Kohana::lang('core.'.inflector::singular($directory)), $filename);
 
-                        return $found[$hash] = $fnd;
+                        // Add paths to cache and save it
+                        $found[$search] = $fnd;
+                        $use_cache AND Kohana::save_cache('file_paths', $found);
+                        return $fnd;
                 }
                 else
                 {
-                        // Users can define their own extensions, css, xml, html, etc
-                        $ext = ($ext == FALSE) ? EXT : '.'.ltrim($ext, '.');
-
                         // Find the file and return its filename
                         foreach (Config::include_paths() as $path)
                         {
-                                if (is_file($path.$search.$ext))
-                                        return $found[$hash] = $path.$search.$ext;
+                                $path = $path.$search;
+                                if (is_file($path))
+                                {
+                                        // Add path to cache and save it
+                                        $found[$search] = $path;
+                                        $use_cache AND Kohana::save_cache('file_paths', $found);
+                                        return $path;
+                                }
                         }
 
                         // If the file is required, throw an exception
                         if ($required == TRUE)
                                 throw new Kohana_Exception('core.resource_not_found', Kohana::lang('core.'.inflector::singular($directory)), $filename);
 
-                        return $found[$hash] = FALSE;
+                        // Add path to cache and save it
+                        $found[$search] = FALSE;
+                        $use_cache AND Kohana::save_cache('file_paths', $found);
+                        return FALSE;
                 }
         }
 
         /**
+         * Save data to a cache file.
+         * This is only used interally by Kohana and should not
+         * be used in place of the Cache library.
+         *
+         * @param   string   filename of cache
+         * @param   array    data to save
+         * @return  boolean
+         */
+        public static function save_cache($file, array $data = NULL)
+        {
+                $file = APPPATH.'cache/kohana_'.$file;
+                if ($data === NULL)
+                {
+                        // Delete file
+                        unlink($file);
+                }
+                else
+                {
+                        // Write cache contents to file
+                        return (bool) file_put_contents($file, serialize($data));
+                }
+        }
+
+        /**
+         * Load data from a cache file.
+         * This is only used interally by Kohana and should not
+         * be used in place of the Cache library.
+         *
+         * @param   string  filename of cache
+         * @return  array
+         */
+        public static function load_cache($file)
+        {
+                if ($cache_time = Config::item('core.internal_cache'))
+                {
+                        $filepath = APPPATH.'cache/kohana_'.$file;
+                        if (file_exists($filepath))
+                        {
+                                // Use file modification time to check cache time
+                                if (time() - filemtime($filepath) < $cache_time)
+                                {
+                                        // Return contents of cache
+                                        return unserialize(file_get_contents($filepath));
+                                }
+                                else
+                                {
+                                        // Cache has expired, delete it
+                                        Kohana::save_cache($file);
+                                }
+                        }
+                }
+
+                // No cache was loaded, return empty
+                return array();
+        }
+
+        /**
          * Lists all files and directories in a resource path.
          *
          * @param   string   directory to search