Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-122187: Avoid TSan reported race in `run_udp_echo_server` (#122189) 

TSan doesn't fully recognize the synchronization via I/O, so ensure that
socket name is retrieved earlier and use a different socket for sending
the "STOP" message.
This commit is contained in:
Sam Gross 2024-07-25 04:16:53 -04:00 committed by GitHub
parent bb108580de
commit 2f74b709b6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Lib/test/test_asyncio/utils.py
View File

@ -301,12 +301,17 @@ def run_udp_echo_server(*, host='127.0.0.1', port=0):
family, type, proto, _, sockaddr = addr_info[0] family, type, proto, _, sockaddr = addr_info[0]
sock = socket.socket(family, type, proto) sock = socket.socket(family, type, proto)
sock.bind((host, port)) sock.bind((host, port))
sockname = sock.getsockname()
thread = threading.Thread(target=lambda: echo_datagrams(sock)) thread = threading.Thread(target=lambda: echo_datagrams(sock))
thread.start() thread.start()
try: try:
yield sock.getsockname() yield sockname
finally: finally:
sock.sendto(b'STOP', sock.getsockname()) # gh-122187: use a separate socket to send the stop message to avoid
# TSan reported race on the same socket.
sock2 = socket.socket(family, type, proto)
sock2.sendto(b'STOP', sockname)
sock2.close()
thread.join() thread.join()