Fix hang in syncio_close (#763)

Andrew · web-flow · commit 0c3137f62115 · 2024-12-18T15:36:43.000-05:00
diff --git a/contrib/win32/win32compat/termio.c b/contrib/win32/win32compat/termio.c
@@ -293,7 +293,10 @@ syncio_close(struct w32_io* pio)
 			CancelSynchronousIo(pio->read_overlapped.hEvent);
 		}
 
-		WaitForSingleObject(pio->read_overlapped.hEvent, INFINITE);
+		// give the read thread some time to wind down, but don't block syncio_close
+		if (WAIT_TIMEOUT == WaitForSingleObject(pio->read_overlapped.hEvent, 1000)) {
+			debug4("read_overlapped thread timed out");
+		}
 	}
 
 	/* drain queued APCs */

Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,10 @@ syncio_close(struct w32_io* pio)`
`293`	`293`	`CancelSynchronousIo(pio->read_overlapped.hEvent);`
`294`	`294`	`}`
`295`	`295`
`296`		`- WaitForSingleObject(pio->read_overlapped.hEvent, INFINITE);`
	`296`	`+ // give the read thread some time to wind down, but don't block syncio_close`
	`297`	`+ if (WAIT_TIMEOUT == WaitForSingleObject(pio->read_overlapped.hEvent, 1000)) {`
	`298`	`+ debug4("read_overlapped thread timed out");`
	`299`	`+ }`
`297`	`300`	`}`
`298`	`301`
`299`	`302`	`/* drain queued APCs */`