summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormalosek <malosek@fastmq.com>2009-11-04 18:59:19 +0100
committermalosek <malosek@fastmq.com>2009-11-04 18:59:19 +0100
commit84585a9561b5e3bd39baa8d49b889455362334ea (patch)
tree4000153bd8d879cc8cb520ee32f246096d110cda
parentc2cd7977f7a82e978d77b2d4d8e23d78f71e809c (diff)
pgm_transport_recvmsgv in process_upstream returns PGM_IO_STATUS_RATE_LIMITED on busy sender
-rw-r--r--src/pgm_socket.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/pgm_socket.cpp b/src/pgm_socket.cpp
index ed764c7..e1def56 100644
--- a/src/pgm_socket.cpp
+++ b/src/pgm_socket.cpp
@@ -617,7 +617,7 @@ size_t zmq::pgm_socket_t::send (unsigned char *data_, size_t data_len_)
// We have to write all data as one packet.
if (nbytes > 0) {
- zmq_log (1, "data sent %i, %s(%i)\n", (int) nbytes,
+ zmq_log (1, "data sent %iB, %s(%i)\n", (int) nbytes,
__FILE__, __LINE__);
zmq_assert ((ssize_t) nbytes == (ssize_t) data_len_);
}
@@ -872,7 +872,8 @@ void zmq::pgm_socket_t::process_upstream (void)
(int) status, (int) dummy_bytes, __FILE__, __LINE__);
// No data should be returned.
- zmq_assert (dummy_bytes == 0 && status == PGM_IO_STATUS_TIMER_PENDING);
+ zmq_assert (dummy_bytes == 0 && (status == PGM_IO_STATUS_TIMER_PENDING ||
+ status == PGM_IO_STATUS_RATE_LIMITED));
#endif
}