luo980/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unix: make uv__cloexec() EINTR resilient

Browse Source 
It's somewhat underspecified if and when fcntl() can return EINTR. It never
does on Linux for F_GETFD or F_SETFD but let's not make any assumptions.
This commit is contained in:
Ben Noordhuis 2012-06-14 00:44:58 +02:00 committed by Bert Belder
parent 07c6ac2b55
commit b3a97f8981
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/unix/core.c
View File

@ -487,30 +487,36 @@ int uv__nonblock(int fd, int set) {
int uv__cloexec(int fd, int set) { int uv__cloexec(int fd, int set) {
int flags;
int r;
#if __linux__ #if __linux__
/* Linux knows only FD_CLOEXEC so we can safely omit the fcntl(F_GETFD) /* Linux knows only FD_CLOEXEC so we can safely omit the fcntl(F_GETFD)
* syscall. CHECKME: That's probably true for other Unices as well. * syscall. CHECKME: That's probably true for other Unices as well.
*/ */
return fcntl(fd, F_SETFD, set ? FD_CLOEXEC : 0); if (set)
flags = FD_CLOEXEC;
else
flags = 0;
#else #else
int flags; do
r = fcntl(fd, F_GETFD);
while (r == -1 && errno == EINTR);
if ((flags = fcntl(fd, F_GETFD)) == -1) { if (r == -1)
return -1; return -1;
}
if (set) { if (set)
flags |= FD_CLOEXEC; flags = r | FD_CLOEXEC;
} else { else
flags &= ~FD_CLOEXEC; flags = r & ~FD_CLOEXEC;
}
if (fcntl(fd, F_SETFD, flags) == -1) {
return -1;
}
return 0;
#endif #endif
do
r = fcntl(fd, F_SETFD, flags);
while (r == -1 && errno == EINTR);
return r;
} }