3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-17 08:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Problem: threadsafe test uses CLIENT-to-CLIENT

Browse Source 
Solution: fix to use CLIENT-to-SERVER and increase number of messages
sent to 100K per thread, to better stress thread safety.
This commit is contained in:
Pieter Hintjens 2015-09-11 17:01:27 -04:00
parent d416ffcec5
commit c2dffb9908
1 changed files with 30 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

136
tests/test_thread_safe.cpp
View File

@ -29,71 +29,51 @@
#include "testutil.hpp" #include "testutil.hpp"
void worker1(void* s); // Client threads loop on send/recv until told to exit
void worker2(void* s); void client_thread (void *client)
{
char data = 0;
for (int count = 0; count < 100000; count++) {
int rc = zmq_send (client, &data, 1, 0);
assert (rc == 1);
}
data = 1;
int rc = zmq_send (client, &data, 1, 0);
assert (rc == 1);
}
int main (void) int main (void)
{ {
setup_test_environment(); setup_test_environment ();
void *ctx = zmq_ctx_new (); void *ctx = zmq_ctx_new ();
assert (ctx); assert (ctx);
void *server = zmq_socket (ctx, ZMQ_SERVER);
int rc = zmq_bind (server, "tcp://127.0.0.1:5560");
assert (rc == 0);
void *client = zmq_socket (ctx, ZMQ_CLIENT); void *client = zmq_socket (ctx, ZMQ_CLIENT);
void *client2 = zmq_socket (ctx, ZMQ_CLIENT);
int thread_safe; int thread_safe;
size_t size = sizeof(int); size_t size = sizeof (int);
zmq_getsockopt (client, ZMQ_THREAD_SAFE, &thread_safe, &size); zmq_getsockopt (client, ZMQ_THREAD_SAFE, &thread_safe, &size);
assert (thread_safe == 1); assert (thread_safe == 1);
rc = zmq_connect (client, "tcp://127.0.0.1:5560");
int rc;
rc = zmq_bind (client, "tcp://127.0.0.1:5560");
assert (rc == 0); assert (rc == 0);
rc = zmq_connect (client2, "tcp://127.0.0.1:5560"); void *t1 = zmq_threadstart (client_thread, client);
assert (rc == 0); void *t2 = zmq_threadstart (client_thread, client);
void* t1 = zmq_threadstart(worker1, client2); char data;
void* t2 = zmq_threadstart(worker2, client2); int threads_completed = 0;
while (threads_completed < 2) {
char data[1]; zmq_recv (server, &data, 1, 0);
data[0] = 0; if (data == 1)
threads_completed++; // Thread ended
for (int i=0; i < 10; i++) {
rc = zmq_send_const(client, data, 1, 0);
assert (rc == 1);
rc = zmq_send_const(client, data, 1, 0);
assert(rc == 1);
char a, b;
rc = zmq_recv(client, &a, 1, 0);
assert(rc == 1);
rc = zmq_recv(client, &b, 1, 0);
assert(rc == 1);
// make sure they came from different threads
assert((a == 1 && b == 2) || (a == 2 && b == 1));
} }
zmq_threadclose (t1);
zmq_threadclose (t2);
// make the thread exit rc = zmq_close (server);
data[0] = 1;
rc = zmq_send_const(client, data, 1, 0);
assert (rc == 1);
rc = zmq_send_const(client, data, 1, 0);
assert(rc == 1);
zmq_threadclose(t1);
zmq_threadclose(t2);
rc = zmq_close (client2);
assert (rc == 0); assert (rc == 0);
rc = zmq_close (client); rc = zmq_close (client);
@ -104,59 +84,3 @@ int main (void)
return 0 ; return 0 ;
} }
void worker1(void* s)
{
const char worker_id = 1;
char c;
while (true)
{
int rc = zmq_recv(s, &c,1, 0);
assert(rc == 1);
if (c == 0)
{
msleep(100);
rc = zmq_send_const(s,&worker_id, 1, 0);
assert(rc == 1);
}
else
{
// we got exit request
break;
}
}
}
void worker2(void* s)
{
const char worker_id = 2;
char c;
while (true)
{
int rc = zmq_recv(s, &c,1, 0);
assert(rc == 1);
assert(c == 1 || c == 0);
if (c == 0)
{
msleep(100);
rc = zmq_send_const(s,&worker_id, 1, 0);
assert(rc == 1);
}
else
{
// we got exit request
break;
}
}
}