sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

messaging: Fix queueing on FreeBSD

Browse Source 
FreeBSD does not do the nice blocking send that Linux does. Instead,
it returns ENOBUFS if the dst socket is full. According to the
manpage you have to do polling. Try with exponential backoff, at
the end try once a second forever.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue Jun 20 23:03:11 CEST 2017 on sn-devel-144
This commit is contained in:
Volker Lendecke 2016-11-23 16:51:25 +01:00 committed by Jeremy Allison
parent b67262b40a
commit d7ccf0d977
1 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
source3/lib/messages_dgm.c
View File

@ -541,9 +541,35 @@ static void messaging_dgm_out_threaded_job(void *private_data)
struct iovec iov = { .iov_base = state->buf,
.iov_len = talloc_get_size(state->buf) };
size_t num_fds = talloc_array_length(state->fds);
int msec = 1;
state->sent = messaging_dgm_sendmsg(state->sock, &iov, 1,
while (true) {
int ret;
state->sent = messaging_dgm_sendmsg(state->sock, &iov, 1,
state->fds, num_fds, &state->err);
if (state->sent != -1) {
return;
}
if (errno != ENOBUFS) {
return;
}
/*
* ENOBUFS is the FreeBSD way of saying "Try
* again". We have to do polling.
*/
do {
ret = poll(NULL, 0, msec);
} while ((ret == -1) && (errno == EINTR));
/*
* Exponential backoff up to once a second
*/
msec *= 2;
msec = MIN(msec, 1000);
}
}
/*
@ -619,6 +645,15 @@ static int messaging_dgm_out_send_fragment(
return 0;
}
if (err == ENOBUFS) {
/*
* FreeBSD's way of telling us the dst socket
* is full. EWOULDBLOCK makes us spawn a
* polling helper thread.
*/
err = EWOULDBLOCK;
}
if (err != EWOULDBLOCK) {
return err;
}