diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-12-26 11:24:50 -0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-12-26 11:24:50 -0800 |
| commit | 3060a6f662da66008d57a461bf1c9b5b4aa2b002 (patch) | |
| tree | 442fd290505817efc0324f2af6e01805cb7396aa /system/core/Benchmark.php | |
| parent | 1cd6a615bb47a33794e4a4f690c87a348ab752d7 (diff) | |
| parent | 32d25dafd5b033338b6a9bb8c7c53edab462543a (diff) | |
Merge branch 'master' into talmdal_dev
Conflicts:
modules/gallery/controllers/albums.php
modules/gallery/controllers/movies.php
modules/gallery/controllers/photos.php
Diffstat (limited to 'system/core/Benchmark.php')
| -rw-r--r-- | system/core/Benchmark.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/system/core/Benchmark.php b/system/core/Benchmark.php index ce230f11..4b2f78b0 100644 --- a/system/core/Benchmark.php +++ b/system/core/Benchmark.php @@ -2,12 +2,12 @@ /** * Simple benchmarking. * - * $Id: Benchmark.php 4149 2009-04-01 13:32:50Z Shadowhand $ + * $Id: Benchmark.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Core * @author Kohana Team - * @copyright (c) 2007 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ final class Benchmark { @@ -22,6 +22,9 @@ final class Benchmark { */ public static function start($name) { + if (isset(self::$marks[$name]) AND self::$marks[$name][0]['stop'] === FALSE) + throw new Kohana_Exception('A benchmark named :name is already running.', array(':name' => $name)); + if ( ! isset(self::$marks[$name])) { self::$marks[$name] = array(); |