Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #18002 from soheilhy/pollset-review

Browse Source 
Address guantaol@'s comments on Pull #17964
pull/18036/head
Soheil Hassas Yeganeh 6 years ago committed by GitHub
parent 5a37c3967d 611857accb
commit 2c93381e84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/core/lib/iomgr/ev_epollex_linux.cc

4
src/core/lib/iomgr/ev_epollex_linux.cc
Unescape View File

@ -447,7 +447,6 @@ static void fd_orphan(grpc_fd* fd, grpc_closure* on_done, int* release_fd,
// Otherwise, we will receive epoll events after we release the FD. // Otherwise, we will receive epoll events after we release the FD.
epoll_event ev_fd; epoll_event ev_fd;
memset(&ev_fd, 0, sizeof(ev_fd)); memset(&ev_fd, 0, sizeof(ev_fd));
if (release_fd != nullptr) {
if (pollable_obj != nullptr) { // For PO_FD. if (pollable_obj != nullptr) { // For PO_FD.
epoll_ctl(pollable_obj->epfd, EPOLL_CTL_DEL, fd->fd, &ev_fd); epoll_ctl(pollable_obj->epfd, EPOLL_CTL_DEL, fd->fd, &ev_fd);
} }
@ -455,7 +454,6 @@ static void fd_orphan(grpc_fd* fd, grpc_closure* on_done, int* release_fd,
const int epfd = fd->pollset_fds[i]; const int epfd = fd->pollset_fds[i];
epoll_ctl(epfd, EPOLL_CTL_DEL, fd->fd, &ev_fd); epoll_ctl(epfd, EPOLL_CTL_DEL, fd->fd, &ev_fd);
} }
}
*release_fd = fd->fd; *release_fd = fd->fd;
} else { } else {
close(fd->fd); close(fd->fd);
@ -1295,7 +1293,7 @@ static grpc_error* pollset_as_multipollable_locked(grpc_pollset* pollset,
static void pollset_add_fd(grpc_pollset* pollset, grpc_fd* fd) { static void pollset_add_fd(grpc_pollset* pollset, grpc_fd* fd) {
GPR_TIMER_SCOPE("pollset_add_fd", 0); GPR_TIMER_SCOPE("pollset_add_fd", 0);
// We never transition from PO_MULTI to other modes (i.e., PO_FD or PO_EMOPTY) // We never transition from PO_MULTI to other modes (i.e., PO_FD or PO_EMPTY)
// and, thus, it is safe to simply store and check whether the FD has already // and, thus, it is safe to simply store and check whether the FD has already
// been added to the active pollable previously. // been added to the active pollable previously.
if (gpr_atm_acq_load(&pollset->active_pollable_type) == PO_MULTI && if (gpr_atm_acq_load(&pollset->active_pollable_type) == PO_MULTI &&

Write Preview
Loading…
Cancel
Save