9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

librb: close FDs when they're freed (outside of select handler)

Browse source
This commit is contained in:
Simon Arlott 2016-04-28 22:00:54 +01:00 committed by William Pitcock
parent fed4fc59bc
commit ff0414c856
2 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
librb/src/commio.c
View file

@ -110,6 +110,16 @@ free_fds(void)
RB_DLINK_FOREACH_SAFE(ptr, next, closed_list.head) RB_DLINK_FOREACH_SAFE(ptr, next, closed_list.head)
{ {
F = ptr->data; F = ptr->data;
number_fd--;
#ifdef _WIN32
if(F->type & (RB_FD_SOCKET | RB_FD_PIPE))
closesocket(F->fd);
else
#endif
close(F->fd);
rb_dlinkDelete(ptr, &closed_list); rb_dlinkDelete(ptr, &closed_list);
rb_bh_free(fd_heap, F); rb_bh_free(fd_heap, F);
} }
@ -885,18 +895,6 @@ rb_close(rb_fde_t *F)
remove_fd(F); remove_fd(F);
ClearFDOpen(F); ClearFDOpen(F);
} }
number_fd--;
#ifdef _WIN32
if(type & (RB_FD_SOCKET | RB_FD_PIPE))
{
closesocket(fd);
return;
}
else
#endif
close(fd);
} }

3
librb/src/epoll.c
View file

@ -188,9 +188,6 @@ rb_select_epoll(long delay)
PF *hdl; PF *hdl;
rb_fde_t *F = ep_info->pfd[i].data.ptr; rb_fde_t *F = ep_info->pfd[i].data.ptr;
old_flags = F->pflags; old_flags = F->pflags;
if(!IsFDOpen(F))
continue;
if(ep_info->pfd[i].events & (EPOLLIN | EPOLLHUP | EPOLLERR)) if(ep_info->pfd[i].events & (EPOLLIN | EPOLLHUP | EPOLLERR))
{ {
hdl = F->read_handler; hdl = F->read_handler;