Merge c90228198b into 901e28384b
This commit is contained in:
commit
3f7745c912
@ -643,7 +643,8 @@ int uv__close_nocheckstdio(int fd) {
|
||||
|
||||
|
||||
int uv__close(int fd) {
|
||||
assert(fd > STDERR_FILENO); /* Catch stdio close bugs. */
|
||||
if (!uv__low_fd_flag)
|
||||
assert(fd > STDERR_FILENO); /* Catch stdio close bugs. */
|
||||
#if defined(__MVS__)
|
||||
SAVE_ERRNO(epoll_file_close(fd));
|
||||
#endif
|
||||
|
||||
@ -248,6 +248,8 @@ struct uv__statx {
|
||||
#define uv__nonblock uv__nonblock_fcntl
|
||||
#endif
|
||||
|
||||
extern int uv__low_fd_flag;
|
||||
|
||||
/* core */
|
||||
int uv__cloexec(int fd, int set);
|
||||
int uv__nonblock_ioctl(int fd, int set);
|
||||
|
||||
@ -275,6 +275,8 @@ struct watcher_root {
|
||||
struct watcher_list* rbh_root;
|
||||
};
|
||||
|
||||
int uv__low_fd_flag = 0;
|
||||
|
||||
static int uv__inotify_fork(uv_loop_t* loop, struct watcher_list* root);
|
||||
static int compare_watchers(const struct watcher_list* a,
|
||||
const struct watcher_list* b);
|
||||
@ -657,6 +659,9 @@ int uv__platform_loop_init(uv_loop_t* loop) {
|
||||
if (loop->backend_fd == -1)
|
||||
return UV__ERR(errno);
|
||||
|
||||
if (loop->backend_fd <= STDERR_FILENO)
|
||||
uv__low_fd_flag = 1;
|
||||
|
||||
uv__iou_init(loop->backend_fd, &lfields->ctl, 256, 0);
|
||||
|
||||
return 0;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user