Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/249921
Change subject: Move getResourceUsage to Scribunto_LuaSandboxEngine
......................................................................
Move getResourceUsage to Scribunto_LuaSandboxEngine
Fix-up for I6a4ed03c126.
Change-Id: I69e9218c6a3da6ca2a6f13e5911fee1c78a8f4a0
---
M engines/LuaSandbox/Engine.php
1 file changed, 11 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Scribunto
refs/changes/21/249921/1
diff --git a/engines/LuaSandbox/Engine.php b/engines/LuaSandbox/Engine.php
index 21e9d91..817b442 100644
--- a/engines/LuaSandbox/Engine.php
+++ b/engines/LuaSandbox/Engine.php
@@ -28,6 +28,17 @@
}
}
+ public function getResourceUsage( $resource ) {
+ switch ( $resource ) {
+ case self::MEMORY_PEAK_BYTES:
+ return $this->interpreter->getPeakMemoryUsage();
+ case self::CPU_SECONDS:
+ return $this->interpreter->getCPUUsage();
+ default:
+ return false;
+ }
+ }
+
private function getLimitReportData() {
$ret = array();
$this->load();
@@ -340,17 +351,6 @@
public function getCPUUsage() {
return $this->sandbox->getCPUUsage();
- }
-
- public function getResourceUsage( $resource ) {
- switch ( $resource ) {
- case self::MEMORY_PEAK_BYTES:
- return $this->getPeakMemoryUsage();
- case self::CPU_SECONDS:
- return $this->getCPUUsage();
- default:
- return false;
- }
}
public function getProfilerFunctionReport( $units ) {
--
To view, visit https://gerrit.wikimedia.org/r/249921
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I69e9218c6a3da6ca2a6f13e5911fee1c78a8f4a0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Scribunto
Gerrit-Branch: wmf/1.27.0-wmf.4
Gerrit-Owner: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
