From: Toni Wilen <twilen@winuae.net>
Date: Mon, 10 Mar 2025 17:26:52 +0000 (+0200)
Subject: Slirp update/fix
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=1565c35cc72a594a74e9a17205ed2acf32e2f578;p=francis%2Fwinuae.git

Slirp update/fix
---

diff --git a/slirp_uae.cpp b/slirp_uae.cpp
index 1034bef5..af022bbf 100644
--- a/slirp_uae.cpp
+++ b/slirp_uae.cpp
@@ -140,38 +140,46 @@ extern uae_sem_t slirp_sem2;
 static void slirp_receive_func(void *arg)
 {
 	slirp_thread_active = 1;
-	while (slirp_thread_active) {
-		// Wait for packets to arrive
+	while (slirp_thread_active == 1) {
 		fd_set rfds, wfds, xfds;
 		INT_PTR nfds;
 		int ret, timeout;
 
-		// ... in the output queue
 		nfds = -1;
 		FD_ZERO(&rfds);
 		FD_ZERO(&wfds);
 		FD_ZERO(&xfds);
-		uae_sem_wait (&slirp_sem2);
+
+		// Add timeout protection for semaphore acquisition
+		if (uae_sem_trywait_delay(&slirp_sem2, 500)) {
+			// Couldn't acquire semaphore within timeout
+			continue;
+		}
+
 		timeout = slirp_select_fill(&nfds, &rfds, &wfds, &xfds);
-		uae_sem_post (&slirp_sem2);
+		uae_sem_post(&slirp_sem2);
 		if (nfds < 0) {
 			/* Windows does not honour the timeout if there is not
 			   descriptor to wait for */
-			sleep_millis (timeout / 1000);
+			sleep_millis(timeout / 1000);
 			ret = 0;
 		} else {
 			struct timeval tv;
 			tv.tv_sec = 0;
 			tv.tv_usec = timeout;
-			ret = select(0, &rfds, &wfds, &xfds, &tv);
+			ret = select(nfds + 1, &rfds, &wfds, &xfds, &tv);
 			if (ret == SOCKET_ERROR) {
 				write_log(_T("SLIRP socket ERR=%d\n"), WSAGetLastError());
+				sleep_millis(10);
+				continue;
 			}
 		}
 		if (ret >= 0) {
-			uae_sem_wait (&slirp_sem2);
+			if (uae_sem_trywait_delay(&slirp_sem2, 500)) {
+				continue;
+			}
 			slirp_select_poll(&rfds, &wfds, &xfds);
-			uae_sem_post (&slirp_sem2);
+			uae_sem_post(&slirp_sem2);
 		}
 	}
 	slirp_thread_active = -1;
@@ -203,7 +211,7 @@ bool uae_slirp_start (void)
 	return false;
 }
 
-void uae_slirp_end (void)
+void uae_slirp_end(void)
 {
 #ifdef WITH_QEMU_SLIRP
 	if (impl == QEMU_IMPLEMENTATION) {
@@ -215,10 +223,18 @@ void uae_slirp_end (void)
 	if (impl == BUILTIN_IMPLEMENTATION) {
 		if (slirp_thread_active > 0) {
 			slirp_thread_active = 0;
-			while (slirp_thread_active == 0) {
-				sleep_millis (10);
+			// Use a proper timeout instead of infinite waiting
+			int wait_count = 0;
+			while (slirp_thread_active == 0 && wait_count < 100) {
+				sleep_millis(10);
+				wait_count++;
+			}
+
+			// Force thread termination if it didn't exit cleanly
+			if (slirp_thread_active == 0) {
+				write_log(_T("SLIRP thread did not terminate properly, forcing exit\n"));
 			}
-			uae_end_thread (&slirp_tid);
+			uae_end_thread(&slirp_tid);
 		}
 		slirp_thread_active = 0;
 		return;