generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-13 18:55:10 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1481 from brian-peloton/master

Browse Source 
Fix several missing msg_t::close calls.
This commit is contained in:
Joe Eli McIlvain 2015-07-21 20:45:31 -07:00
commit c05a475bf7
4 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/stream.cpp
View File

@ -229,6 +229,8 @@ int zmq::stream_t::xrecv (msg_t *msg_)
// Rather than sendig this frame, we keep it in prefetched // Rather than sendig this frame, we keep it in prefetched
// buffer and send a frame with peer's ID. // buffer and send a frame with peer's ID.
blob_t identity = pipe->get_identity (); blob_t identity = pipe->get_identity ();
rc = msg_->close();
errno_assert (rc == 0);
rc = msg_->init_size (identity.size ()); rc = msg_->init_size (identity.size ());
errno_assert (rc == 0); errno_assert (rc == 0);

5
tests/test_client_server.cpp
View File

@ -56,6 +56,8 @@ int main (void)
rc = zmq_msg_send(&msg, client, 0); rc = zmq_msg_send(&msg, client, 0);
assert (rc == 1); assert (rc == 1);
rc = zmq_msg_init(&msg);
assert (rc == 0);
rc = zmq_msg_recv(&msg, server, 0); rc = zmq_msg_recv(&msg, server, 0);
assert (rc == 1); assert (rc == 1);
@ -80,6 +82,9 @@ int main (void)
rc = zmq_msg_recv(&msg, client, 0); rc = zmq_msg_recv(&msg, client, 0);
assert (rc == 1); assert (rc == 1);
rc = zmq_msg_close(&msg);
assert (rc == 0);
rc = zmq_close (server); rc = zmq_close (server);
assert (rc == 0); assert (rc == 0);

3
tests/test_srcfd.cpp
View File

@ -75,6 +75,9 @@ int main (void)
int srcFd = zmq_msg_get(&msg, ZMQ_SRCFD); int srcFd = zmq_msg_get(&msg, ZMQ_SRCFD);
assert(srcFd >= 0); assert(srcFd >= 0);
rc = zmq_msg_close(&msg);
assert (rc == 0);
// get the remote endpoint // get the remote endpoint
struct sockaddr_storage ss; struct sockaddr_storage ss;
#ifdef ZMQ_HAVE_HPUX #ifdef ZMQ_HAVE_HPUX

8
tests/test_stream_disconnect.cpp
View File

@ -91,6 +91,8 @@ int main(int, char**)
assert (rc != -1); assert (rc != -1);
assert(zmq_msg_size (&peer_frame) > 0); assert(zmq_msg_size (&peer_frame) > 0);
assert (has_more (sockets [SERVER])); assert (has_more (sockets [SERVER]));
rc = zmq_msg_close (&peer_frame);
assert (rc == 0);
// Server: Grab the 2nd frame (actual payload). // Server: Grab the 2nd frame (actual payload).
zmq_msg_t data_frame; zmq_msg_t data_frame;
@ -99,6 +101,8 @@ int main(int, char**)
rc = zmq_msg_recv (&data_frame, sockets [SERVER], 0); rc = zmq_msg_recv (&data_frame, sockets [SERVER], 0);
assert (rc != -1); assert (rc != -1);
assert(zmq_msg_size (&data_frame) == 0); assert(zmq_msg_size (&data_frame) == 0);
rc = zmq_msg_close (&data_frame);
assert (rc == 0);
// Client: Grab the 1st frame (peer identity). // Client: Grab the 1st frame (peer identity).
rc = zmq_msg_init (&peer_frame); rc = zmq_msg_init (&peer_frame);
@ -107,6 +111,8 @@ int main(int, char**)
assert (rc != -1); assert (rc != -1);
assert(zmq_msg_size (&peer_frame) > 0); assert(zmq_msg_size (&peer_frame) > 0);
assert (has_more (sockets [CLIENT])); assert (has_more (sockets [CLIENT]));
rc = zmq_msg_close (&peer_frame);
assert (rc == 0);
// Client: Grab the 2nd frame (actual payload). // Client: Grab the 2nd frame (actual payload).
rc = zmq_msg_init (&data_frame); rc = zmq_msg_init (&data_frame);
@ -114,6 +120,8 @@ int main(int, char**)
rc = zmq_msg_recv (&data_frame, sockets [CLIENT], 0); rc = zmq_msg_recv (&data_frame, sockets [CLIENT], 0);
assert (rc != -1); assert (rc != -1);
assert(zmq_msg_size (&data_frame) == 0); assert(zmq_msg_size (&data_frame) == 0);
rc = zmq_msg_close (&data_frame);
assert (rc == 0);
// Send initial message. // Send initial message.
char blob_data [256]; char blob_data [256];