From: Andre <maan@p133.(none)>
Date: Sat, 29 Apr 2006 23:28:17 +0000 (+0200)
Subject: 1000 * 1000 microseconds is too much for Darwin
X-Git-Tag: v0.2.12~24
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=c52fdf5b16f18339c1ea42da876e3edb786494d5

1000 * 1000 microseconds is too much for Darwin

linux never complained about that, but Darwin returns -EINVAL.
---

diff --git a/recv.c b/recv.c
index 95711f1f..af15eb07 100644
--- a/recv.c
+++ b/recv.c
@@ -82,12 +82,12 @@ recv:
 	FD_ZERO(&rfds);
 	FD_ZERO(&wfds);
 	timeout.tv_sec = 0;
-	timeout.tv_usec = 1000 * 1000;
+	timeout.tv_usec = 999 * 1000;
 	max = -1;
 	ret = r->pre_select(&rn, &rfds, &wfds, &timeout);
 	max = PARA_MAX(max, ret);
 
-	PARA_DEBUG_LOG("timeout: %lums\n", tv2ms(&timeout));
+	PARA_DEBUG_LOG("timeout: %lums, max: %d\n", tv2ms(&timeout), max);
 	ret = para_select(max + 1, &rfds, &wfds, &timeout);
 	if (ret < 0) {
 		ret = -E_RECV_SELECT;