hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-12 22:04:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix potential deadlock when writing a lot of data to a psql pipe and not reading what comes back;

Browse Source 
stdout/stderr weren't used anyway so just connect them through
This commit is contained in:
Frederik Ramm
2011-02-21 00:02:17 +00:00
parent a4c63c094f
commit b83af9c248
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
utils/setup.php
View File

@@ -372,22 +372,18 @@
$sCMD = 'psql -p '.$aDSNInfo['port'].' '.$aDSNInfo['database']; $sCMD = 'psql -p '.$aDSNInfo['port'].' '.$aDSNInfo['database'];
$aDescriptors = array( $aDescriptors = array(
0 => array('pipe', 'r'), 0 => array('pipe', 'r'),
1 => array('pipe', 'w'), 1 => STDOUT,
2 => array('file', '/dev/null', 'a') 2 => STDERR
); );
$ahPipes = null; $ahPipes = null;
$hProcess = proc_open($sCMD, $aDescriptors, $ahPipes); $hProcess = proc_open($sCMD, $aDescriptors, $ahPipes);
if (!is_resource($hProcess)) fail('unable to start pgsql'); if (!is_resource($hProcess)) fail('unable to start pgsql');
fwrite($ahPipes[0], $sScript); while(strlen($sScript))
fclose($ahPipes[0]);
// TODO: error checking
while(!feof($ahPipes[1]))
{ {
echo fread($ahPipes[1], 4096); $written = fwrite($ahPipes[0], $sScript);
$sScript = substr($sScript, $written);
} }
fclose($ahPipes[1]); fclose($ahPipes[0]);
proc_close($hProcess); proc_close($hProcess);
} }