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

Problem: wrong assumption on behavior of ZMQ_SNDHWM in test_sockopt_hwm.cpp

Browse Source 
Solution: align assertions with specification of ZMQ_SNDHWM (actual number of enqueueable messages may be lower)
This commit is contained in:
sigiesec 2017-08-18 17:29:23 +02:00 committed by Simon Giesecke
parent 7283574cee
commit 4c2acdacca
1 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
tests/test_sockopt_hwm.cpp
View File

@ -103,6 +103,17 @@ void test_change_after_connected()
zmq_ctx_term(ctx); zmq_ctx_term(ctx);
} }
int send_until_wouldblock (void *socket)
{
int send_count = 0;
while (send_count < MAX_SENDS
&& zmq_send (socket, &send_count, sizeof (send_count), ZMQ_DONTWAIT)
== sizeof (send_count)) {
++send_count;
}
return send_count;
}
void test_decrease_when_full() void test_decrease_when_full()
{ {
int rc; int rc;
@ -115,50 +126,50 @@ void test_decrease_when_full()
rc = zmq_setsockopt(connect_socket, ZMQ_RCVHWM, &val, sizeof(val)); rc = zmq_setsockopt(connect_socket, ZMQ_RCVHWM, &val, sizeof(val));
assert(rc == 0); assert(rc == 0);
val = 100; int sndhwm = 100;
rc = zmq_setsockopt(bind_socket, ZMQ_SNDHWM, &val, sizeof(val)); rc = zmq_setsockopt (bind_socket, ZMQ_SNDHWM, &sndhwm, sizeof (sndhwm));
assert(rc == 0); assert (rc == 0);
zmq_bind(bind_socket, "inproc://a"); zmq_bind(bind_socket, "inproc://a");
zmq_connect(connect_socket, "inproc://a"); zmq_connect(connect_socket, "inproc://a");
// Fill up to hwm // Fill up to hwm
int send_count = 0; int send_count = send_until_wouldblock(bind_socket);
while (send_count < MAX_SENDS && zmq_send(bind_socket, &send_count, sizeof(send_count), ZMQ_DONTWAIT) == sizeof(send_count)) assert (send_count <= sndhwm + 1 && send_count > (sndhwm / 2));
++send_count;
assert(send_count == 101);
// Descrease snd hwm // Decrease snd hwm
val = 70; sndhwm = 70;
rc = zmq_setsockopt(bind_socket, ZMQ_SNDHWM, &val, sizeof(val)); rc = zmq_setsockopt(bind_socket, ZMQ_SNDHWM, &sndhwm, sizeof(sndhwm));
assert(rc == 0); assert(rc == 0);
size_t placeholder = sizeof(val); int sndhwm_read = 0;
val = 0; size_t sndhwm_read_size = sizeof(sndhwm_read);
rc = zmq_getsockopt(bind_socket, ZMQ_SNDHWM, &val, &placeholder); rc = zmq_getsockopt(bind_socket, ZMQ_SNDHWM, &sndhwm_read, &sndhwm_read_size);
assert(rc == 0); assert(rc == 0);
assert(val == 70); assert(sndhwm_read == sndhwm);
msleep (SETTLE_TIME);
// Read out all data (should get up to previous hwm worth so none were dropped) // Read out all data (should get up to previous hwm worth so none were dropped)
int read_count = 0; int read_count = 0;
int read_data = 0; int read_data = 0;
while (read_count < MAX_SENDS && zmq_recv(connect_socket, &read_data, sizeof(read_data), ZMQ_DONTWAIT) == sizeof(read_data)) { while (
read_count < MAX_SENDS
&& zmq_recv (connect_socket, &read_data, sizeof (read_data), ZMQ_DONTWAIT)
== sizeof (read_data)) {
assert(read_count == read_data); assert(read_count == read_data);
++read_count; ++read_count;
} }
assert(read_count == 101); assert(read_count == send_count);
// Give io thread some time to catch up // Give io thread some time to catch up
msleep (SETTLE_TIME); msleep (SETTLE_TIME);
// Fill up to new hwm // Fill up to new hwm
send_count = 0; send_count = send_until_wouldblock (bind_socket);
while (send_count < MAX_SENDS && zmq_send(bind_socket, &send_count, sizeof(send_count), ZMQ_DONTWAIT) == sizeof(send_count)) fprintf(stderr, "sndhwm==%i, send_count==%i\n", sndhwm, send_count);
++send_count; assert (send_count <= sndhwm + 1 && send_count > (sndhwm / 2));
// Really this should be 71, but the lwm stuff kicks in doesn't seem quite right
assert(send_count > 0);
zmq_close(bind_socket); zmq_close(bind_socket);
zmq_close(connect_socket); zmq_close(connect_socket);