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

Merge pull request #2353 from bluca/fix_test

Browse Source 
Problem: unnecessary change to router_mandatory_hwm test
This commit is contained in:
Doron Somech
2017-02-24 21:11:06 +02:00
committed by GitHub
parent ca311f7bfe 0f473d14cb
commit 1cfc3e1744
2 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/socket_base.cpp
View File

@@ -1120,13 +1120,7 @@ int zmq::socket_base_t::send (msg_t *msg_, int flags_)
if (rc == 0) {
return 0;
}
// In case of ZMQ_ROUTER_MANDATORY option set and peer disconnected
if (likely(errno == EHOSTUNREACH)) {
return -1;
}
if (unlikely(errno != EAGAIN)) {
if (unlikely (errno != EAGAIN)) {
return -1;
}

20
tests/test_router_mandatory_hwm.cpp
View File

@@ -84,15 +84,11 @@ int main (void)
const int BUF_SIZE = 65536;
char buf[BUF_SIZE];
memset(buf, 0, BUF_SIZE);
// Send first batch of messages
for(i = 0; i < 100000; ++i) {
if (TRACE_ENABLED)
fprintf(stderr, "Sending message %d ...\n", i);
if (TRACE_ENABLED) fprintf(stderr, "Sending message %d ...\n", i);
rc = zmq_send (router, "X", 1, ZMQ_DONTWAIT | ZMQ_SNDMORE);
if (rc == -1 && zmq_errno() == EHOSTUNREACH)
break;
if (rc == -1 && zmq_errno() == EAGAIN) break;
assert (rc == 1);
rc = zmq_send (router, buf, BUF_SIZE, ZMQ_DONTWAIT);
assert (rc == BUF_SIZE);
@@ -100,17 +96,12 @@ int main (void)
// This should fail after one message but kernel buffering could
// skew results
assert (i < 10);
msleep (1000);
// Send second batch of messages
for(; i < 100000; ++i) {
if (TRACE_ENABLED)
fprintf(stderr, "Sending message %d (part 2) ...\n", i);
if (TRACE_ENABLED) fprintf(stderr, "Sending message %d (part 2) ...\n", i);
rc = zmq_send (router, "X", 1, ZMQ_DONTWAIT | ZMQ_SNDMORE);
if (rc == -1 && zmq_errno() == EHOSTUNREACH)
break;
if (rc == -1 && zmq_errno() == EAGAIN) break;
assert (rc == 1);
rc = zmq_send (router, buf, BUF_SIZE, ZMQ_DONTWAIT);
assert (rc == BUF_SIZE);
@@ -119,8 +110,7 @@ int main (void)
// skew results
assert (i < 20);
if (TRACE_ENABLED)
fprintf(stderr, "Done sending messages.\n");
if (TRACE_ENABLED) fprintf(stderr, "Done sending messages.\n");
rc = zmq_close (router);
assert (rc == 0);