mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-11 14:44:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Patch #474169: Move fdopen calls out of critical section.

Browse source
This commit is contained in:
Martin v. Löwis 2001-11-02 23:59:11 +00:00
parent b7b3260128
commit dedbe255d3
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Modules/posixmodule.c
View file

@ -2274,13 +2274,15 @@ popen(const char *command, const char *mode, int pipesize, int *err)
if (dup2(whan, 1) == 0) { /* Connect STDOUT to Pipe Write Side */ if (dup2(whan, 1) == 0) { /* Connect STDOUT to Pipe Write Side */
DosClose(whan); /* Close Now-Unused Pipe Write Handle */ DosClose(whan); /* Close Now-Unused Pipe Write Handle */
if (async_system(command) == NO_ERROR) rc = async_system(command);
retfd = fdopen(rhan, mode); /* And Return Pipe Read Handle */
} }
dup2(oldfd, 1); /* Reconnect STDOUT to Original Handle */ dup2(oldfd, 1); /* Reconnect STDOUT to Original Handle */
DosExitCritSec(); /* Now Allow Other Threads to Run */ DosExitCritSec(); /* Now Allow Other Threads to Run */
if (rc == NO_ERROR)
retfd = fdopen(rhan, mode); /* And Return Pipe Read Handle */
close(oldfd); /* And Close Saved STDOUT Handle */ close(oldfd); /* And Close Saved STDOUT Handle */
return retfd; /* Return fd of Pipe or NULL if Error */ return retfd; /* Return fd of Pipe or NULL if Error */
@ -2293,13 +2295,15 @@ popen(const char *command, const char *mode, int pipesize, int *err)
if (dup2(rhan, 0) == 0) { /* Connect STDIN to Pipe Read Side */ if (dup2(rhan, 0) == 0) { /* Connect STDIN to Pipe Read Side */
DosClose(rhan); /* Close Now-Unused Pipe Read Handle */ DosClose(rhan); /* Close Now-Unused Pipe Read Handle */
if (async_system(command) == NO_ERROR) rc = async_system(command);
retfd = fdopen(whan, mode); /* And Return Pipe Write Handle */
} }
dup2(oldfd, 0); /* Reconnect STDIN to Original Handle */ dup2(oldfd, 0); /* Reconnect STDIN to Original Handle */
DosExitCritSec(); /* Now Allow Other Threads to Run */ DosExitCritSec(); /* Now Allow Other Threads to Run */
if (rc == NO_ERROR)
retfd = fdopen(whan, mode); /* And Return Pipe Write Handle */
close(oldfd); /* And Close Saved STDIN Handle */ close(oldfd); /* And Close Saved STDIN Handle */
return retfd; /* Return fd of Pipe or NULL if Error */ return retfd; /* Return fd of Pipe or NULL if Error */