natalie
/
indefero
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

improve error handling and reporting of the stdio process

master
Thomas Keller 2010-06-21 23:24:47 +02:00
parent 2ee665ac96
commit 24762adecc
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/IDF/Scm/Monotone.php
View File

@ -78,6 +78,7 @@ class IDF_Scm_Monotone_Stdio
$descriptors = array( $descriptors = array(
0 => array("pipe", "r"), 0 => array("pipe", "r"),
1 => array("pipe", "w"), 1 => array("pipe", "w"),
2 => array("pipe", "w"),
); );
$this->proc = proc_open($cmd, $descriptors, $this->pipes); $this->proc = proc_open($cmd, $descriptors, $this->pipes);
@ -102,6 +103,7 @@ class IDF_Scm_Monotone_Stdio
fclose($this->pipes[0]); fclose($this->pipes[0]);
fclose($this->pipes[1]); fclose($this->pipes[1]);
fclose($this->pipes[2]);
proc_close($this->proc); proc_close($this->proc);
$this->proc = null; $this->proc = null;
@ -119,12 +121,9 @@ class IDF_Scm_Monotone_Stdio
if (!is_resource($this->pipes[1])) if (!is_resource($this->pipes[1]))
return false; return false;
$read = array($this->pipes[1]); $read = array($this->pipes[1], $this->pipes[2]);
$write = null;
$except = null;
$streamsChanged = stream_select( $streamsChanged = stream_select(
$read, $write, $except, 0, 20000 $read, $write = null, $except = null, 0, 20000
); );
if ($streamsChanged === false) if ($streamsChanged === false)
@ -152,6 +151,14 @@ class IDF_Scm_Monotone_Stdio
$this->_waitForReadyRead(); $this->_waitForReadyRead();
$version = fgets($this->pipes[1]); $version = fgets($this->pipes[1]);
if ($version === false)
{
$err = fgets($this->pipes[2]);
throw new IDF_Scm_Exception(
"Could not determine stdio version: $err"
);
}
if (!preg_match('/^format-version: (\d+)$/', $version, $m) || if (!preg_match('/^format-version: (\d+)$/', $version, $m) ||
$m[1] != self::$SUPPORTED_STDIO_VERSION) $m[1] != self::$SUPPORTED_STDIO_VERSION)
{ {
@ -233,6 +240,14 @@ class IDF_Scm_Monotone_Stdio
while (true) while (true)
{ {
$c = fgetc($this->pipes[1]); $c = fgetc($this->pipes[1]);
if ($c === false)
{
$err = fgets($this->pipes[2]);
throw new IDF_Scm_Exception(
"Could not read stdio: $err"
);
}
if ($c == ':') if ($c == ':')
{ {
if ($idx == 2) if ($idx == 2)