system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-23 03:06:48 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

llvm: Support: don't block signals around close if it can be avoided

Browse source 
Signal blocking originally showed up in 51c2afc4b65b2782 ("Support:
Don't call close again if we get EINTR"), but it was overzealous --
there are systems where the error is known to be fine.

This commit elides signal blocking for said systems (the list is
incomplete though).

Note close() can still fail for other reasons (like ENOSPC), in which
case an error will be returned while the fd slot is cleared up.

Reviewed by: dim
Differential Revision: https://reviews.freebsd.org/D42984
This commit is contained in:
Mateusz Guzik 2023-12-29 18:51:56 +00:00
parent 683ea4d22b
commit 3358108a38
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
contrib/llvm-project/llvm/lib/Support/Unix/Process.inc
View file

@ -235,6 +235,25 @@ std::error_code Process::FixupStandardFileDescriptors() {
return std::error_code();
}
// Close a file descriptor while being mindful of EINTR.
//
// On Unix systems closing a file descriptor usually starts with removing it
// from the fd table (or an equivalent structure). This means any error
// generated past that point will still result in the entry being cleared.
//
// Make sure to not bubble up EINTR as there is nothing to do in that case.
// XXX what about other errors?
#if defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__) || \
defined(__NetBSD__) || defined(__OpenBSD__)
std::error_code Process::SafelyCloseFileDescriptor(int FD) {
int EC = 0;
if (::close(FD) < 0) {
if (errno != EINTR)
EC = errno;
}
return std::error_code(EC, std::generic_category());
}
#else
std::error_code Process::SafelyCloseFileDescriptor(int FD) {
// Create a signal set filled with *all* signals.
sigset_t FullSet, SavedSet;
@ -269,6 +288,7 @@ std::error_code Process::SafelyCloseFileDescriptor(int FD) {
return std::error_code(ErrnoFromClose, std::generic_category());
return std::error_code(EC, std::generic_category());
}
#endif
bool Process::StandardInIsUserInput() {
return FileDescriptorIsDisplayed(STDIN_FILENO);