ben/handbrake-cluster-webui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bugs in ForegroundTask runner

Browse Source 
Fixed bugs and tidied code.
This commit is contained in:
Ben Roberts
2010-08-22 22:57:49 +01:00
parent 9d244ce5ed
commit 3c9129657d
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/HandBrakeCluster/ForegroundTask.class.php
View File

@@ -35,11 +35,11 @@ class HandBrakeCluster_ForegroundTask {
); );
$pipes = array(); $pipes = array();
$process = proc_open($handbrake_cmd, $descriptors, $pipes); $process = proc_open($command, $descriptors, $pipes);
stream_set_blocking($pipes[0], 0); // Make stdin/stdout/stderr non-blocking stream_set_blocking($pipes[self::PIPE_STDIN], 0); // Make stdin/stdout/stderr non-blocking
stream_set_blocking($pipes[1], 0); stream_set_blocking($pipes[self::PIPE_STDOUT], 0);
stream_set_blocking($pipes[2], 0); stream_set_blocking($pipes[self::PIPE_STDERR], 0);
if ($txLen == 0) { if ($txLen == 0) {
fclose($pipes[0]); fclose($pipes[0]);
@@ -48,45 +48,45 @@ class HandBrakeCluster_ForegroundTask {
while (true) { while (true) {
$rx = array(); // The program's stdout/stderr $rx = array(); // The program's stdout/stderr
if (!$stdoutDone) { if (!$stdoutDone) {
$rx[] = $pipes[1]; $rx[] = $pipes[self::PIPE_STDOUT];
} }
if (!$stderrDone) { if (!$stderrDone) {
$rx[] = $pipes[2]; $rx[] = $pipes[self::PIPE_STDERR];
} }
$tx = array(); // The program's stdin $tx = array(); // The program's stdin
if ($txOff < $txLen) { if ($txOff < $txLen) {
$tx[] = $pipes[0]; $tx[] = $pipes[self::PIPE_STDIN];
} }
stream_select($rx, $tx, $ex = null, null, null); // Block til r/w possible stream_select($rx, $tx, $ex = null, null, null); // Block til r/w possible
if (!empty($tx)) { if (!empty($tx)) {
$txRet = fwrite($pipes[0], substr($stdin, $txOff, 8192)); $txRet = fwrite($pipes[self::PIPE_STDIN], substr($stdin, $txOff, 8192));
if ($txRet !== false) { if ($txRet !== false) {
$txOff += $txRet; $txOff += $txRet;
} }
if ($txOff >= $txLen) { if ($txOff >= $txLen) {
fclose($pipes[0]); fclose($pipes[self::PIPE_STDIN]);
} }
} }
foreach ($rx as $r) { foreach ($rx as $r) {
if ($r == $pipes[1]) { if ($r == $pipes[self::PIPE_STDOUT]) {
$chunk = fread($pipes[1], 8192); $chunk = fread($pipes[self::PIPE_STDOUT], 8192);
if (feof($pipes[1])) { if (feof($pipes[self::PIPE_STDOUT])) {
fclose($pipes[1]); $stdoutDone = true; fclose($pipes[self::PIPE_STDOUT]); $stdoutDone = true;
} }
if ($callback_stderr) { if ($callback_stdout) {
call_user_func($callback_stdout, $identifier, $chunk); call_user_func($callback_stdout, $identifier, $chunk);
} else { } else {
$stdout .= $chunk; $stdout .= $chunk;
} }
} else if ($r == $pipes[2]) { } else if ($r == $pipes[self::PIPE_STDERR]) {
$chunk = fread($pipes[2], 8192); $chunk = fread($pipes[self::PIPE_STDERR], 8192);
if (feof($pipes[2])) { if (feof($pipes[self::PIPE_STDERR])) {
fclose($pipes[2]); $stderrDone = true; fclose($pipes[self::PIPE_STDERR]); $stderrDone = true;
} }
if ($callback_stderr) { if ($callback_stderr) {