2012-04-13 10:38:12 +00:00
|
|
|
<?php
|
|
|
|
|
|
|
|
class Scribunto_LuaStandaloneEngine extends Scribunto_LuaEngine {
|
|
|
|
static $clockTick;
|
Added tests and fixed bugs
* Added unit tests for the two Lua interpreter classes
* Fixed a bug in checkType()
* Have Scribunto_LuaSandboxInterpreter throw an exception on construct
when the extension doesn't exist, to match the standalone behaviour.
* In Scribunto_LuaSandboxInterpreter, removed debugging statements
accidentally left in.
* Convert LuaSandboxTimeoutError to the appropriate common error
message.
* Moved the option munging from the sandbox engine to the interpreter,
so that the interpreter can be unit tested separately.
* Use /bin/sh instead of bash for lua_ulimit.sh, since dash is smaller
and still supports ulimit.
* Use exec to run the lua binary, so that the vsize of the shell doesn't
add to the memory limit.
* Added a quit function to the standalone interpreter. Unused at present.
* Don't add a comma after the last element of a table in a Lua
expression.
* Make the SIGXCPU detection work: proc_open() runs the command via a
shell, which reports signals in the child via the exit status, so
proc_get_status() will never return a valid termsig element.
* In MWServer:call(), fixed a bug causing the return values to be
wrapped in an array.
* Fixed a misunderstanding of what select() does.
* In MWServer:getStatus(), fixed indexes so that vsize will be correct.
Removed RSS, since it wasn't used anyway and turns out to be measured
in multiples of the page size, and I couldn't be bothered trying to
fetch that from getconf. Return the PID and vsize as numbers rather
than strings.
* Added a simple table dump feature to MWServer:debug().
* Fixed brackets in MWServer:tostring().
* Added missing Linux 32-bit binary.
Change-Id: Ibf5f4656b1c0a9f81287d363184c3fe9d2abdafd
2012-04-16 04:41:08 +00:00
|
|
|
var $initialStatus;
|
2012-04-13 10:38:12 +00:00
|
|
|
|
|
|
|
public function load() {
|
|
|
|
parent::load();
|
|
|
|
if ( php_uname( 's' ) === 'Linux' ) {
|
|
|
|
$this->initialStatus = $this->interpreter->getStatus();
|
|
|
|
} else {
|
|
|
|
$this->initialStatus = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
function getLimitReport() {
|
|
|
|
$this->load();
|
|
|
|
if ( !$this->initialStatus ) {
|
|
|
|
return '';
|
|
|
|
}
|
|
|
|
$status = $this->interpreter->getStatus();
|
|
|
|
$lang = Language::factory( 'en' );
|
|
|
|
return
|
|
|
|
'Lua time usage: ' . sprintf( "%.3f", $status['time'] / $this->getClockTick() ) . "s\n" .
|
|
|
|
'Lua virtual size: ' .
|
|
|
|
$lang->formatSize( $status['vsize'] ) . ' / ' .
|
|
|
|
$lang->formatSize( $this->options['memoryLimit'] ) . "\n" .
|
|
|
|
'Lua estimated memory usage: ' .
|
|
|
|
$lang->formatSize( $status['vsize'] - $this->initialStatus['vsize'] ) . "\n";
|
|
|
|
}
|
|
|
|
|
|
|
|
function getClockTick() {
|
|
|
|
if ( self::$clockTick === null ) {
|
|
|
|
wfSuppressWarnings();
|
|
|
|
self::$clockTick = intval( shell_exec( 'getconf CLK_TCK' ) );
|
|
|
|
wfRestoreWarnings();
|
|
|
|
if ( !self::$clockTick ) {
|
|
|
|
self::$clockTick = 100;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return self::$clockTick;
|
|
|
|
}
|
|
|
|
|
|
|
|
function newInterpreter() {
|
|
|
|
return new Scribunto_LuaStandaloneInterpreter( $this, $this->options );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
class Scribunto_LuaStandaloneInterpreter extends Scribunto_LuaInterpreter {
|
|
|
|
var $engine, $enableDebug, $proc, $writePipe, $readPipe;
|
|
|
|
|
|
|
|
function __construct( $engine, $options ) {
|
|
|
|
global $IP;
|
|
|
|
|
Added tests and fixed bugs
* Added unit tests for the two Lua interpreter classes
* Fixed a bug in checkType()
* Have Scribunto_LuaSandboxInterpreter throw an exception on construct
when the extension doesn't exist, to match the standalone behaviour.
* In Scribunto_LuaSandboxInterpreter, removed debugging statements
accidentally left in.
* Convert LuaSandboxTimeoutError to the appropriate common error
message.
* Moved the option munging from the sandbox engine to the interpreter,
so that the interpreter can be unit tested separately.
* Use /bin/sh instead of bash for lua_ulimit.sh, since dash is smaller
and still supports ulimit.
* Use exec to run the lua binary, so that the vsize of the shell doesn't
add to the memory limit.
* Added a quit function to the standalone interpreter. Unused at present.
* Don't add a comma after the last element of a table in a Lua
expression.
* Make the SIGXCPU detection work: proc_open() runs the command via a
shell, which reports signals in the child via the exit status, so
proc_get_status() will never return a valid termsig element.
* In MWServer:call(), fixed a bug causing the return values to be
wrapped in an array.
* Fixed a misunderstanding of what select() does.
* In MWServer:getStatus(), fixed indexes so that vsize will be correct.
Removed RSS, since it wasn't used anyway and turns out to be measured
in multiples of the page size, and I couldn't be bothered trying to
fetch that from getconf. Return the PID and vsize as numbers rather
than strings.
* Added a simple table dump feature to MWServer:debug().
* Fixed brackets in MWServer:tostring().
* Added missing Linux 32-bit binary.
Change-Id: Ibf5f4656b1c0a9f81287d363184c3fe9d2abdafd
2012-04-16 04:41:08 +00:00
|
|
|
if ( $options['errorFile'] === null ) {
|
|
|
|
$options['errorFile'] = wfGetNull();
|
|
|
|
}
|
|
|
|
if ( $options['luaPath'] === null ) {
|
|
|
|
$path = false;
|
|
|
|
|
|
|
|
if ( PHP_OS == 'Linux' ) {
|
|
|
|
if ( PHP_INT_SIZE == 4 ) {
|
|
|
|
$path = 'lua5_1_5_linux_32_generic/lua';
|
|
|
|
} elseif ( PHP_INT_SIZE == 8 ) {
|
|
|
|
$path = 'lua5_1_5_linux_64_generic/lua';
|
|
|
|
}
|
|
|
|
} elseif ( PHP_OS == 'Windows' ) {
|
|
|
|
if ( PHP_INT_SIZE == 4 ) {
|
|
|
|
$path = 'lua5_1_4_Win32_bin/lua5.1.exe';
|
|
|
|
} elseif ( PHP_INT_SIZE == 8 ) {
|
|
|
|
$path = 'lua5_1_4_Win64_bin/lua5.1.exe';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ( $path === false ) {
|
|
|
|
throw new MWException( 'No Lua interpreter was given in the configuration, ' .
|
|
|
|
"and no bundled binary exists for this platform" );
|
|
|
|
}
|
|
|
|
$options['luaPath'] = dirname( __FILE__ ) . "/binaries/$path";
|
|
|
|
}
|
|
|
|
|
2012-04-13 10:38:12 +00:00
|
|
|
$this->engine = $engine;
|
|
|
|
$this->enableDebug = !empty( $options['debug'] );
|
|
|
|
|
|
|
|
$pipes = null;
|
|
|
|
$cmd = wfEscapeShellArg(
|
|
|
|
$options['luaPath'],
|
|
|
|
dirname( __FILE__ ) . '/mw_main.lua',
|
|
|
|
dirname( __FILE__ ) );
|
|
|
|
if ( php_uname( 's' ) == 'Linux' ) {
|
|
|
|
// Limit memory and CPU
|
|
|
|
$cmd = wfEscapeShellArg(
|
Added tests and fixed bugs
* Added unit tests for the two Lua interpreter classes
* Fixed a bug in checkType()
* Have Scribunto_LuaSandboxInterpreter throw an exception on construct
when the extension doesn't exist, to match the standalone behaviour.
* In Scribunto_LuaSandboxInterpreter, removed debugging statements
accidentally left in.
* Convert LuaSandboxTimeoutError to the appropriate common error
message.
* Moved the option munging from the sandbox engine to the interpreter,
so that the interpreter can be unit tested separately.
* Use /bin/sh instead of bash for lua_ulimit.sh, since dash is smaller
and still supports ulimit.
* Use exec to run the lua binary, so that the vsize of the shell doesn't
add to the memory limit.
* Added a quit function to the standalone interpreter. Unused at present.
* Don't add a comma after the last element of a table in a Lua
expression.
* Make the SIGXCPU detection work: proc_open() runs the command via a
shell, which reports signals in the child via the exit status, so
proc_get_status() will never return a valid termsig element.
* In MWServer:call(), fixed a bug causing the return values to be
wrapped in an array.
* Fixed a misunderstanding of what select() does.
* In MWServer:getStatus(), fixed indexes so that vsize will be correct.
Removed RSS, since it wasn't used anyway and turns out to be measured
in multiples of the page size, and I couldn't be bothered trying to
fetch that from getconf. Return the PID and vsize as numbers rather
than strings.
* Added a simple table dump feature to MWServer:debug().
* Fixed brackets in MWServer:tostring().
* Added missing Linux 32-bit binary.
Change-Id: Ibf5f4656b1c0a9f81287d363184c3fe9d2abdafd
2012-04-16 04:41:08 +00:00
|
|
|
'/bin/sh',
|
2012-04-13 10:38:12 +00:00
|
|
|
dirname( __FILE__ ) . '/lua_ulimit.sh',
|
|
|
|
$options['cpuLimit'], # soft limit (SIGXCPU)
|
|
|
|
$options['cpuLimit'] + 1, # hard limit
|
|
|
|
intval( $options['memoryLimit'] / 1024 ),
|
|
|
|
$cmd );
|
|
|
|
}
|
|
|
|
|
|
|
|
wfDebug( __METHOD__.": creating interpreter: $cmd\n" );
|
|
|
|
|
|
|
|
$this->proc = proc_open(
|
|
|
|
$cmd,
|
|
|
|
array(
|
|
|
|
array( 'pipe', 'r' ),
|
|
|
|
array( 'pipe', 'w' ),
|
|
|
|
array( 'file', $options['errorFile'], 'a' )
|
|
|
|
),
|
|
|
|
$pipes );
|
|
|
|
if ( !$this->proc ) {
|
|
|
|
throw new ScribuntoException( 'scribunto-luastandalone-proc-error' );
|
|
|
|
}
|
|
|
|
$this->writePipe = $pipes[0];
|
|
|
|
$this->readPipe = $pipes[1];
|
|
|
|
}
|
|
|
|
|
|
|
|
function __destruct() {
|
|
|
|
$this->terminate();
|
|
|
|
}
|
|
|
|
|
|
|
|
public function terminate() {
|
|
|
|
if ( $this->proc ) {
|
|
|
|
wfDebug( __METHOD__.": terminating\n" );
|
|
|
|
proc_terminate( $this->proc );
|
|
|
|
proc_close( $this->proc );
|
|
|
|
$this->proc = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Added tests and fixed bugs
* Added unit tests for the two Lua interpreter classes
* Fixed a bug in checkType()
* Have Scribunto_LuaSandboxInterpreter throw an exception on construct
when the extension doesn't exist, to match the standalone behaviour.
* In Scribunto_LuaSandboxInterpreter, removed debugging statements
accidentally left in.
* Convert LuaSandboxTimeoutError to the appropriate common error
message.
* Moved the option munging from the sandbox engine to the interpreter,
so that the interpreter can be unit tested separately.
* Use /bin/sh instead of bash for lua_ulimit.sh, since dash is smaller
and still supports ulimit.
* Use exec to run the lua binary, so that the vsize of the shell doesn't
add to the memory limit.
* Added a quit function to the standalone interpreter. Unused at present.
* Don't add a comma after the last element of a table in a Lua
expression.
* Make the SIGXCPU detection work: proc_open() runs the command via a
shell, which reports signals in the child via the exit status, so
proc_get_status() will never return a valid termsig element.
* In MWServer:call(), fixed a bug causing the return values to be
wrapped in an array.
* Fixed a misunderstanding of what select() does.
* In MWServer:getStatus(), fixed indexes so that vsize will be correct.
Removed RSS, since it wasn't used anyway and turns out to be measured
in multiples of the page size, and I couldn't be bothered trying to
fetch that from getconf. Return the PID and vsize as numbers rather
than strings.
* Added a simple table dump feature to MWServer:debug().
* Fixed brackets in MWServer:tostring().
* Added missing Linux 32-bit binary.
Change-Id: Ibf5f4656b1c0a9f81287d363184c3fe9d2abdafd
2012-04-16 04:41:08 +00:00
|
|
|
public function quit() {
|
|
|
|
if ( !$this->proc ) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
$this->dispatch( array( 'op' => 'quit' ) );
|
|
|
|
proc_close( $this->proc );
|
|
|
|
}
|
|
|
|
|
2012-04-13 10:38:12 +00:00
|
|
|
public function loadString( $text, $chunkName ) {
|
|
|
|
$result = $this->dispatch( array(
|
|
|
|
'op' => 'loadString',
|
|
|
|
'text' => $text,
|
|
|
|
'chunkName' => $chunkName
|
|
|
|
) );
|
|
|
|
return new Scribunto_LuaStandaloneInterpreterFunction( $result[1] );
|
|
|
|
}
|
|
|
|
|
|
|
|
public function callFunction( $func /* ... */ ) {
|
|
|
|
if ( !($func instanceof Scribunto_LuaStandaloneInterpreterFunction) ) {
|
|
|
|
throw new MWException( __METHOD__.': invalid function type' );
|
|
|
|
}
|
|
|
|
$args = func_get_args();
|
|
|
|
unset( $args[0] );
|
|
|
|
// $args is now conveniently a 1-based array, as required by the Lua server
|
|
|
|
|
|
|
|
$result = $this->dispatch( array(
|
|
|
|
'op' => 'call',
|
|
|
|
'id' => $func->id,
|
|
|
|
'args' => $args ) );
|
|
|
|
// Convert return values to zero-based
|
|
|
|
return array_values( $result );
|
|
|
|
}
|
|
|
|
|
|
|
|
public function registerLibrary( $name, $functions ) {
|
|
|
|
$functionIds = array();
|
|
|
|
foreach ( $functions as $funcName => $callback ) {
|
|
|
|
$id = "$name-$funcName";
|
|
|
|
$this->callbacks[$id] = $callback;
|
|
|
|
$functionIds[$funcName] = $id;
|
|
|
|
}
|
|
|
|
$this->dispatch( array(
|
|
|
|
'op' => 'registerLibrary',
|
|
|
|
'name' => $name,
|
|
|
|
'functions' => $functionIds ) );
|
|
|
|
}
|
|
|
|
|
|
|
|
public function getStatus() {
|
|
|
|
$result = $this->dispatch( array(
|
|
|
|
'op' => 'getStatus' ) );
|
|
|
|
return $result[1];
|
|
|
|
}
|
|
|
|
|
|
|
|
protected function handleCall( $message ) {
|
|
|
|
try {
|
|
|
|
$result = $this->callback( $message['id'], $message['args'] );
|
|
|
|
} catch ( Scribunto_LuaError $e ) {
|
|
|
|
return array(
|
|
|
|
'op' => 'error',
|
|
|
|
'value' => $e->getLuaMessage() );
|
|
|
|
}
|
2012-04-16 05:43:34 +00:00
|
|
|
|
|
|
|
// Convert to a 1-based array
|
|
|
|
$result = array_combine( range( 1, count( $result ) ), $result );
|
|
|
|
|
2012-04-13 10:38:12 +00:00
|
|
|
return array(
|
|
|
|
'op' => 'return',
|
2012-04-16 05:43:34 +00:00
|
|
|
'values' => $result
|
2012-04-13 10:38:12 +00:00
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
protected function callback( $id, $args ) {
|
|
|
|
return call_user_func_array( $this->callbacks[$id], $args );
|
|
|
|
}
|
|
|
|
|
|
|
|
protected function handleError( $message ) {
|
|
|
|
throw new Scribunto_LuaError( $message['value'] );
|
|
|
|
}
|
|
|
|
|
|
|
|
protected function dispatch( $msgToLua ) {
|
|
|
|
$this->sendMessage( $msgToLua );
|
|
|
|
$error = false;
|
|
|
|
while ( true ) {
|
|
|
|
$msgFromLua = $this->receiveMessage();
|
|
|
|
|
|
|
|
switch ( $msgFromLua['op'] ) {
|
|
|
|
case 'return':
|
|
|
|
return $msgFromLua['values'];
|
|
|
|
case 'call':
|
|
|
|
$msgToLua = $this->handleCall( $msgFromLua );
|
|
|
|
$this->sendMessage( $msgToLua );
|
|
|
|
break;
|
|
|
|
case 'error':
|
|
|
|
$this->handleError( $msgFromLua );
|
|
|
|
return; // not reached
|
|
|
|
default:
|
|
|
|
wfDebug( __METHOD__ .": invalid response op \"{$msgFromLua['op']}\"\n" );
|
|
|
|
throw new ScribuntoException( 'scribunto-luastandalone-decode-error' );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
protected function sendMessage( $msg ) {
|
|
|
|
$this->debug( "==> {$msg['op']}" );
|
|
|
|
$this->checkValid();
|
|
|
|
// Send the message
|
|
|
|
$encMsg = $this->encodeMessage( $msg );
|
|
|
|
if ( !fwrite( $this->writePipe, $encMsg ) ) {
|
|
|
|
// Write error, probably the process has terminated
|
|
|
|
// If it has, checkStatus() will throw. If not, throw an exception ourselves.
|
|
|
|
$this->checkStatus();
|
|
|
|
throw new ScribuntoException( 'scribunto-luastandalone-write-error' );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
protected function receiveMessage() {
|
|
|
|
$this->checkValid();
|
|
|
|
// Read the header
|
|
|
|
$header = fread( $this->readPipe, 16 );
|
|
|
|
if ( strlen( $header ) !== 16 ) {
|
|
|
|
$this->checkStatus();
|
|
|
|
throw new ScribuntoException( 'scribunto-luastandalone-read-error' );
|
|
|
|
}
|
|
|
|
$length = $this->decodeHeader( $header );
|
|
|
|
|
|
|
|
// Read the reply body
|
|
|
|
$body = fread( $this->readPipe, $length );
|
|
|
|
if ( strlen( $body ) !== $length ) {
|
|
|
|
$this->checkStatus();
|
|
|
|
throw new ScribuntoException( 'scribunto-luastandalone-read-error' );
|
|
|
|
}
|
|
|
|
$msg = unserialize( $body );
|
|
|
|
$this->debug( "<== {$msg['op']}" );
|
|
|
|
return $msg;
|
|
|
|
}
|
|
|
|
|
|
|
|
protected function encodeMessage( $message ) {
|
|
|
|
$serialized = $this->encodeLuaVar( $message );
|
|
|
|
$length = strlen( $serialized );
|
|
|
|
$check = $length * 2 - 1;
|
|
|
|
|
|
|
|
return sprintf( '%08x%08x%s', $length, $check, $serialized );
|
|
|
|
}
|
|
|
|
|
|
|
|
protected function encodeLuaVar( $var, $level = 0 ) {
|
|
|
|
if ( $level > 100 ) {
|
|
|
|
throw new MWException( __METHOD__.': recursion depth limit exceeded' );
|
|
|
|
}
|
|
|
|
$type = gettype( $var );
|
|
|
|
switch ( $type ) {
|
|
|
|
case 'boolean':
|
|
|
|
return $var ? 'true' : 'false';
|
|
|
|
case 'integer':
|
|
|
|
return $var;
|
|
|
|
case 'double':
|
|
|
|
if ( !is_finite( $var ) ) {
|
|
|
|
throw new MWException( __METHOD__.': cannot convert non-finite number' );
|
|
|
|
}
|
|
|
|
return $var;
|
|
|
|
case 'string':
|
|
|
|
return '"' .
|
|
|
|
strtr( $var, array(
|
|
|
|
'"' => '\\"',
|
|
|
|
'\\' => '\\\\',
|
|
|
|
"\n" => '\\n',
|
|
|
|
"\000" => '\\000',
|
|
|
|
) ) .
|
|
|
|
'"';
|
|
|
|
case 'array':
|
|
|
|
$s = '{';
|
|
|
|
foreach ( $var as $key => $element ) {
|
Added tests and fixed bugs
* Added unit tests for the two Lua interpreter classes
* Fixed a bug in checkType()
* Have Scribunto_LuaSandboxInterpreter throw an exception on construct
when the extension doesn't exist, to match the standalone behaviour.
* In Scribunto_LuaSandboxInterpreter, removed debugging statements
accidentally left in.
* Convert LuaSandboxTimeoutError to the appropriate common error
message.
* Moved the option munging from the sandbox engine to the interpreter,
so that the interpreter can be unit tested separately.
* Use /bin/sh instead of bash for lua_ulimit.sh, since dash is smaller
and still supports ulimit.
* Use exec to run the lua binary, so that the vsize of the shell doesn't
add to the memory limit.
* Added a quit function to the standalone interpreter. Unused at present.
* Don't add a comma after the last element of a table in a Lua
expression.
* Make the SIGXCPU detection work: proc_open() runs the command via a
shell, which reports signals in the child via the exit status, so
proc_get_status() will never return a valid termsig element.
* In MWServer:call(), fixed a bug causing the return values to be
wrapped in an array.
* Fixed a misunderstanding of what select() does.
* In MWServer:getStatus(), fixed indexes so that vsize will be correct.
Removed RSS, since it wasn't used anyway and turns out to be measured
in multiples of the page size, and I couldn't be bothered trying to
fetch that from getconf. Return the PID and vsize as numbers rather
than strings.
* Added a simple table dump feature to MWServer:debug().
* Fixed brackets in MWServer:tostring().
* Added missing Linux 32-bit binary.
Change-Id: Ibf5f4656b1c0a9f81287d363184c3fe9d2abdafd
2012-04-16 04:41:08 +00:00
|
|
|
if ( $s !== '{' ) {
|
|
|
|
$s .= ',';
|
|
|
|
}
|
2012-04-13 10:38:12 +00:00
|
|
|
$s .= '[' . $this->encodeLuaVar( $key, $level + 1 ) . ']' .
|
Added tests and fixed bugs
* Added unit tests for the two Lua interpreter classes
* Fixed a bug in checkType()
* Have Scribunto_LuaSandboxInterpreter throw an exception on construct
when the extension doesn't exist, to match the standalone behaviour.
* In Scribunto_LuaSandboxInterpreter, removed debugging statements
accidentally left in.
* Convert LuaSandboxTimeoutError to the appropriate common error
message.
* Moved the option munging from the sandbox engine to the interpreter,
so that the interpreter can be unit tested separately.
* Use /bin/sh instead of bash for lua_ulimit.sh, since dash is smaller
and still supports ulimit.
* Use exec to run the lua binary, so that the vsize of the shell doesn't
add to the memory limit.
* Added a quit function to the standalone interpreter. Unused at present.
* Don't add a comma after the last element of a table in a Lua
expression.
* Make the SIGXCPU detection work: proc_open() runs the command via a
shell, which reports signals in the child via the exit status, so
proc_get_status() will never return a valid termsig element.
* In MWServer:call(), fixed a bug causing the return values to be
wrapped in an array.
* Fixed a misunderstanding of what select() does.
* In MWServer:getStatus(), fixed indexes so that vsize will be correct.
Removed RSS, since it wasn't used anyway and turns out to be measured
in multiples of the page size, and I couldn't be bothered trying to
fetch that from getconf. Return the PID and vsize as numbers rather
than strings.
* Added a simple table dump feature to MWServer:debug().
* Fixed brackets in MWServer:tostring().
* Added missing Linux 32-bit binary.
Change-Id: Ibf5f4656b1c0a9f81287d363184c3fe9d2abdafd
2012-04-16 04:41:08 +00:00
|
|
|
'=' . $this->encodeLuaVar( $element, $level + 1 );
|
2012-04-13 10:38:12 +00:00
|
|
|
}
|
|
|
|
$s .= '}';
|
|
|
|
return $s;
|
|
|
|
case 'object':
|
|
|
|
if ( $var instanceof Scribunto_LuaStandaloneInterpreterFunction ) {
|
|
|
|
return 'chunks[' . intval( $var->id ) . ']';
|
|
|
|
} else {
|
|
|
|
throw new MWException( __METHOD__.': unable to convert object of type ' .
|
|
|
|
get_class( $var ) );
|
|
|
|
}
|
|
|
|
case 'resource':
|
|
|
|
throw new MWException( __METHOD__.': unable to convert resource' );
|
|
|
|
case 'NULL':
|
|
|
|
return 'nil';
|
|
|
|
default:
|
|
|
|
throw new MWException( __METHOD__.': unable to convert variable of unknown type' );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
protected function decodeHeader( $header ) {
|
|
|
|
$length = substr( $header, 0, 8 );
|
|
|
|
$check = substr( $header, 8, 8 );
|
|
|
|
if ( !preg_match( '/^[0-9a-f]+$/', $length ) || !preg_match( '/^[0-9a-f]+$/', $check ) ) {
|
|
|
|
throw new ScribuntoException( 'scribunto-luastandalone-decode-error' );
|
|
|
|
}
|
|
|
|
$length = hexdec( $length );
|
|
|
|
$check = hexdec( $check );
|
|
|
|
if ( $length * 2 - 1 !== $check ) {
|
|
|
|
throw new ScribuntoException( 'scribunto-luastandalone-decode-error' );
|
|
|
|
}
|
|
|
|
return $length;
|
|
|
|
}
|
|
|
|
|
|
|
|
protected function checkValid() {
|
|
|
|
if ( !$this->proc ) {
|
|
|
|
wfDebug( __METHOD__ . ": process already terminated\n" );
|
|
|
|
throw new ScribuntoException( 'scribunto-luastandalone-gone' );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
protected function checkStatus() {
|
|
|
|
$this->checkValid();
|
|
|
|
$status = proc_get_status( $this->proc );
|
|
|
|
if ( !$status['running'] ) {
|
|
|
|
wfDebug( __METHOD__.": not running\n" );
|
|
|
|
proc_close( $this->proc );
|
|
|
|
$this->proc = false;
|
|
|
|
if ( $status['signaled'] ) {
|
Added tests and fixed bugs
* Added unit tests for the two Lua interpreter classes
* Fixed a bug in checkType()
* Have Scribunto_LuaSandboxInterpreter throw an exception on construct
when the extension doesn't exist, to match the standalone behaviour.
* In Scribunto_LuaSandboxInterpreter, removed debugging statements
accidentally left in.
* Convert LuaSandboxTimeoutError to the appropriate common error
message.
* Moved the option munging from the sandbox engine to the interpreter,
so that the interpreter can be unit tested separately.
* Use /bin/sh instead of bash for lua_ulimit.sh, since dash is smaller
and still supports ulimit.
* Use exec to run the lua binary, so that the vsize of the shell doesn't
add to the memory limit.
* Added a quit function to the standalone interpreter. Unused at present.
* Don't add a comma after the last element of a table in a Lua
expression.
* Make the SIGXCPU detection work: proc_open() runs the command via a
shell, which reports signals in the child via the exit status, so
proc_get_status() will never return a valid termsig element.
* In MWServer:call(), fixed a bug causing the return values to be
wrapped in an array.
* Fixed a misunderstanding of what select() does.
* In MWServer:getStatus(), fixed indexes so that vsize will be correct.
Removed RSS, since it wasn't used anyway and turns out to be measured
in multiples of the page size, and I couldn't be bothered trying to
fetch that from getconf. Return the PID and vsize as numbers rather
than strings.
* Added a simple table dump feature to MWServer:debug().
* Fixed brackets in MWServer:tostring().
* Added missing Linux 32-bit binary.
Change-Id: Ibf5f4656b1c0a9f81287d363184c3fe9d2abdafd
2012-04-16 04:41:08 +00:00
|
|
|
throw new ScribuntoException( 'scribunto-luastandalone-signal',
|
|
|
|
array( 'args' => array( $status['termsig'] ) ) );
|
|
|
|
} elseif ( defined( 'SIGXCPU' ) && $status['exitcode'] == 128 + SIGXCPU ) {
|
|
|
|
throw new ScribuntoException( 'scribunto-common-timeout' );
|
2012-04-13 10:38:12 +00:00
|
|
|
} else {
|
|
|
|
throw new ScribuntoException( 'scribunto-luastandalone-exited',
|
|
|
|
array( 'args' => array( $status['exitcode'] ) ) );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
protected function debug( $msg ) {
|
|
|
|
if ( $this->enableDebug ) {
|
|
|
|
wfDebug( "Lua: $msg\n" );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
class Scribunto_LuaStandaloneInterpreterFunction {
|
|
|
|
public $id;
|
|
|
|
|
|
|
|
function __construct( $id ) {
|
|
|
|
$this->id = $id;
|
|
|
|
}
|
|
|
|
}
|