Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-13 08:41:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(zeromq): Leaking monitor socket messages

Browse Source
This commit is contained in:
Dennis Klein 2022-04-16 14:14:27 +02:00
parent 4ae68b63e9
commit c3fdc8c08c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fairmq/zeromq/Common.h
View File

@ -194,13 +194,16 @@ inline auto getMonitorEvent(void* monitorSocket) -> int
// Second frame in message contains event address // Second frame in message contains event address
assertm(zmq_msg_more(&msg), "A second frame is pending"); // NOLINT assertm(zmq_msg_more(&msg), "A second frame is pending"); // NOLINT
zmq_msg_init(&msg); zmq_msg_close(&msg);
zmq_msg_t msg2;
zmq_msg_init(&msg2);
{ {
[[maybe_unused]] auto const rc = zmq_msg_recv(&msg, monitorSocket, 0); [[maybe_unused]] auto const rc = zmq_msg_recv(&msg2, monitorSocket, 0);
assertm(rc >= 0, "second monitor event frame successfully received"); // NOLINT assertm(rc >= 0, "second monitor event frame successfully received"); // NOLINT
} }
assertm(!zmq_msg_more(&msg), "No more frames are pending"); // NOLINT assertm(!zmq_msg_more(&msg2), "No more frames are pending"); // NOLINT
// No unpacking of the event address needed for now // No unpacking of the event address needed for now
zmq_msg_close(&msg2);
return event; return event;
} }