averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Macros] 'close' unnecessary file descriptors in plugin process

Browse Source 
Close all the pipe file descriptors in the child process after duping
them to the standard I/O. This is not necessary but it's a good thing to
do anyway.
This commit is contained in:
Rintaro Ishizaki
2025-05-14 12:46:47 -07:00
parent be25ea2584
commit 05948bcb93
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Basic/Program.cpp
View File

@@ -123,11 +123,15 @@ swift::ExecuteWithPipe(llvm::StringRef program,
posix_spawn_file_actions_t FileActions;
posix_spawn_file_actions_init(&FileActions);
// Redirect file descriptors...
posix_spawn_file_actions_adddup2(&FileActions, p1.read, STDIN_FILENO);
posix_spawn_file_actions_addclose(&FileActions, p1.write);
posix_spawn_file_actions_adddup2(&FileActions, p2.write, STDOUT_FILENO);
// Close all file descriptors, not needed as we duped them to the stdio.
posix_spawn_file_actions_addclose(&FileActions, p1.read);
posix_spawn_file_actions_addclose(&FileActions, p1.write);
posix_spawn_file_actions_addclose(&FileActions, p2.read);
posix_spawn_file_actions_addclose(&FileActions, p2.write);
// Spawn the subtask.
int error = posix_spawn(&pid, progCStr, &FileActions, nullptr,
@@ -156,13 +160,16 @@ swift::ExecuteWithPipe(llvm::StringRef program,
// Child process.
case 0:
close(p1.write);
close(p2.read);
// Redirect file descriptors...
dup2(p1.read, STDIN_FILENO);
dup2(p2.write, STDOUT_FILENO);
// Close all file descriptors, not needed as we duped them to the stdio.
close(p1.read);
close(p1.write);
close(p2.read);
close(p2.write);
// Execute the program.
if (envp) {
execve(progCStr, const_cast<char **>(argv), const_cast<char **>(envp));
@@ -180,11 +187,12 @@ swift::ExecuteWithPipe(llvm::StringRef program,
// Parent process.
default:
close(p1.read);
close(p2.write);
break;
}
#endif
close(p1.read);
close(p2.write);
llvm::sys::ProcessInfo proc;
proc.Pid = pid;
proc.Process = pid;