Fixed #3229, Division by zero caused by immeasurably fast tests

kohana · Sep 16, 2010 · 20d4c48 · 20d4c48
1 parent f57edfd
commit 20d4c48
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/classes/kohana/codebench.php b/classes/kohana/codebench.php
@@ -155,10 +155,10 @@ public function run()
 		foreach ($codebench['benchmarks'] as & $method)
 		{
 			// Calculate percentage difference relative to fastest and slowest methods
-			$method['percent']['fastest']['time']   = $method['time']   / $fastest_method['time']   * 100;
-			$method['percent']['fastest']['memory'] = $method['memory'] / $fastest_method['memory'] * 100;
-			$method['percent']['slowest']['time']   = $method['time']   / $slowest_method['time']   * 100;
-			$method['percent']['slowest']['memory'] = $method['memory'] / $slowest_method['memory'] * 100;
+			$method['percent']['fastest']['time']   = (empty($fastest_method['time']))   ? 0 : $method['time']   / $fastest_method['time']   * 100;
+			$method['percent']['fastest']['memory'] = (empty($fastest_method['memory'])) ? 0 : $method['memory'] / $fastest_method['memory'] * 100;
+			$method['percent']['slowest']['time']   = (empty($slowest_method['time']))   ? 0 : $method['time']   / $slowest_method['time']   * 100;
+			$method['percent']['slowest']['memory'] = (empty($slowest_method['memory'])) ? 0 : $method['memory'] / $slowest_method['memory'] * 100;
 
 			// Assign a grade for time and memory to each method
 			$method['grade']['time']   = $this->_grade($method['percent']['fastest']['time']);
@@ -168,10 +168,10 @@ public function run()
 			foreach ($method['subjects'] as & $subject)
 			{
 				// Calculate percentage difference relative to fastest and slowest subjects for this method
-				$subject['percent']['fastest']['time']   = $subject['time']   / $fastest_subject['time']   * 100;
-				$subject['percent']['fastest']['memory'] = $subject['memory'] / $fastest_subject['memory'] * 100;
-				$subject['percent']['slowest']['time']   = $subject['time']   / $slowest_subject['time']   * 100;
-				$subject['percent']['slowest']['memory'] = $subject['memory'] / $slowest_subject['memory'] * 100;
+				$subject['percent']['fastest']['time']   = (empty($fastest_subject['time']))   ? 0 : $subject['time']   / $fastest_subject['time']   * 100;
+				$subject['percent']['fastest']['memory'] = (empty($fastest_subject['memory'])) ? 0 : $subject['memory'] / $fastest_subject['memory'] * 100;
+				$subject['percent']['slowest']['time']   = (empty($slowest_subject['time']))   ? 0 : $subject['time']   / $slowest_subject['time']   * 100;
+				$subject['percent']['slowest']['memory'] = (empty($slowest_subject['memory'])) ? 0 : $subject['memory'] / $slowest_subject['memory'] * 100;
 
 				// Assign a grade letter for time and memory to each subject
 				$subject['grade']['time']   = $this->_grade($subject['percent']['fastest']['time']);