diff options
| author | oetting <jacob@oettinger.dk> | 2008-04-23 08:03:26 +0000 |
|---|---|---|
| committer | oetting <jacob@oettinger.dk> | 2008-04-23 08:03:26 +0000 |
| commit | 079795540ffddc6f8e3d939d2046d3dbefb3afca (patch) | |
| tree | 99e18ff22d25f379f87513b0f55a2f34984a3dea | |
| parent | d24dba24bd911b63234fa66e491471b79ac9d9d3 (diff) | |
| download | webgrind-079795540ffddc6f8e3d939d2046d3dbefb3afca.zip webgrind-079795540ffddc6f8e3d939d2046d3dbefb3afca.tar.gz webgrind-079795540ffddc6f8e3d939d2046d3dbefb3afca.tar.bz2 | |
Simpler detection of selftraces
| -rw-r--r-- | library/FileHandler.php | 14 | ||||
| -rw-r--r-- | library/Reader.php | 2 | ||||
| -rw-r--r-- | templates/index.phtml | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/library/FileHandler.php b/library/FileHandler.php index 74ab369..44c54e3 100644 --- a/library/FileHandler.php +++ b/library/FileHandler.php @@ -73,12 +73,13 @@ class Webgrind_FileHandler{ foreach($list as $file){ $absoluteFilename = $dir.$file; + // Make sure that script never parses the profile currently being generated. (infinite loop) + if(function_exists('xdebug_get_profiler_filename') && xdebug_get_profiler_filename()==$absoluteFilename) + continue; + $invokeUrl = $this->getInvokeUrl($absoluteFilename); - $files[$file] = array('absoluteFilename'=>$absoluteFilename, 'mtime'=>filemtime($absoluteFilename), 'preprocessed'=>false, 'invokeUrl'=>$invokeUrl, 'selftrace'=>false); - if($invokeUrl == $scriptFilename) - $files[$file]['selftrace'] = true; - + $files[$file] = array('absoluteFilename'=>$absoluteFilename, 'mtime'=>filemtime($absoluteFilename), 'preprocessed'=>false, 'invokeUrl'=>$invokeUrl); } return $files; } @@ -88,11 +89,10 @@ class Webgrind_FileHandler{ * * @return array Files */ - public function getTraceList($selftraces=false){ + public function getTraceList(){ $result = array(); foreach($this->files as $fileName=>$file){ - if(!$file['selftrace'] || $selftraces) - $result[] = array('filename' => $fileName, 'invokeUrl' => str_replace($_SERVER['DOCUMENT_ROOT'].'/', '', $file['invokeUrl'])); + $result[] = array('filename' => $fileName, 'invokeUrl' => str_replace($_SERVER['DOCUMENT_ROOT'].'/', '', $file['invokeUrl'])); } return $result; } diff --git a/library/Reader.php b/library/Reader.php index f4a3232..f97204f 100644 --- a/library/Reader.php +++ b/library/Reader.php @@ -14,7 +14,7 @@ class Webgrind_Reader /** * Binary number format used. - * @see http://dk2.php.net/pack + * @see http://php.net/pack */ const NR_FORMAT = 'V'; diff --git a/templates/index.phtml b/templates/index.phtml index 345a2fd..c3f6122 100644 --- a/templates/index.phtml +++ b/templates/index.phtml @@ -232,7 +232,7 @@ <span id="data_file"></span> @ <span id="mtime"></span> </div> <div style="float:right;"> - <span id="invocation_sum"></span> function calls in <span id="runtime_sum"></span> µs + <span id="invocation_sum"></span> different functions called in <span id="runtime_sum"></span> µs </div> <div style="clear:both"></div> <table class="tablesorter" id="function_table" cellspacing="0"> |