diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-05-04 12:43:46 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-05-04 12:43:46 +0000 |
| commit | 182762b66758b694aac65e3b870fac77db9e8477 (patch) | |
| tree | d15090d7a7a3c06289c2f346bf5e930100fca253 /sal | |
| parent | 78269766b1368b4306c274437117f7d4319c077b (diff) | |
INTEGRATION: CWS hro04 (1.38.38); FILE MERGED
2006/05/03 10:51:09 hro 1.38.38.1: #b6409032# Handle EINTR correctly, retry system call in case of interrupt
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/unx/process.c | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/sal/osl/unx/process.c b/sal/osl/unx/process.c index 988b45a1da41..d9a472a00b00 100644 --- a/sal/osl/unx/process.c +++ b/sal/osl/unx/process.c @@ -4,9 +4,9 @@ * * $RCSfile: process.c,v $ * - * $Revision: 1.38 $ + * $Revision: 1.39 $ * - * last change: $Author: obo $ $Date: 2006-01-20 13:31:11 $ + * last change: $Author: rt $ $Date: 2006-05-04 13:43:46 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -582,6 +582,7 @@ static void ChildStatusProc(void *pData) if ((pid > 0) && (i == 0)) { + pid_t child_pid; osl_acquireMutex(ChildListMutex); pdata->m_pProcImpl->m_pid = pid; @@ -603,9 +604,24 @@ static void ChildStatusProc(void *pData) osl_setCondition(pdata->m_started); - if ((pid = waitpid(pid, &status, 0)) < 0) + do + { + child_pid = waitpid(pid, &status, 0); + } while ( 0 > child_pid && EINTR == errno ); + + if ( child_pid < 0) + { OSL_TRACE("Failed to wait for child process, errno=%d (%s)\n", errno, strerror(errno)); - else + + /* + We got an other error than EINTR. Anyway we have to wake up the + waiting thread under any circumstances */ + + child_pid = pid; + } + + + if ( child_pid > 0 ) { oslProcessImpl* pChild; @@ -616,7 +632,7 @@ static void ChildStatusProc(void *pData) /* check if it is one of our child processes */ while (pChild != NULL) { - if (pChild->m_pid == pid) + if (pChild->m_pid == child_pid) { if (WIFEXITED(status)) pChild->m_status = WEXITSTATUS(status); |