strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #3800 from annando/better-callstack

Browse source 
Improve the way the callstack is built
This commit is contained in:
Tobias Diekershoff 2017-10-18 08:31:14 +02:00 committed by GitHub
parent edb16f8dc8 c309c8bde4
commit e6f5717d89
1 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/Core/System.php
View file

@ -57,22 +57,39 @@ class System {
* @return string * @return string
*/ */
public static function callstack($depth = 4) { public static function callstack($depth = 4) {
$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, $depth + 2); $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
// We remove the first two items from the list since they contain data that we don't need. // We remove the first two items from the list since they contain data that we don't need.
array_shift($trace); array_shift($trace);
array_shift($trace); array_shift($trace);
$callstack = array(); $callstack = array();
foreach ($trace AS $func) { $counter = 0;
$previous = array('class' => '', 'function' => '');
// The ignore list contains all functions that are only wrapper functions
$ignore = array('get_config', 'get_pconfig', 'set_config', 'set_pconfig', 'fetch_url', 'probe_url');
while ($func = array_pop($trace)) {
if (!empty($func['class'])) { if (!empty($func['class'])) {
$callstack[] = $func['class'].'::'.$func['function']; // Don't show multiple calls from the same function (mostly used for "dba" class)
} else { if (($previous['class'] != $func['class']) && ($previous['function'] != 'q')) {
$classparts = explode("\\", $func['class']);
$callstack[] = array_pop($classparts).'::'.$func['function'];
$previous = $func;
}
} elseif (!in_array($func['function'], $ignore)) {
$callstack[] = $func['function']; $callstack[] = $func['function'];
$previous = $func;
} }
} }
return implode(', ', $callstack); $callstack2 = array();
while ((count($callstack2) < $depth) && (count($callstack) > 0)) {
$callstack2[] = array_pop($callstack);
}
return implode(', ', $callstack2);
} }
/// @todo Move the following functions from boot.php /// @todo Move the following functions from boot.php