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

Retry recv if it only returns part of a message during tests.

Browse Source 
Under linux 3.16.0-4-amd64, I was getting occasional test failures
before fixing this.
This commit is contained in:
Brian Silverman 2015-07-28 13:35:49 -07:00
parent 7b2e37dc90
commit c4c5135db6
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/test_heartbeats.cpp
View File

@ -62,6 +62,18 @@ get_monitor_event (void *monitor)
return -1; return -1;
} }
static void
recv_with_retry (int fd, char *buffer, int bytes) {
int received = 0;
while (true) {
int rc = recv(fd, buffer + received, bytes - received, 0);
assert(rc > 0);
received += rc;
assert(received <= bytes);
if (received == bytes) break;
}
}
static void static void
mock_handshake (int fd) { mock_handshake (int fd) {
const uint8_t zmtp_greeting[33] = { 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0x7f, 3, 0, 'N', 'U', 'L', 'L', 0 }; const uint8_t zmtp_greeting[33] = { 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0x7f, 3, 0, 'N', 'U', 'L', 'L', 0 };
@ -72,8 +84,7 @@ mock_handshake (int fd) {
int rc = send(fd, buffer, 64, 0); int rc = send(fd, buffer, 64, 0);
assert(rc == 64); assert(rc == 64);
rc = recv(fd, buffer, 64, 0); recv_with_retry(fd, buffer, 64);
assert(rc == 64);
const uint8_t zmtp_ready[43] = { const uint8_t zmtp_ready[43] = {
4, 41, 5, 'R', 'E', 'A', 'D', 'Y', 11, 'S', 'o', 'c', 'k', 'e', 't', '-', 'T', 'y', 'p', 'e', 4, 41, 5, 'R', 'E', 'A', 'D', 'Y', 11, 'S', 'o', 'c', 'k', 'e', 't', '-', 'T', 'y', 'p', 'e',
@ -86,8 +97,7 @@ mock_handshake (int fd) {
rc = send(fd, buffer, 43, 0); rc = send(fd, buffer, 43, 0);
assert(rc == 43); assert(rc == 43);
rc = recv(fd, buffer, 43, 0); recv_with_retry(fd, buffer, 43);
assert(rc == 43);
} }
static void static void