generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-06 00:31:13 +01:00
Code Issues Projects Releases Wiki Activity

Increment metadata refcount while it's in pending_metadata

Browse Source
This commit is contained in:
Dave Olszewski 2016-10-29 12:21:35 -07:00
parent 16f584745d
commit b7f2c7e7ea
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/xpub.cpp
View File

@ -89,6 +89,7 @@ void zmq::xpub_t::xread_activated (pipe_t *pipe_)
// Apply the subscription to the trie // Apply the subscription to the trie
unsigned char *const data = (unsigned char *) sub.data (); unsigned char *const data = (unsigned char *) sub.data ();
const size_t size = sub.size (); const size_t size = sub.size ();
metadata_t* metadata = sub.metadata();
if (size > 0 && (*data == 0 || *data == 1)) { if (size > 0 && (*data == 0 || *data == 1)) {
if (manual) if (manual)
{ {
@ -100,7 +101,9 @@ void zmq::xpub_t::xread_activated (pipe_t *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()); if (metadata)
metadata->add_ref();
pending_metadata.push_back(metadata);
pending_flags.push_back(0); pending_flags.push_back(0);
} }
else else
@ -117,7 +120,9 @@ void zmq::xpub_t::xread_activated (pipe_t *pipe_)
if (options.type == ZMQ_XPUB && (unique || (*data == 1 && verbose_subs) || if (options.type == ZMQ_XPUB && (unique || (*data == 1 && verbose_subs) ||
(*data == 0 && verbose_unsubs && verbose_subs))) { (*data == 0 && verbose_unsubs && verbose_subs))) {
pending_data.push_back(blob_t(data, size)); pending_data.push_back(blob_t(data, size));
pending_metadata.push_back(sub.metadata()); if (metadata)
metadata->add_ref();
pending_metadata.push_back(metadata);
pending_flags.push_back(0); pending_flags.push_back(0);
} }
} }
@ -125,7 +130,9 @@ void zmq::xpub_t::xread_activated (pipe_t *pipe_)
else { else {
// Process user message coming upstream from xsub socket // Process user message coming upstream from xsub socket
pending_data.push_back (blob_t (data, size)); pending_data.push_back (blob_t (data, size));
pending_metadata.push_back (sub.metadata ()); if (metadata)
metadata->add_ref();
pending_metadata.push_back (metadata);
pending_flags.push_back (sub.flags ()); pending_flags.push_back (sub.flags ());
} }
sub.close (); sub.close ();
@ -280,6 +287,8 @@ int zmq::xpub_t::xrecv (msg_t *msg_)
// set metadata only if there is some // set metadata only if there is some
if (metadata_t* metadata = pending_metadata.front ()) { if (metadata_t* metadata = pending_metadata.front ()) {
msg_->set_metadata (metadata); msg_->set_metadata (metadata);
// Remove ref corresponding to vector placement
metadata->drop_ref();
} }
msg_->set_flags (pending_flags.front ()); msg_->set_flags (pending_flags.front ());