Fix coding style in spec tests.

This commit is contained in:
Christian Kamm
2013-07-14 08:32:35 +02:00
parent 524bd7ac76
commit bbc9a61197
5 changed files with 130 additions and 161 deletions

View File

@@ -32,18 +32,17 @@ void test_push_round_robin_out (void *ctx)
int rc = zmq_bind (push, bind_address);
assert (rc == 0);
const size_t N = 5;
void *pulls[N];
for (size_t i = 0; i < N; ++i)
{
pulls[i] = zmq_socket (ctx, ZMQ_PULL);
assert (pulls[i]);
const size_t services = 5;
void *pulls [services];
for (size_t peer = 0; peer < services; ++peer) {
pulls [peer] = zmq_socket (ctx, ZMQ_PULL);
assert (pulls [peer]);
int timeout = 100;
rc = zmq_setsockopt (pulls[i], ZMQ_RCVTIMEO, &timeout, sizeof(int));
rc = zmq_setsockopt (pulls [peer], ZMQ_RCVTIMEO, &timeout, sizeof (int));
assert (rc == 0);
rc = zmq_connect (pulls[i], connect_address);
rc = zmq_connect (pulls [peer], connect_address);
assert (rc == 0);
}
@@ -52,28 +51,21 @@ void test_push_round_robin_out (void *ctx)
assert (rc == 0);
// Send 2N messages
for (size_t i = 0; i < N; ++i)
{
for (size_t peer = 0; peer < services; ++peer)
s_send_seq (push, "ABC", SEQ_END);
}
for (size_t i = 0; i < N; ++i)
{
for (size_t peer = 0; peer < services; ++peer)
s_send_seq (push, "DEF", SEQ_END);
}
// Expect every PULL got one of each
for (size_t i = 0; i < N; ++i)
{
s_recv_seq (pulls[i], "ABC", SEQ_END);
s_recv_seq (pulls[i], "DEF", SEQ_END);
for (size_t peer = 0; peer < services; ++peer) {
s_recv_seq (pulls [peer], "ABC", SEQ_END);
s_recv_seq (pulls [peer], "DEF", SEQ_END);
}
close_zero_linger (push);
for (size_t i = 0; i < N; ++i)
{
close_zero_linger (pulls[i]);
}
for (size_t peer = 0; peer < services; ++peer)
close_zero_linger (pulls [peer]);
// Wait for disconnects.
rc = zmq_poll (0, 0, 100);
@@ -88,14 +80,14 @@ void test_pull_fair_queue_in (void *ctx)
int rc = zmq_bind (pull, bind_address);
assert (rc == 0);
const size_t N = 5;
void *pushs[N];
for (size_t i = 0; i < N; ++i)
const size_t services = 5;
void *pushs [services];
for (size_t peer = 0; peer < services; ++peer)
{
pushs[i] = zmq_socket (ctx, ZMQ_PUSH);
assert (pushs[i]);
pushs [peer] = zmq_socket (ctx, ZMQ_PUSH);
assert (pushs [peer]);
rc = zmq_connect (pushs[i], connect_address);
rc = zmq_connect (pushs [peer], connect_address);
assert (rc == 0);
}
@@ -107,17 +99,16 @@ void test_pull_fair_queue_in (void *ctx)
int second_half = 0;
// Send 2N messages
for (size_t i = 0; i < N; ++i)
{
for (size_t peer = 0; peer < services; ++peer) {
char *str = strdup("A");
str[0] += i;
s_send_seq (pushs[i], str, SEQ_END);
first_half += str[0];
str [0] += peer;
s_send_seq (pushs [peer], str, SEQ_END);
first_half += str [0];
str[0] += N;
s_send_seq (pushs[i], str, SEQ_END);
second_half += str[0];
str [0] += services;
s_send_seq (pushs [peer], str, SEQ_END);
second_half += str [0];
free (str);
}
@@ -131,22 +122,20 @@ void test_pull_fair_queue_in (void *ctx)
assert (rc == 0);
// Expect to pull one from each first
for (size_t i = 0; i < N; ++i)
{
for (size_t peer = 0; peer < services; ++peer) {
rc = zmq_msg_recv (&msg, pull, 0);
assert (rc == 2);
const char *str = (const char *)zmq_msg_data (&msg);
first_half -= str[0];
first_half -= str [0];
}
assert (first_half == 0);
// And then get the second batch
for (size_t i = 0; i < N; ++i)
{
for (size_t peer = 0; peer < services; ++peer) {
rc = zmq_msg_recv (&msg, pull, 0);
assert (rc == 2);
const char *str = (const char *)zmq_msg_data (&msg);
second_half -= str[0];
second_half -= str [0];
}
assert (second_half == 0);
@@ -155,10 +144,8 @@ void test_pull_fair_queue_in (void *ctx)
close_zero_linger (pull);
for (size_t i = 0; i < N; ++i)
{
close_zero_linger (pushs[i]);
}
for (size_t peer = 0; peer < services; ++peer)
close_zero_linger (pushs [peer]);
// Wait for disconnects.
rc = zmq_poll (0, 0, 100);
@@ -171,7 +158,7 @@ void test_push_block_on_send_no_peers (void *ctx)
assert (sc);
int timeout = 100;
int rc = zmq_setsockopt (sc, ZMQ_SNDTIMEO, &timeout, sizeof(timeout));
int rc = zmq_setsockopt (sc, ZMQ_SNDTIMEO, &timeout, sizeof (timeout));
assert (rc == 0);
rc = zmq_send (sc, 0, 0, ZMQ_DONTWAIT);
@@ -192,7 +179,7 @@ void test_destroy_queue_on_disconnect (void *ctx)
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);
@@ -201,7 +188,7 @@ void test_destroy_queue_on_disconnect (void *ctx)
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);
@@ -221,7 +208,7 @@ void test_destroy_queue_on_disconnect (void *ctx)
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);
@@ -269,17 +256,17 @@ void test_destroy_queue_on_disconnect (void *ctx)
assert (rc == 0);
}
int main ()
int main (void)
{
void *ctx = zmq_ctx_new ();
assert (ctx);
const char *binds[] = { "inproc://a", "tcp://*:5555" };
const char *connects[] = { "inproc://a", "tcp://localhost:5555" };
const char *binds [] = { "inproc://a", "tcp://*:5555" };
const char *connects [] = { "inproc://a", "tcp://localhost:5555" };
for (int i = 0; i < 2; ++i) {
bind_address = binds[i];
connect_address = connects[i];
for (int transport = 0; transport < 2; ++transport) {
bind_address = binds [transport];
connect_address = connects [transport];
// PUSH: SHALL route outgoing messages to connected peers using a
// round-robin strategy.