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

Problem: test_context_socket is not thread-safe

Browse Source 
Solution: use regular zmq_socket instead in thread functions
This commit is contained in:
Simon Giesecke
2018-05-23 17:32:27 +02:00
parent b56e7f13c5
commit 64f2b100da
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/test_inproc_connect.cpp
View File

@@ -43,7 +43,8 @@ void tearDown ()
static void pusher (void * /*unused*/) static void pusher (void * /*unused*/)
{ {
// Connect first // Connect first
void *connectSocket = test_context_socket (ZMQ_PAIR); // do not use test_context_socket here, as it is not thread-safe
void *connectSocket = zmq_socket (get_test_context (), ZMQ_PAIR);
TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connectSocket, "inproc://sink")); TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connectSocket, "inproc://sink"));
@@ -51,7 +52,7 @@ static void pusher (void * /*unused*/)
send_string_expect_success (connectSocket, "foobar", 0); send_string_expect_success (connectSocket, "foobar", 0);
// Cleanup // Cleanup
test_context_socket_close (connectSocket); TEST_ASSERT_SUCCESS_ERRNO (zmq_close (connectSocket));
} }
static void simult_conn (void *endpt_) static void simult_conn (void *endpt_)
@@ -60,11 +61,12 @@ static void simult_conn (void *endpt_)
const char *endpt = static_cast<const char *> (endpt_); const char *endpt = static_cast<const char *> (endpt_);
// Connect // Connect
void *connectSocket = test_context_socket (ZMQ_SUB); // do not use test_context_socket here, as it is not thread-safe
void *connectSocket = zmq_socket (get_test_context (), ZMQ_SUB);
TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connectSocket, endpt)); TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connectSocket, endpt));
// Cleanup // Cleanup
test_context_socket_close (connectSocket); TEST_ASSERT_SUCCESS_ERRNO (zmq_close (connectSocket));
} }
static void simult_bind (void *endpt_) static void simult_bind (void *endpt_)
@@ -73,11 +75,12 @@ static void simult_bind (void *endpt_)
const char *endpt = static_cast<const char *> (endpt_); const char *endpt = static_cast<const char *> (endpt_);
// Bind // Bind
void *bindSocket = test_context_socket (ZMQ_PUB); // do not use test_context_socket here, as it is not thread-safe
void *bindSocket = zmq_socket (get_test_context (), ZMQ_PUB);
TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (bindSocket, endpt)); TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (bindSocket, endpt));
// Cleanup // Cleanup
test_context_socket_close (bindSocket); TEST_ASSERT_SUCCESS_ERRNO (zmq_close (bindSocket));
} }
void test_bind_before_connect () void test_bind_before_connect ()