wikimedia/mediawiki-extensions-Scribunto
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Scribunto synced 2024-09-23 18:30:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added CPU usage to limit report

Browse source 
Also changed scribunto-lua-in-function-at to not say "anonymous" since
it also applies to functions which are not anonymous as declared, only
anonymous as called.

Change-Id: Ib99cc6d12fbb40a295e1fda35ac48bcf097fdb66
This commit is contained in:
Tim Starling 2012-04-27 15:36:48 +10:00
parent f311f8bc96
commit 35cc7c4630
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Scribunto.i18n.php
View file

@ -29,7 +29,7 @@ $1',
'scribunto-common-backtrace' => 'Backtrace:',
'scribunto-lua-in-function' => 'in function "$1"',
'scribunto-lua-in-main' => 'in main chunk',
'scribunto-lua-in-function-at' => 'in anonymous function at $1:$2',
'scribunto-lua-in-function-at' => 'in the function at $1:$2',
'scribunto-lua-backtrace-line' => '$1: $2',
'scribunto-lua-error-location' => 'Lua error $1: $2',
'scribunto-lua-error' => 'Lua error: $2',

10
engines/LuaSandbox/Engine.php
View file

@ -5,10 +5,10 @@ class Scribunto_LuaSandboxEngine extends Scribunto_LuaEngine {
public function getLimitReport() {
$this->load();
$usage = $this->interpreter->getMemoryUsage();
$lang = Language::factory( 'en' );
$usageStr = $lang->formatSize( $usage );
return "Lua memory usage: {$usageStr}\n";
return
'Lua time usage: ' . sprintf( "%.3f", $this->interpreter->getCPUUsage() ) . "s\n" .
'Lua memory usage: ' . $lang->formatSize( $this->interpreter->getMemoryUsage() ) . "\n";
}
function newInterpreter() {
@ -81,6 +81,10 @@ class Scribunto_LuaSandboxInterpreter extends Scribunto_LuaInterpreter {
public function getMemoryUsage() {
return $this->sandbox->getMemoryUsage();
}
public function getCPUUsage() {
return $this->sandbox->getCPUUsage();
}
}
class Scribunto_LuaSandboxCallback {