Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2025-01-10 18:29:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #63 from rakslice/slirp_critical_section_win

Browse Source 
Windows: prevent calls to slirp functions from multiple threads concurrently
This commit is contained in:
kanjitalk755 2020-10-26 21:53:38 +09:00 committed by GitHub
commit 3ce86cee1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
BasiliskII/src/Windows/ether_windows.cpp
View File

@ -144,6 +144,8 @@ static LPPACKET send_queue = 0;
static CRITICAL_SECTION wpool_csection; static CRITICAL_SECTION wpool_csection;
static LPPACKET write_packet_pool = 0; static LPPACKET write_packet_pool = 0;
// Calling slirp functions from multiple threads concurrently is unsafe; guard it
static CRITICAL_SECTION slirp_single_call_csection;
// Try to deal with echos. Protected by fetch_csection. // Try to deal with echos. Protected by fetch_csection.
@ -416,6 +418,8 @@ bool ether_init(void)
InitializeCriticalSectionAndSpinCount( &send_csection, 5000 ); InitializeCriticalSectionAndSpinCount( &send_csection, 5000 );
InitializeCriticalSectionAndSpinCount( &wpool_csection, 5000 ); InitializeCriticalSectionAndSpinCount( &wpool_csection, 5000 );
InitializeCriticalSection( &slirp_single_call_csection );
ether_th = (HANDLE)_beginthreadex( 0, 0, ether_thread_feed_int, 0, 0, &ether_tid ); ether_th = (HANDLE)_beginthreadex( 0, 0, ether_thread_feed_int, 0, 0, &ether_tid );
if (!ether_th) { if (!ether_th) {
D(bug("Failed to create ethernet thread\n")); D(bug("Failed to create ethernet thread\n"));
@ -565,6 +569,7 @@ void ether_exit(void)
DeleteCriticalSection( &queue_csection ); DeleteCriticalSection( &queue_csection );
DeleteCriticalSection( &send_csection ); DeleteCriticalSection( &send_csection );
DeleteCriticalSection( &wpool_csection ); DeleteCriticalSection( &wpool_csection );
DeleteCriticalSection( &slirp_single_call_csection );
D(bug("Freeing read packets\n")); D(bug("Freeing read packets\n"));
free_read_packets(); free_read_packets();
@ -1018,7 +1023,9 @@ unsigned int WINAPI ether_thread_write_packets(void *arg)
} }
break; break;
case NET_IF_SLIRP: case NET_IF_SLIRP:
EnterCriticalSection( &slirp_single_call_csection );
slirp_input((uint8 *)Packet->Buffer, Packet->Length); slirp_input((uint8 *)Packet->Buffer, Packet->Length);
LeaveCriticalSection( &slirp_single_call_csection );
Packet->bIoComplete = TRUE; Packet->bIoComplete = TRUE;
recycle_write_packet(Packet); recycle_write_packet(Packet);
break; break;
@ -1372,7 +1379,9 @@ unsigned int WINAPI slirp_receive_func(void *arg)
FD_ZERO(&rfds); FD_ZERO(&rfds);
FD_ZERO(&wfds); FD_ZERO(&wfds);
FD_ZERO(&xfds); FD_ZERO(&xfds);
EnterCriticalSection( &slirp_single_call_csection );
timeout = slirp_select_fill(&nfds, &rfds, &wfds, &xfds); timeout = slirp_select_fill(&nfds, &rfds, &wfds, &xfds);
LeaveCriticalSection( &slirp_single_call_csection );
#if ! USE_SLIRP_TIMEOUT #if ! USE_SLIRP_TIMEOUT
timeout = 10000; timeout = 10000;
#endif #endif
@ -1388,8 +1397,11 @@ unsigned int WINAPI slirp_receive_func(void *arg)
tv.tv_usec = timeout; tv.tv_usec = timeout;
ret = select(0, &rfds, &wfds, &xfds, &tv); ret = select(0, &rfds, &wfds, &xfds, &tv);
} }
if (ret >= 0) if (ret >= 0) {
EnterCriticalSection( &slirp_single_call_csection );
slirp_select_poll(&rfds, &wfds, &xfds); slirp_select_poll(&rfds, &wfds, &xfds);
LeaveCriticalSection( &slirp_single_call_csection );
}
} }
D(bug("slirp_receive_func exit\n")); D(bug("slirp_receive_func exit\n"));