Mercurial > cpython-lru_cache-weakref

diff Modules/socketmodule.c @ 23722:75c51999c8d5 legacy-trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Correct several blunders in the timeout code, mostly my own fault (for not testing it -- apparently test_timeout.py doesn't test anything useful): In internal_select(): - The tv_usec part of the timeout for select() was calculated wrong. - The first argument to select() was one too low. - The sense of the direction argument to internal_select() was inverted. In PySocketSock_settimeout(): - The calls to internal_setblocking() were swapped. Also, repaired some comments and fixed the test for the return value of internal_select() in sendall -- this was in the original patch.
author Guido van Rossum <guido@python.org>
date Fri, 07 Jun 2002 01:42:47 +0000
parents c2733e8f6612
children 2f6f8708e3e9
line wrap: on
line diff
--- a/Modules/socketmodule.c	Thu Jun 06 23:23:55 2002 +0000
+++ b/Modules/socketmodule.c	Fri Jun 07 01:42:47 2002 +0000
@@ -487,11 +487,12 @@
 }
 
 /* For access to the select module to poll the socket for timeout
- * functionality. If reading is: 1 poll as read, 0, poll as write.
+ * functionality. writing is 1 for writing, 0 for reading.
  * Return value: -1 if error, 0 if not ready, >= 1 if ready.
+ * An exception is set when the return value is <= 0 (!).
  */
 static int
-internal_select(PySocketSockObject *s, int reading)
+internal_select(PySocketSockObject *s, int writing)
 {
 	fd_set fds;
 	struct timeval tv;
@@ -499,15 +500,15 @@
 
 	/* Construct the arguments to select */
 	tv.tv_sec = (int)s->sock_timeout;
-	tv.tv_usec = (int)(s->sock_timeout/1e6);
+	tv.tv_usec = (int)((s->sock_timeout - tv.tv_sec) * 1e6);
 	FD_ZERO(&fds);
 	FD_SET(s->sock_fd, &fds);
 
 	/* See if the socket is ready */
-	if (reading)
-		count = select(s->sock_fd, &fds, NULL, NULL, &tv);
+	if (writing)
+		count = select(s->sock_fd+1, NULL, &fds, NULL, &tv);
 	else
-		count = select(s->sock_fd, NULL, &fds, NULL, &tv);
+		count = select(s->sock_fd+1, &fds, NULL, NULL, &tv);
 
 	/* Check for errors */
 	if (count < 0) {
@@ -1075,9 +1076,9 @@
 Set the socket to blocking (flag is true) or non-blocking (false).\n\
 This uses the FIONBIO ioctl with the O_NDELAY flag.";
 
-/* s.settimeout (float | int | long) method.
- * Causes an exception to be raised when the integer number of seconds
- * has elapsed when performing a blocking socket operation.
+/* s.settimeout(float | None) method.
+ * Causes an exception to be raised when the given time has
+ * elapsed when performing a blocking socket operation.
  */
 static PyObject *
 PySocketSock_settimeout(PySocketSockObject *s, PyObject *arg)
@@ -1110,10 +1111,7 @@
 	 *     non-blocking stuff. This makes sense because timeout stuff is
 	 *     blocking by nature.
 	 */
-	if (value < 0.0)
-		internal_setblocking(s, 0);
-	else
-		internal_setblocking(s, 1);
+	internal_setblocking(s, value < 0.0);
 
 	s->sock_blocking = 1; /* Always negate setblocking() */
 
@@ -1819,7 +1817,7 @@
 
 	if (s->sock_timeout >= 0.0) {
 		if (s->sock_blocking) {
-			if (internal_select(s, 1) < 0)
+			if (internal_select(s, 1) <= 0)
 				return NULL;
 		}
 	}