diff --git a/ChangeLog b/ChangeLog index bde8107f9..bee5765b8 100755 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ $Source$ 2005-07-29 Marc Delisle * tbl_change.php, lang/*: new message $strAndThen + * libraries/dbg/profiling.php: improvements, thanks to Glen Arason 2005-07-28 Marc Delisle * pdf_pages.php: Go button renamed to Save because it's really used to save coordinates diff --git a/libraries/dbg/profiling.php b/libraries/dbg/profiling.php index 56f55212f..f04c71e53 100644 --- a/libraries/dbg/profiling.php +++ b/libraries/dbg/profiling.php @@ -17,12 +17,12 @@ if (isset($GLOBALS['DBG']) && $GLOBALS['DBG'] * LICENCE: This source file is subject to Mozilla Public License (MPL) * AUTHOR: Dmitri Dmitrienko */ - + $dbg_prof_results = ""; // gma added var dbg_get_profiler_results($dbg_prof_results); - + $cwdlen = strlen(getcwd()); // gma added var, $cwdlen = strlen(getcwd()); echo '
' . "\n" . - '' . "\n" . - '' . "\n" . + '' . "\n"; // gma change "." to ";" + $tr = '' . "\n" . // gma added "$tr =" '' . "\n" . '' . "\n" . '' . "\n" . @@ -32,10 +32,11 @@ if (isset($GLOBALS['DBG']) && $GLOBALS['DBG'] '' . "\n" . '' . "\n" . '' . "\n" . - '' . "\n" . - '' . "\n"; - foreach ($dbg_prof_results['line_no'] AS $idx => $line_no) { + '' . "\n"; // gma change "." to ";" + echo $tr.'' . "\n"; $lines = 0; // gma added "echo $tr." and "$lines = 0;" + foreach ($dbg_prof_results['line_no'] AS $idx => $line_no) { $lines++; // gma added "$lines++;" $mod_no = $dbg_prof_results['mod_no'][$idx]; + $mod_name = ""; // gma added var dbg_get_module_name($mod_no, $mod_name); //if (strpos("!".$mod_name, 'dbg.php') > 0) continue; @@ -51,10 +52,11 @@ if (isset($GLOBALS['DBG']) && $GLOBALS['DBG'] $time_avg_hit = sprintf('%.3f', $time_avg_hit); $time_min = sprintf('%.3f', $time_min); $time_max = sprintf('%.3f', $time_max); - + $ctx_id = ""; // gma added var dbg_get_source_context($mod_no, $line_no, $ctx_id); //use a default context name if needed + $ctx_name = ""; // gma added var if (dbg_get_context_name($ctx_id, $ctx_name) && strcmp($ctx_name,'') == 0) { $ctx_name = "::main"; @@ -66,7 +68,7 @@ if (isset($GLOBALS['DBG']) && $GLOBALS['DBG'] if ($time_avg_hit > $GLOBALS['cfg']['DBG']['profile']['threshold'] ) { echo '' . - '' . + '' . // gma changed "$mod_name" to "substr($mod_name,$cwdlen+1)" '' . '' . '' . @@ -76,10 +78,18 @@ if (isset($GLOBALS['DBG']) && $GLOBALS['DBG'] '' . '' . '' . "\n"; + if($lines == 20) { $lines = 0; echo $tr;} // gma added line. Repeats the header every x lines. } } echo "
' . $GLOBALS['strDBGModule'] . '' . $GLOBALS['strDBGLine'] . '' . $GLOBALS['strDBGHits'] . '' . $GLOBALS['strDBGMaxTimeMs'] . '' . $GLOBALS['strDBGContextID'] . '' . $GLOBALS['strDBGContext'] . '
' . $mod_name . '' . substr($mod_name,$cwdlen+1) . '' . $line_no . '' . $hit_cnt . '' . $time_avg_hit . '' . $ctx_id . '' . $ctx_name . '
"; } } - +/* gma ... Developer Notes +These two scriptlets can be used as On/Off buttons in your browsers, add to links. +ON: +javascript: document.cookie = 'DBGSESSID=' + escape('1;d=1,p=1') + '; path=/'; document.execCommand('refresh'); +or ... javascript: document.cookie = 'DBGSESSID=' + escape('1;d=0,p=1') + '; path=/'; document.execCommand('refresh'); +OFF: +javascript: document.cookie = 'DBGSESSID=' + escape('1;d=0,p=0') + '; path=/'; document.execCommand('refresh'); +*/ ?>