RepoMirrors
/
mars
mirror of https://github.com/schoebel/mars
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix stall on socket shutdown once again

This commit is contained in:
Thomas Schoebel-Theuer 2012-01-19 15:31:06 +01:00 committed by Thomas Schoebel-Theuer
parent dcc2865682
commit 472da6628c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mars_net.c
View File

@ -394,10 +394,10 @@ int mars_recv_raw(struct mars_socket *msock, void *buf, int minlen, int maxlen)
struct msghdr msg = { struct msghdr msg = {
.msg_iovlen = 1, .msg_iovlen = 1,
.msg_iov = (struct iovec*)&iov, .msg_iov = (struct iovec*)&iov,
#if 0 // There seems to be a race in the kernel: MSG_MAITALL sometimes blocks forever on a shutdown socket even when sk->sk_rcvtimeo is set. Workaround by accepting incomplete messages. #if 0 // There seems to be a race in the kernel: sometimes kernel_recvmsg() blocks forever on a shutdown socket even when sk->sk_rcvtimeo is set. Workaround by using noblocking IO (although it is conceptually broken and may lead to unnecessary throughput degradation)
.msg_flags = 0 | MSG_WAITALL | MSG_NOSIGNAL, .msg_flags = 0 | MSG_WAITALL | MSG_NOSIGNAL,
#else #else
.msg_flags = 0, .msg_flags = 0 | MSG_DONTWAIT | MSG_NOSIGNAL,
#endif #endif
}; };
@ -414,10 +414,10 @@ int mars_recv_raw(struct mars_socket *msock, void *buf, int minlen, int maxlen)
MARS_IO("#%d status = %d\n", msock->s_debug_nr, status); MARS_IO("#%d status = %d\n", msock->s_debug_nr, status);
if (status == -EAGAIN) { if (status == -EAGAIN) {
msleep(sleeptime);
// linearly increasing backoff // linearly increasing backoff
if (sleeptime < 100) if (sleeptime < 100)
sleeptime++; sleeptime += 1000 / HZ;
msleep(sleeptime);
continue; continue;
} }
if (!status) { // EOF if (!status) { // EOF