Update to Kohana r4684 which is now Kohana 2.4 and has substantial

changes.

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();