mirror of
https://github.com/zeromq/libzmq.git
synced 2025-10-27 19:10:22 +01:00
Problem: tests do not follow naming style
Solution: apply naming style
This commit is contained in:
@@ -32,9 +32,9 @@
|
||||
const char *bind_address = 0;
|
||||
char connect_address[MAX_SOCKET_STRING];
|
||||
|
||||
void test_push_round_robin_out (void *ctx)
|
||||
void test_push_round_robin_out (void *ctx_)
|
||||
{
|
||||
void *push = zmq_socket (ctx, ZMQ_PUSH);
|
||||
void *push = zmq_socket (ctx_, ZMQ_PUSH);
|
||||
assert (push);
|
||||
|
||||
int rc = zmq_bind (push, bind_address);
|
||||
@@ -46,7 +46,7 @@ void test_push_round_robin_out (void *ctx)
|
||||
const size_t services = 5;
|
||||
void *pulls[services];
|
||||
for (size_t peer = 0; peer < services; ++peer) {
|
||||
pulls[peer] = zmq_socket (ctx, ZMQ_PULL);
|
||||
pulls[peer] = zmq_socket (ctx_, ZMQ_PULL);
|
||||
assert (pulls[peer]);
|
||||
|
||||
int timeout = 250;
|
||||
@@ -81,9 +81,9 @@ void test_push_round_robin_out (void *ctx)
|
||||
msleep (SETTLE_TIME);
|
||||
}
|
||||
|
||||
void test_pull_fair_queue_in (void *ctx)
|
||||
void test_pull_fair_queue_in (void *ctx_)
|
||||
{
|
||||
void *pull = zmq_socket (ctx, ZMQ_PULL);
|
||||
void *pull = zmq_socket (ctx_, ZMQ_PULL);
|
||||
assert (pull);
|
||||
|
||||
int rc = zmq_bind (pull, bind_address);
|
||||
@@ -95,7 +95,7 @@ void test_pull_fair_queue_in (void *ctx)
|
||||
const unsigned char services = 5;
|
||||
void *pushs[services];
|
||||
for (unsigned char peer = 0; peer < services; ++peer) {
|
||||
pushs[peer] = zmq_socket (ctx, ZMQ_PUSH);
|
||||
pushs[peer] = zmq_socket (ctx_, ZMQ_PUSH);
|
||||
assert (pushs[peer]);
|
||||
|
||||
rc = zmq_connect (pushs[peer], connect_address);
|
||||
@@ -160,9 +160,9 @@ void test_pull_fair_queue_in (void *ctx)
|
||||
msleep (SETTLE_TIME);
|
||||
}
|
||||
|
||||
void test_push_block_on_send_no_peers (void *ctx)
|
||||
void test_push_block_on_send_no_peers (void *ctx_)
|
||||
{
|
||||
void *sc = zmq_socket (ctx, ZMQ_PUSH);
|
||||
void *sc = zmq_socket (ctx_, ZMQ_PUSH);
|
||||
assert (sc);
|
||||
|
||||
int timeout = 250;
|
||||
@@ -181,45 +181,45 @@ void test_push_block_on_send_no_peers (void *ctx)
|
||||
assert (rc == 0);
|
||||
}
|
||||
|
||||
void test_destroy_queue_on_disconnect (void *ctx)
|
||||
void test_destroy_queue_on_disconnect (void *ctx_)
|
||||
{
|
||||
void *A = zmq_socket (ctx, ZMQ_PUSH);
|
||||
assert (A);
|
||||
void *a = zmq_socket (ctx_, ZMQ_PUSH);
|
||||
assert (a);
|
||||
|
||||
int hwm = 1;
|
||||
int rc = zmq_setsockopt (A, ZMQ_SNDHWM, &hwm, sizeof (hwm));
|
||||
int rc = zmq_setsockopt (a, ZMQ_SNDHWM, &hwm, sizeof (hwm));
|
||||
assert (rc == 0);
|
||||
|
||||
rc = zmq_bind (A, bind_address);
|
||||
rc = zmq_bind (a, bind_address);
|
||||
assert (rc == 0);
|
||||
size_t len = MAX_SOCKET_STRING;
|
||||
rc = zmq_getsockopt (A, ZMQ_LAST_ENDPOINT, connect_address, &len);
|
||||
rc = zmq_getsockopt (a, ZMQ_LAST_ENDPOINT, connect_address, &len);
|
||||
assert (rc == 0);
|
||||
|
||||
void *B = zmq_socket (ctx, ZMQ_PULL);
|
||||
assert (B);
|
||||
void *b = zmq_socket (ctx_, ZMQ_PULL);
|
||||
assert (b);
|
||||
|
||||
rc = zmq_setsockopt (B, ZMQ_RCVHWM, &hwm, sizeof (hwm));
|
||||
rc = zmq_setsockopt (b, ZMQ_RCVHWM, &hwm, sizeof (hwm));
|
||||
assert (rc == 0);
|
||||
|
||||
rc = zmq_connect (B, connect_address);
|
||||
rc = zmq_connect (b, connect_address);
|
||||
assert (rc == 0);
|
||||
|
||||
// Send two messages, one should be stuck in A's outgoing queue, the other
|
||||
// arrives at B.
|
||||
s_send_seq (A, "ABC", SEQ_END);
|
||||
s_send_seq (A, "DEF", SEQ_END);
|
||||
s_send_seq (a, "ABC", SEQ_END);
|
||||
s_send_seq (a, "DEF", SEQ_END);
|
||||
|
||||
// Both queues should now be full, indicated by A blocking on send.
|
||||
rc = zmq_send (A, 0, 0, ZMQ_DONTWAIT);
|
||||
rc = zmq_send (a, 0, 0, ZMQ_DONTWAIT);
|
||||
assert (rc == -1);
|
||||
assert (errno == EAGAIN);
|
||||
|
||||
rc = zmq_disconnect (B, connect_address);
|
||||
rc = zmq_disconnect (b, connect_address);
|
||||
assert (rc == 0);
|
||||
|
||||
// Disconnect may take time and need command processing.
|
||||
zmq_pollitem_t poller[2] = {{A, 0, 0, 0}, {B, 0, 0, 0}};
|
||||
zmq_pollitem_t poller[2] = {{a, 0, 0, 0}, {b, 0, 0, 0}};
|
||||
rc = zmq_poll (poller, 2, 100);
|
||||
assert (rc == 0);
|
||||
rc = zmq_poll (poller, 2, 100);
|
||||
@@ -230,37 +230,37 @@ void test_destroy_queue_on_disconnect (void *ctx)
|
||||
assert (rc == 0);
|
||||
|
||||
// Can't receive old data on B.
|
||||
rc = zmq_msg_recv (&msg, B, ZMQ_DONTWAIT);
|
||||
rc = zmq_msg_recv (&msg, b, ZMQ_DONTWAIT);
|
||||
assert (rc == -1);
|
||||
assert (errno == EAGAIN);
|
||||
|
||||
// Sending fails.
|
||||
rc = zmq_send (A, 0, 0, ZMQ_DONTWAIT);
|
||||
rc = zmq_send (a, 0, 0, ZMQ_DONTWAIT);
|
||||
assert (rc == -1);
|
||||
assert (errno == EAGAIN);
|
||||
|
||||
// Reconnect B
|
||||
rc = zmq_connect (B, connect_address);
|
||||
rc = zmq_connect (b, connect_address);
|
||||
assert (rc == 0);
|
||||
|
||||
// Still can't receive old data on B.
|
||||
rc = zmq_msg_recv (&msg, B, ZMQ_DONTWAIT);
|
||||
rc = zmq_msg_recv (&msg, b, ZMQ_DONTWAIT);
|
||||
assert (rc == -1);
|
||||
assert (errno == EAGAIN);
|
||||
|
||||
// two messages should be sendable before the queues are filled up.
|
||||
s_send_seq (A, "ABC", SEQ_END);
|
||||
s_send_seq (A, "DEF", SEQ_END);
|
||||
s_send_seq (a, "ABC", SEQ_END);
|
||||
s_send_seq (a, "DEF", SEQ_END);
|
||||
|
||||
rc = zmq_send (A, 0, 0, ZMQ_DONTWAIT);
|
||||
rc = zmq_send (a, 0, 0, ZMQ_DONTWAIT);
|
||||
assert (rc == -1);
|
||||
assert (errno == EAGAIN);
|
||||
|
||||
rc = zmq_msg_close (&msg);
|
||||
assert (rc == 0);
|
||||
|
||||
close_zero_linger (A);
|
||||
close_zero_linger (B);
|
||||
close_zero_linger (a);
|
||||
close_zero_linger (b);
|
||||
|
||||
// Wait for disconnects.
|
||||
msleep (SETTLE_TIME);
|
||||
|
||||
Reference in New Issue
Block a user