Changeset 3386

Timestamp:

08/29/2008 09:49:20 AM (3 months ago)

Author:

Shadowhand

Message:

Moved some benchmarks around, added utf8_conversion benchmark, removed kohana_loading benchmark

Location:

trunk/system

Files:

• bootstrap.php (modified) (4 diffs)
• classes/kohana.php (modified) (5 diffs)

trunk/system/bootstrap.php

@@ -14 +14 @@
 define('KOHANA_CODENAME', 'kernachtig');
 
-// Test of Kohana is running in Windows
-define('KOHANA_IS_WIN', PHP_SHLIB_SUFFIX === 'dll');
-
 // Kohana benchmarks are prefixed to prevent collisions
 define('SYSTEM_BENCHMARK', 'system_benchmark');
@@ -26 +23 @@
 Benchmark::start(SYSTEM_BENCHMARK.'_total_execution');
 
-// Start kohana_loading
-Benchmark::start(SYSTEM_BENCHMARK.'_kohana_loading');
+// Start environment_test
+Benchmark::start(SYSTEM_BENCHMARK.'_environment_test');
+
+// Test of Kohana is running in Windows
+define('KOHANA_IS_WIN', PHP_SHLIB_SUFFIX === 'dll');
 
 // Check UTF-8 support
@@ -79 +79 @@
 }
 
+// Stop environment_test
+Benchmark::stop(SYSTEM_BENCHMARK.'_environment_test');
+
+// Start system_initialization
+Benchmark::start(SYSTEM_BENCHMARK.'_system_initialization');
+
 // Load utf8 support
 require SYSPATH.'classes/utf8'.EXT;
+
+// Load Event support
+require SYSPATH.'classes/event'.EXT;
+
+// Load Kohana core
+require SYSPATH.'classes/kohana'.EXT;
+
+// Start utf8_conversion
+Benchmark::start(SYSTEM_BENCHMARK.'_utf8_conversion');
 
 // Convert all global variables to UTF-8.
@@ -94 +109 @@
 }
 
-// Load Event support
-require SYSPATH.'classes/event'.EXT;
-
-// Load Kohana core
-require SYSPATH.'classes/kohana'.EXT;
+// Stop utf8_conversion
+Benchmark::stop(SYSTEM_BENCHMARK.'_utf8_conversion');
 
 // Prepare the environment
 Kohana::setup();
-
-// End kohana_loading
-Benchmark::stop(SYSTEM_BENCHMARK.'_kohana_loading');
-
-// Start system_initialization
-Benchmark::start(SYSTEM_BENCHMARK.'_system_initialization');
 
 // Prepare the system

trunk/system/classes/kohana.php

@@ -77 +77 @@
                         return;
 
-                // Start the environment setup benchmark
-                Benchmark::start(SYSTEM_BENCHMARK.'_environment_setup');
-
                 // Define Kohana error constant
                 define('E_KOHANA', 42);
@@ -102 +99 @@
                 }
 
-                // Disable notices and "strict" errors
-                $ER = error_reporting(~E_NOTICE & ~E_STRICT);
+                // Send default text/html UTF-8 header
+                header('Content-Type: text/html; charset=UTF-8');
+
+                // Enable exception handling
+                Kohana_Exception::enable();
+
+                // Enable error handling
+                Kohana_PHP_Exception::enable();
+
+                if (self::$configuration['core']['log_threshold'] > 0)
+                {
+                        // Set the log directory
+                        self::log_directory(self::$configuration['core']['log_directory']);
+
+                        // Enable log writing at shutdown
+                        register_shutdown_function(array(__CLASS__, 'log_save'));
+                }
 
                 // Set the user agent
                 self::$user_agent = trim($_SERVER['HTTP_USER_AGENT']);
 
-                if (function_exists('date_default_timezone_set'))
-                {
-                        $timezone = Kohana::config('locale.timezone');
-
-                        // Set default timezone, due to increased validation of date settings
-                        // which cause massive amounts of E_NOTICEs to be generated in PHP 5.2+
-                        date_default_timezone_set(empty($timezone) ? date_default_timezone_get() : $timezone);
-                }
-
-                // Restore error reporting
-                error_reporting($ER);
+                if ( ! ($timezone = Kohana::config('locale.timezone')))
+                {
+                        // Disable notices and "strict" errors, due to the E_NOTICE that
+                        // will be generated in PHP 5.2+
+                        $ER = error_reporting(~E_NOTICE & ~E_STRICT);
+
+                        // Get the default timezone
+                        $timezone = date_default_timezone_get();
+
+                        // Restore error reporting
+                        error_reporting($ER);
+                }
+
+                // Set the default timezone
+                date_default_timezone_set($timezone);
 
                 // Start output buffering
@@ -126 +142 @@
                 self::$buffer_level = ob_get_level();
 
-                // Send default text/html UTF-8 header
-                header('Content-Type: text/html; charset=UTF-8');
-
                 // Set autoloader
                 spl_autoload_register(array('Kohana', 'auto_load'));
-
-                // Enable exception handling
-                Kohana_Exception::enable();
-
-                // Enable error handling
-                Kohana_PHP_Exception::enable();
-
-                if (self::$configuration['core']['log_threshold'] > 0)
-                {
-                        // Set the log directory
-                        self::log_directory(self::$configuration['core']['log_directory']);
-
-                        // Enable log writing at shutdown
-                        register_shutdown_function(array(__CLASS__, 'log_save'));
-                }
 
                 // Load locales
@@ -171 +169 @@
                 if ($config = Kohana::config('core.enable_hooks'))
                 {
+                        // Start the loading_hooks routine
+                        Benchmark::start(SYSTEM_BENCHMARK.'_loading_hooks');
+
                         $hooks = array();
 
@@ -213 +214 @@
                                 }
                         }
+
+                        // Stop the loading_hooks routine
+                        Benchmark::stop(SYSTEM_BENCHMARK.'_loading_hooks');
                 }
 
                 // Setup is complete, prevent it from being run again
                 $run = TRUE;
-
-                // Stop the environment setup routine
-                Benchmark::stop(SYSTEM_BENCHMARK.'_environment_setup');
         }