friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Add cache performance to API and worker

This commit is contained in:
Hypolite Petovan 2018-03-01 01:25:39 -05:00
parent 22fd2409ca
commit 95752b79e8
2 changed files with 47 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/api.php
View File

@ -317,12 +317,16 @@ function api_call(App $a)
/// @TODO round() really everywhere? /// @TODO round() really everywhere?
logger( logger(
parse_url($a->query_string, PHP_URL_PATH) . ": " . sprintf( parse_url($a->query_string, PHP_URL_PATH) . ": " . sprintf(
"Database: %s/%s, Network: %s, I/O: %s, Other: %s, Total: %s", "Database: %s/%s, Cache %s/%s, Network: %s, I/O: %s, Other: %s, Total: %s",
round($a->performance["database"] - $a->performance["database_write"], 3), round($a->performance["database"] - $a->performance["database_write"], 3),
round($a->performance["database_write"], 3), round($a->performance["database_write"], 3),
round($a->performance["cache"], 3),
round($a->performance["cache_write"], 3),
round($a->performance["network"], 2), round($a->performance["network"], 2),
round($a->performance["file"], 2), round($a->performance["file"], 2),
round($duration - ($a->performance["database"] + $a->performance["network"] + $a->performance["file"]), 2), round($duration - ($a->performance["database"]
+ $a->performance["cache"] + $a->performance["cache_write"]
+ $a->performance["network"] + $a->performance["file"]), 2),
round($duration, 2) round($duration, 2)
), ),
LOGGER_DEBUG LOGGER_DEBUG
@ -344,6 +348,21 @@ function api_call(App $a)
} }
} }
$o = "Cache Read:\n";
foreach ($a->callstack["cache"] as $func => $time) {
$time = round($time, 3);
if ($time > 0) {
$o .= $func . ": " . $time . "\n";
}
}
$o .= "\nCache Write:\n";
foreach ($a->callstack["cache_write"] as $func => $time) {
$time = round($time, 3);
if ($time > 0) {
$o .= $func . ": " . $time . "\n";
}
}
$o .= "\nNetwork:\n"; $o .= "\nNetwork:\n";
foreach ($a->callstack["network"] as $func => $time) { foreach ($a->callstack["network"] as $func => $time) {
$time = round($time, 3); $time = round($time, 3);

28
src/Core/Worker.php
View File

@ -325,6 +325,8 @@ class Worker
$a->performance["start"] = microtime(true); $a->performance["start"] = microtime(true);
$a->performance["database"] = 0; $a->performance["database"] = 0;
$a->performance["database_write"] = 0; $a->performance["database_write"] = 0;
$a->performance["cache"] = 0;
$a->performance["cache_write"] = 0;
$a->performance["network"] = 0; $a->performance["network"] = 0;
$a->performance["file"] = 0; $a->performance["file"] = 0;
$a->performance["rendering"] = 0; $a->performance["rendering"] = 0;
@ -409,6 +411,24 @@ class Worker
} }
} }
} }
if (isset($a->callstack["dache"])) {
$o .= "\nCache Read:\n";
foreach ($a->callstack["dache"] as $func => $time) {
$time = round($time, 3);
if ($time > 0) {
$o .= $func.": ".$time."\n";
}
}
}
if (isset($a->callstack["dache_write"])) {
$o .= "\nCache Write:\n";
foreach ($a->callstack["dache_write"] as $func => $time) {
$time = round($time, 3);
if ($time > 0) {
$o .= $func.": ".$time."\n";
}
}
}
if (isset($a->callstack["network"])) { if (isset($a->callstack["network"])) {
$o .= "\nNetwork:\n"; $o .= "\nNetwork:\n";
foreach ($a->callstack["network"] as $func => $time) { foreach ($a->callstack["network"] as $func => $time) {
@ -422,12 +442,16 @@ class Worker
logger( logger(
"ID ".$queue["id"].": ".$funcname.": ".sprintf( "ID ".$queue["id"].": ".$funcname.": ".sprintf(
"DB: %s/%s, Net: %s, I/O: %s, Other: %s, Total: %s".$o, "DB: %s/%s, Cache: %s/%s, Net: %s, I/O: %s, Other: %s, Total: %s".$o,
number_format($a->performance["database"] - $a->performance["database_write"], 2), number_format($a->performance["database"] - $a->performance["database_write"], 2),
number_format($a->performance["database_write"], 2), number_format($a->performance["database_write"], 2),
number_format($a->performance["cache"], 2),
number_format($a->performance["cache_write"], 2),
number_format($a->performance["network"], 2), number_format($a->performance["network"], 2),
number_format($a->performance["file"], 2), number_format($a->performance["file"], 2),
number_format($duration - ($a->performance["database"] + $a->performance["network"] + $a->performance["file"]), 2), number_format($duration - ($a->performance["database"]
+ $a->performance["cache"] + $a->performance["cache_write"]
+ $a->performance["network"] + $a->performance["file"]), 2),
number_format($duration, 2) number_format($duration, 2)
), ),
LOGGER_DEBUG LOGGER_DEBUG