stv0g/Criterion
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Revert "protocol: Added polling for ACK"

Browse source 
This reverts commit 0c0fade8088ecb9d11f366c5921d0c0f1a0c3815.
This commit is contained in:
Snaipe 2016-05-06 22:27:30 +02:00
parent 90d2fe4d08
commit cdcea14156
1 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/protocol/messages.c
View file

@ -90,24 +90,20 @@ void cr_send_to_runner(const criterion_protocol_msg *message) {
abort();
}
struct nn_pollfd pfd = {
.fd = g_client_socket,
.events = NN_POLLIN,
};
if (nn_poll(&pfd, 1, INT_MAX) != 1) {
criterion_perror("Could not poll for ack: %s.\n", nn_strerror(errno));
abort();
}
unsigned char *buf = NULL;
int read = nn_recv(g_client_socket, &buf, NN_MSG, 0);
int read = 0;
if (read <= 0) {
criterion_perror("Could not read ack: %s.\n",
read == -1 ? nn_strerror(errno) : "No data");
abort();
}
do {
read = nn_recv(g_client_socket, &buf, NN_MSG, 0);
if (read <= 0) {
if (read == -1 && errno == EFSM)
continue;
criterion_perror("Could not read ack: %s.\n", nn_strerror(errno));
abort();
}
break;
} while (true);
criterion_protocol_ack ack;
pb_istream_t stream = pb_istream_from_buffer(buf, read);