3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-28 16:15:23 +08:00
Code Issues Projects Releases Wiki Activity

Store manual subscriptions in XPUB and send them out on pipe termination.

Browse Source
This commit is contained in:
Fedor Sheremetyev 2016-06-17 11:40:17 +01:00
parent 813c738137
commit baea406683
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/xpub.cpp
View File

@ -92,6 +92,12 @@ void zmq::xpub_t::xread_activated (pipe_t *pipe_)
if (size > 0 && (*data == 0 || *data == 1)) { if (size > 0 && (*data == 0 || *data == 1)) {
if (manual) if (manual)
{ {
// Store manual subscription to use on termination
if (*data == 0)
manual_subscriptions.rm(data + 1, size - 1, pipe_);
else
manual_subscriptions.add(data + 1, size - 1, pipe_);
pending_pipes.push_back(pipe_); pending_pipes.push_back(pipe_);
pending_data.push_back(blob_t(data, size)); pending_data.push_back(blob_t(data, size));
pending_metadata.push_back(sub.metadata()); pending_metadata.push_back(sub.metadata());
@ -191,10 +197,19 @@ int zmq::xpub_t::xsetsockopt (int option_, const void *optval_,
void zmq::xpub_t::xpipe_terminated (pipe_t *pipe_) void zmq::xpub_t::xpipe_terminated (pipe_t *pipe_)
{ {
if (manual)
{
// Remove the pipe from the trie and send corresponding manual
// unsubscriptions upstream.
manual_subscriptions.rm (pipe_, send_unsubscription, this, false);
}
else
{
// Remove the pipe from the trie. If there are topics that nobody // Remove the pipe from the trie. If there are topics that nobody
// is interested in anymore, send corresponding unsubscriptions // is interested in anymore, send corresponding unsubscriptions
// upstream. // upstream.
subscriptions.rm (pipe_, send_unsubscription, this, !(verbose_unsubs || manual)); subscriptions.rm (pipe_, send_unsubscription, this, !verbose_unsubs);
}
dist.pipe_terminated (pipe_); dist.pipe_terminated (pipe_);
} }

3
src/xpub.hpp
View File

@ -79,6 +79,9 @@ namespace zmq
// List of all subscriptions mapped to corresponding pipes. // List of all subscriptions mapped to corresponding pipes.
mtrie_t subscriptions; mtrie_t subscriptions;
// List of manual subscriptions mapped to corresponding pipes.
mtrie_t manual_subscriptions;
// Distributor of messages holding the list of outbound pipes. // Distributor of messages holding the list of outbound pipes.
dist_t dist; dist_t dist;