suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix order of file close and kqueue de-registration

Browse Source 
Thanks to memcheck.

Merge to v6.1.
(cherry picked from commit 8559192944)
This commit is contained in:
Matthew Flatt 2014-07-09 13:59:16 +01:00 committed by Ryan Culpepper
parent 0bdbb8db2f
commit c973f0fefe
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
racket/src/racket/src/port.c
View File

@ -6292,6 +6292,13 @@ int scheme_fd_regular_file(intptr_t fd, int or_other)
ok = fstat(fd, &buf); ok = fstat(fd, &buf);
} while ((ok == -1) && (errno == EINTR)); } while ((ok == -1) && (errno == EINTR));
if (ok == -1) {
scheme_log(NULL, SCHEME_LOG_ERROR, 0,
"error while checking whether a file descriptor is a regular file: %d",
errno);
return 0;
}
if (S_ISREG(buf.st_mode)) if (S_ISREG(buf.st_mode))
return 1; return 1;
@ -6967,13 +6974,13 @@ fd_close_input(Scheme_Input_Port *port)
rc = adj_refcount(fip->refcount, -1); rc = adj_refcount(fip->refcount, -1);
if (!rc) { if (!rc) {
int cr; int cr;
(void)scheme_fd_to_semaphore(fip->fd, MZFD_REMOVE, 0);
do { do {
cr = close(fip->fd); cr = close(fip->fd);
} while ((cr == -1) && (errno == EINTR)); } while ((cr == -1) && (errno == EINTR));
# ifdef USE_FCNTL_AND_FORK_FOR_FILE_LOCKS # ifdef USE_FCNTL_AND_FORK_FOR_FILE_LOCKS
release_lockf(fip->fd); release_lockf(fip->fd);
# endif # endif
(void)scheme_fd_to_semaphore(fip->fd, MZFD_REMOVE, 0);
} }
} }
#endif #endif
@ -8287,13 +8294,13 @@ fd_close_output(Scheme_Output_Port *port)
if (!rc) { if (!rc) {
int cr; int cr;
(void)scheme_fd_to_semaphore(fop->fd, MZFD_REMOVE, 0);
do { do {
cr = close(fop->fd); cr = close(fop->fd);
} while ((cr == -1) && (errno == EINTR)); } while ((cr == -1) && (errno == EINTR));
# ifdef USE_FCNTL_AND_FORK_FOR_FILE_LOCKS # ifdef USE_FCNTL_AND_FORK_FOR_FILE_LOCKS
release_lockf(fop->fd); release_lockf(fop->fd);
# endif # endif
(void)scheme_fd_to_semaphore(fop->fd, MZFD_REMOVE, 0);
} }
} }
#endif #endif