Refactor methods into Result class.

c9s · Nov 14, 2011 · 4577050 · 4577050
1 parent 1ed3983
commit 4577050
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 28 deletions.
diff --git a/README.mkd b/README.mkd
@@ -31,6 +31,7 @@ PHP GrindKit for reading cachegrind compatible file.
         $result->headers;    // header list
     }
 
+
 ## Required PHP Extensions
 
 * xdebug http://xdebug.org/docs/profiler

diff --git a/lib/GrindKit/GrindParser.php b/lib/GrindKit/GrindParser.php
@@ -76,28 +76,6 @@ function isMethodCall($fn)
         }
     }
 
-    /* Calcualte Invocation summary for functions 
-     *
-     * */
-    function calculateInvocationSummary($result,$funcdata)
-    {
-        $funcname = $funcdata['function'];
-
-        // if the function exists 
-        if( isset( $result->summary[ $funcname ] ) ) {
-            // calculate here...
-            $result->summary[ $funcname ]['cost'] += (int) $funcdata['self_cost'];
-
-            if( isset($funcdata['invocation_count'] ) )
-                $result->summary[ $funcname ]['invocation_count'] += (int) $funcdata['invocation_count'];
-        } else {
-            $result->summary[ $funcname ] = array();
-            $result->summary[ $funcname ]['cost'] = (int) $funcdata['self_cost'];
-
-            if( isset($funcdata['invocation_count'] ) )
-                $result->summary[ $funcname ]['invocation_count'] = (int) $funcdata['invocation_count'];
-        }
-    }
 
     /* the valgrind parser implementation for version 1 spec
      *
@@ -160,9 +138,9 @@ function parse()
                     $funcdata['self_cost'] = (int)$selfCost;
                 }
 
-                $result->functions[] = $lastFunction = $funcdata;
+                $result->addCall( $funcdata );
+                $lastFunction = $funcdata;
 
-                $this->calculateInvocationSummary( $result, $funcdata );
                 // $info01 = rtrim(fgets($in));
                 // $info02 = rtrim(fgets($in));
             } 
@@ -204,7 +182,7 @@ function parse()
                     list($sourceline,$inclusivecost) = $costs;
                     $funcdata['line'] = (int) $sourceline;
                     $funcdata['self_cost'] = (int) $inclusivecost;
-                    $this->calculateInvocationSummary( $result, $funcdata );
+                    $result->addCall( $funcdata );
                     $this->advanceLine();
                 }
                 $result->functions[] = $funcdata;

diff --git a/lib/GrindKit/GrindParserResult.php b/lib/GrindKit/GrindParserResult.php
@@ -9,18 +9,76 @@
  *
  */
 namespace GrindKit;
+use Exception;
 
 class GrindParserResult 
 {
-    /* function invocation data , parsed from cachegrind file. */
+    /* function invocation list, parsed from cachegrind file. */
     public $functions = array();
+	public $functionMapping = array();
 
     /* function invocation summary data, which is calculated */
     public $summary = array();
 
     /* cachegrind file headers */
     public $headers = array();
 
+	function addCall( & $func )
+	{
+		$this->functions[] = $func;
+		$this->functionMapping[ $func['function'] ] = $func;
+		$this->calculateInvocationSummary( $func );
+	}
+
+    /* Calcualte Invocation summary for functions 
+     * */
+    function calculateInvocationSummary($funcdata)
+    {
+        $funcname = $funcdata['function'];
+
+        // if the function exists 
+        if( isset( $this->summary[ $funcname ] ) ) {
+            // calculate here...
+            $this->summary[ $funcname ]['cost'] += (int) $funcdata['self_cost'];
+
+            if( isset($funcdata['invocation_count'] ) )
+                $this->summary[ $funcname ]['invocation_count'] += (int) $funcdata['invocation_count'];
+        } else {
+            $this->summary[ $funcname ] = array();
+            $this->summary[ $funcname ]['cost'] = (int) $funcdata['self_cost'];
+
+            if( isset($funcdata['invocation_count'] ) )
+                $this->summary[ $funcname ]['invocation_count'] = (int) $funcdata['invocation_count'];
+        }
+    }
+
+	function getCall($name)
+	{
+		if( isset($this->functionMapping[ $name ] ) ) {
+			return $this->functionMapping[ $name ];
+		}
+	}
+
+	function listCalls()
+	{
+		foreach( $this->functions as $func ) {
+			if( isset($func['called_from'] ) )
+				echo "\t";
+			printf("%s [Line %d]: %s\n", $func['filename'],  $func['line'] , $func['function'] );
+		}
+	}
+
+	/* return tree structure result */
+	function getTree()
+	{
+		$entrypoint = '{main}';
+		$main = $this->getCall($entrypoint);
+		if( ! $main )
+			throw new Exception( 'Entrypoint {{main}} not found.' );
+
+		// get entrypoint function
+		// if( isset( $this->functions )
+	}
 
 }
 
diff --git a/lib/GrindKit/Node.php b/lib/GrindKit/Node.php
@@ -14,6 +14,4 @@ class Node
 {
 
 
-
-
 }
diff --git a/tests/GrindKit/GrindParserTest.php b/tests/GrindKit/GrindParserTest.php
@@ -28,6 +28,13 @@ function testParser()
         $this->assertNotEmpty( $result ); 
         $this->assertNotEmpty( $result->summary ); 
         $this->assertNotEmpty( $result->functions ); 
+
+        $result->listCalls();
+        ob_flush();
+
+        $tree = $result->getTree();
+        var_dump( $tree ); 
+        ob_flush();
     }
 
 }