3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-31 01:43:02 +08:00
Code Issues Projects Releases Wiki Activity

fix bugs of the pollset (#2127)

Browse Source 
* fix bugs of the pollset

1. extend 'fd_table' when fd_ is greater or equal than the size of 'fd_table';
2. delete specific fd from pollset before reset pollin or pollout according the description of AIX document

* fix bugs of the pollset

edit error. remove extra spaces and paste fault

* fix bugs of pollset

remove character '-' at the end line.
This commit is contained in:
Laughing 2016-09-27 15:44:54 +08:00 committed by Luca Boccassi
parent 113d3ffc0b
commit 555a087763
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/pollset.cpp
View File

@ -81,7 +81,9 @@ zmq::pollset_t::handle_t zmq::pollset_t::add_fd (fd_t fd_, i_poll_events *events
// Increase the load metric of the thread.
adjust_load (1);
fd_table.resize(fd_ + 1, NULL);
if (fd_ >= fd_table.size ()) {
fd_table.resize(fd_ + 1, NULL);
}
fd_table [fd_] = pe;
return pe;
}
@ -132,15 +134,15 @@ void zmq::pollset_t::reset_pollin (handle_t handle_)
pc.fd = pe->fd;
pc.events = 0;
if (pe->flag_pollout) {
pc.cmd = PS_DELETE;
pc.events = POLLOUT;
pollset_ctl(pollset_fd, &pc, 1);
}
pc.cmd = PS_MOD;
pc.cmd = PS_DELETE;
int rc = pollset_ctl (pollset_fd, &pc, 1);
errno_assert (rc != -1);
if (pe->flag_pollout) {
pc.events = POLLOUT;
pc.cmd = PS_MOD;
rc = pollset_ctl (pollset_fd, &pc, 1);
errno_assert (rc != -1);
}
pe->flag_pollin = false;
}
@ -172,16 +174,16 @@ void zmq::pollset_t::reset_pollout (handle_t handle_)
pc.fd = pe->fd;
pc.events = 0;
if (pe->flag_pollin) {
pc.cmd = PS_DELETE;
pc.events = POLLIN;
pollset_ctl (pollset_fd, &pc, 1);
}
pc.cmd = PS_MOD;
pc.cmd = PS_DELETE;
int rc = pollset_ctl (pollset_fd, &pc, 1);
errno_assert (rc != -1);
if (pe->flag_pollin) {
pc.cmd = PS_MOD;
pc.events = POLLIN;
rc = pollset_ctl (pollset_fd, &pc, 1);
errno_assert (rc != -1);
}
pe->flag_pollout = false;
}