diff options
| author | Martin Sustrik <sustrik@fastmq.commkdir> | 2009-12-13 09:56:02 +0100 |
|---|---|---|
| committer | Martin Sustrik <sustrik@fastmq.commkdir> | 2009-12-13 09:56:02 +0100 |
| commit | f4ac8d7a443bd1afb35634d1cccb79943cc316e0 (patch) | |
| tree | 72adb168162c297afb5bf69cfdcf60af7f44ff9c /src/pgm_sender.cpp | |
| parent | 73b765e4b497f6a505cbf88c524085fa0e58e59c (diff) | |
OpenPGM v1 support removed
Diffstat (limited to 'src/pgm_sender.cpp')
| -rw-r--r-- | src/pgm_sender.cpp | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/pgm_sender.cpp b/src/pgm_sender.cpp index 964e00b..7686286 100644 --- a/src/pgm_sender.cpp +++ b/src/pgm_sender.cpp @@ -74,19 +74,13 @@ void zmq::pgm_sender_t::plug (i_inout *inout_) // Alocate 2 fds for PGM socket. int downlink_socket_fd = 0; int uplink_socket_fd = 0; -#ifdef ZMQ_HAVE_OPENPGM2 int rdata_notify_fd = 0; -#endif encoder.set_inout (inout_); // Fill fds from PGM transport. -#ifdef ZMQ_HAVE_OPENPGM1 - pgm_socket.get_sender_fds (&downlink_socket_fd, &uplink_socket_fd); -#elif ZMQ_HAVE_OPENPGM2 pgm_socket.get_sender_fds (&downlink_socket_fd, &uplink_socket_fd, &rdata_notify_fd); -#endif // Add downlink_socket_fd into poller. handle = add_fd (downlink_socket_fd); @@ -95,16 +89,12 @@ void zmq::pgm_sender_t::plug (i_inout *inout_) uplink_handle = add_fd (uplink_socket_fd); // Add rdata_notify_fd into the poller. -#ifdef ZMQ_HAVE_OPENPGM2 rdata_notify_handle = add_fd (rdata_notify_fd); -#endif // Set POLLIN. We wont never want to stop polling for uplink = we never // want to stop porocess NAKs. set_pollin (uplink_handle); -#ifdef ZMQ_HAVE_OPENPGM2 set_pollin (rdata_notify_handle); -#endif // Set POLLOUT for downlink_socket_handle. set_pollout (handle); @@ -116,9 +106,7 @@ void zmq::pgm_sender_t::unplug () { rm_fd (handle); rm_fd (uplink_handle); -#ifdef ZMQ_HAVE_OPENPGM2 rm_fd (rdata_notify_handle); -#endif encoder.set_inout (NULL); inout = NULL; } @@ -195,12 +183,6 @@ void zmq::pgm_sender_t::out_event () zmq_log (1, "pgm rate limit reached, %s(%i)\n", __FILE__, __LINE__); } -#ifdef ZMQ_HAVE_OPENPGM1 - // After sending data slice is owned by tx window. - if (nbytes) { - out_buffer = NULL; - } -#endif write_pos += nbytes; } |