Changeset 2718

Timestamp:

05/29/2008 04:18:31 PM (6 months ago)

Author:

Shadowhand

Message:

Follow up to r2716, writing caches on-the-fly is faster than using Events.

Location:

trunk/system/core

Files:

• Config.php (modified) (4 diffs)
• Kohana.php (modified) (2 diffs)

trunk/system/core/Config.php

@@ -17 +17 @@
         // Cached configuration
         private static $cache;
-        private static $cache_changed = FALSE;
 
         // Include paths
@@ -134 +133 @@
         public static function clear($key)
         {
-                if (isset($cache[$key]))
-                {
-                        // Cache has been changed
-                        self::$cache_changed = TRUE;
-                }
-
                 unset(self::$conf[$key], self::$cache[$key]);
+
+                // Save updated cache
+                Kohana::save_cache('configuration', self::$cache);
 
                 return TRUE;
@@ -220 +216 @@
                 }
 
-                if (self::$cache_changed === FALSE AND (bool) Config::item('core.internal_cache'))
-                {
-                        // Write the caches on shutdown
-                        Event::add('system.shutdown', array('Config', 'save_cache'));
-                }
-
-                // Cache has been changed
-                self::$cache_changed = TRUE;
+                // Save updated cache
+                Kohana::save_cache('configuration', self::$cache);
 
                 // Cache the configuration
@@ -233 +223 @@
         }
 
-        /**
-         * Writes configuration caches, typically called during shutdown.
-         *
-         * @return  bool
-         */
-        public static function save_cache()
-        {
-                if (self::$cache_changed === TRUE)
-                {
-                        // Write caches
-                        return Kohana::save_cache('configuration', self::$cache);
-                }
-        }
-
 } // End Config

trunk/system/core/Kohana.php

@@ -29 +29 @@
         // File path cache
         private static $paths;
-        private static $paths_changed = FALSE;
 
         /**
@@ -811 +810 @@
                 }
 
-                if (self::$paths_changed === FALSE AND (bool) Config::item('core.internal_cache'))
-                {
-                        // Write the caches on shutdown
-                        Event::add('system.shutdown', array('Kohana', 'save_paths'));
-                }
-
-                // Paths have been changed
-                self::$paths_changed = TRUE;
+                // Save updated cache
+                Kohana::save_cache('file_paths', self::$paths);
 
                 return self::$paths[$search] = $found;
-        }
-
-        /**
-         * Writes file path caches, typically called during shutdown.
-         *
-         * @return  bool
-         */
-        public static function save_paths()
-        {
-                if (self::$paths_changed === TRUE)
-                {
-                        // Write caches
-                        return Kohana::save_cache('file_paths', self::$paths);
-                }
         }