generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-14 23:07:59 +02:00
Code Issues Projects Releases Wiki Activity

do not silently drop messages in publisher if hwm is reached

Browse Source
This commit is contained in:
kreuzberger
2014-08-08 19:36:00 +02:00
parent 446e8efb07
commit d9a3cc48d4
13 changed files with 345 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/xpub.cpp
View File

@@ -90,7 +90,7 @@ void zmq::xpub_t::xwrite_activated (pipe_t *pipe_)
int zmq::xpub_t::xsetsockopt (int option_, const void *optval_,
size_t optvallen_)
{
if (option_ != ZMQ_XPUB_VERBOSE) {
if (option_ != ZMQ_XPUB_VERBOSE && option_ != ZMQ_XPUB_WAIT) {
errno = EINVAL;
return -1;
}
@@ -98,7 +98,15 @@ int zmq::xpub_t::xsetsockopt (int option_, const void *optval_,
errno = EINVAL;
return -1;
}
verbose = (*static_cast <const int*> (optval_) != 0);
if (option_ == ZMQ_XPUB_VERBOSE) {
verbose = (*static_cast <const int*> (optval_) != 0);
} else if (option_ == ZMQ_XPUB_WAIT) {
wait = (*static_cast <const int*> (optval_) != 0);
}
else {
return -1;
}
return 0;
}
@@ -127,6 +135,11 @@ int zmq::xpub_t::xsend (msg_t *msg_)
subscriptions.match ((unsigned char*) msg_->data (), msg_->size (),
mark_as_matching, this);
if (wait && !dist.check_hwm()) {
return EAGAIN;
}
// Send the message to all the pipes that were marked as matching
// in the previous step.
int rc = dist.send_to_matching (msg_);