diff options
author | Martin Sustrik <sustrik@250bpm.com> | 2012-02-16 10:03:45 +0900 |
---|---|---|
committer | Martin Sustrik <sustrik@250bpm.com> | 2012-02-16 10:03:45 +0900 |
commit | 0e167c86051614f9d9d9fab255aae8272b1b056b (patch) | |
tree | 4b1184b3937804a4cdfaad5552085c94e3fa813e /src/pgm_sender.cpp | |
parent | ff12aabf4b2ec48339235ad67175575d2b00adc0 (diff) |
File descriptor passed to in_event and out_event
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
Diffstat (limited to 'src/pgm_sender.cpp')
-rw-r--r-- | src/pgm_sender.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/pgm_sender.cpp b/src/pgm_sender.cpp index 1bfd944..54997cd 100644 --- a/src/pgm_sender.cpp +++ b/src/pgm_sender.cpp @@ -132,7 +132,7 @@ void xs::pgm_sender_t::terminate () void xs::pgm_sender_t::activate_out () { set_pollout (handle); - out_event (); + out_event (retired_fd); } void xs::pgm_sender_t::activate_in () @@ -148,7 +148,7 @@ xs::pgm_sender_t::~pgm_sender_t () } } -void xs::pgm_sender_t::in_event () +void xs::pgm_sender_t::in_event (fd_t fd_) { if (has_rx_timer) { cancel_timer (rx_timer_id); @@ -164,7 +164,7 @@ void xs::pgm_sender_t::in_event () } } -void xs::pgm_sender_t::out_event () +void xs::pgm_sender_t::out_event (fd_t fd_) { // POLLOUT event from send socket. If write buffer is empty, // try to read new data from the encoder. @@ -217,10 +217,10 @@ void xs::pgm_sender_t::timer_event (int token) // Timer cancels on return by poller_base. if (token == rx_timer_id) { has_rx_timer = false; - in_event (); + in_event (retired_fd); } else if (token == tx_timer_id) { has_tx_timer = false; - out_event (); + out_event (retired_fd); } else xs_assert (false); } |