Skip to content

Commit 0bb6fc6

Browse files
brettcannonbrettcannon
authored
Merge branch 'main' into 137248-wasi-logdir
2 parents 19e9b9d + 2f1a9f2 commit 0bb6fc6

File tree

7 files changed

+81
-15
lines changed

7 files changed

+81
-15
lines changed

‎Lib/asyncio/proactor_events.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,8 @@ def _pipe_closed(self, fut):
460460
class _ProactorDatagramTransport(_ProactorBasePipeTransport,
461461
transports.DatagramTransport):
462462
max_size = 256 * 1024
463+
_header_size = 8
464+
463465
def __init__(self, loop, sock, protocol, address=None,
464466
waiter=None, extra=None):
465467
self._address = address
@@ -499,7 +501,7 @@ def sendto(self, data, addr=None):
499501

500502
# Ensure that what we buffer is immutable.
501503
self._buffer.append((bytes(data), addr))
502-
self._buffer_size += len(data) + 8 # include header bytes
504+
self._buffer_size += len(data) + self._header_size
503505

504506
if self._write_fut is None:
505507
# No current write operations are active, kick one off
@@ -526,7 +528,7 @@ def _loop_writing(self, fut=None):
526528
return
527529

528530
data, addr = self._buffer.popleft()
529-
self._buffer_size -= len(data)
531+
self._buffer_size -= len(data) + self._header_size
530532
if self._address is not None:
531533
self._write_fut = self._loop._proactor.send(self._sock,
532534
data)

‎Lib/asyncio/selector_events.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1212,6 +1212,7 @@ def close(self):
12121212
class _SelectorDatagramTransport(_SelectorTransport, transports.DatagramTransport):
12131213

12141214
_buffer_factory = collections.deque
1215+
_header_size = 8
12151216

12161217
def __init__(self, loop, sock, protocol, address=None,
12171218
waiter=None, extra=None):
@@ -1285,21 +1286,21 @@ def sendto(self, data, addr=None):
12851286

12861287
# Ensure that what we buffer is immutable.
12871288
self._buffer.append((bytes(data), addr))
1288-
self._buffer_size += len(data) + 8 # include header bytes
1289+
self._buffer_size += len(data) + self._header_size
12891290
self._maybe_pause_protocol()
12901291

12911292
def _sendto_ready(self):
12921293
while self._buffer:
12931294
data, addr = self._buffer.popleft()
1294-
self._buffer_size -= len(data)
1295+
self._buffer_size -= len(data) + self._header_size
12951296
try:
12961297
if self._extra['peername']:
12971298
self._sock.send(data)
12981299
else:
12991300
self._sock.sendto(data, addr)
13001301
except (BlockingIOError, InterruptedError):
13011302
self._buffer.appendleft((data, addr)) # Try again later.
1302-
self._buffer_size += len(data)
1303+
self._buffer_size += len(data) + self._header_size
13031304
break
13041305
except OSError as exc:
13051306
self._protocol.error_received(exc)

‎Lib/test/test_asyncio/test_proactor_events.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -566,6 +566,8 @@ def test_sendto(self):
566566
self.assertTrue(self.proactor.sendto.called)
567567
self.proactor.sendto.assert_called_with(
568568
self.sock, data, addr=('0.0.0.0', 1234))
569+
self.assertFalse(transport._buffer)
570+
self.assertEqual(0, transport._buffer_size)
569571

570572
def test_sendto_bytearray(self):
571573
data = bytearray(b'data')

‎Lib/test/test_asyncio/test_selector_events.py

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1497,6 +1497,47 @@ def test_sendto_closing(self):
14971497
transport.sendto(b'data', (1,))
14981498
self.assertEqual(transport._conn_lost, 2)
14991499

1500+
def test_sendto_sendto_ready(self):
1501+
data = b'data'
1502+
1503+
# First queue up the buffer by having the socket blocked
1504+
self.sock.sendto.side_effect = BlockingIOError
1505+
transport = self.datagram_transport()
1506+
transport.sendto(data, ('0.0.0.0', 12345))
1507+
self.loop.assert_writer(7, transport._sendto_ready)
1508+
self.assertEqual(1, len(transport._buffer))
1509+
self.assertEqual(transport._buffer_size, len(data) + transport._header_size)
1510+
1511+
# Now let the socket send the buffer
1512+
self.sock.sendto.side_effect = None
1513+
transport._sendto_ready()
1514+
self.assertTrue(self.sock.sendto.called)
1515+
self.assertEqual(
1516+
self.sock.sendto.call_args[0], (data, ('0.0.0.0', 12345)))
1517+
self.assertFalse(self.loop.writers)
1518+
self.assertFalse(transport._buffer)
1519+
self.assertEqual(transport._buffer_size, 0)
1520+
1521+
def test_sendto_sendto_ready_blocked(self):
1522+
data = b'data'
1523+
1524+
# First queue up the buffer by having the socket blocked
1525+
self.sock.sendto.side_effect = BlockingIOError
1526+
transport = self.datagram_transport()
1527+
transport.sendto(data, ('0.0.0.0', 12345))
1528+
self.loop.assert_writer(7, transport._sendto_ready)
1529+
self.assertEqual(1, len(transport._buffer))
1530+
self.assertEqual(transport._buffer_size, len(data) + transport._header_size)
1531+
1532+
# Now try to send the buffer, it will be added to buffer again if it fails
1533+
transport._sendto_ready()
1534+
self.assertTrue(self.sock.sendto.called)
1535+
self.assertEqual(
1536+
self.sock.sendto.call_args[0], (data, ('0.0.0.0', 12345)))
1537+
self.assertTrue(self.loop.writers)
1538+
self.assertEqual(1, len(transport._buffer))
1539+
self.assertEqual(transport._buffer_size, len(data) + transport._header_size)
1540+
15001541
def test_sendto_ready(self):
15011542
data = b'data'
15021543
self.sock.sendto.return_value = len(data)

‎Misc/NEWS.d/next/Library/2025-06-16-12-37-02.gh-issue-135444.An2eeA.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Fix :meth:`asyncio.DatagramTransport.sendto` to account for datagram header size when
2+
data cannot be sent.

‎Misc/NEWS.d/next/Tools-Demos/2025-07-30-10-28-35.gh-issue-137243.NkdUqH.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Have Tools/wasm/wasi detect a WASI SDK install in /opt when it was directly
2+
extracted from a release tarball.

‎Tools/wasm/wasi/__main__.py

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
LOCAL_SETUP_MARKER = ("# Generated by Tools/wasm/wasi .\n"
2727
"# Required to statically build extension modules.").encode("utf-8")
2828

29+
WASI_SDK_VERSION = 24
30+
2931
WASMTIME_VAR_NAME = "WASMTIME"
3032
WASMTIME_HOST_RUNNER_VAR = f"{{{WASMTIME_VAR_NAME}}}"
3133

@@ -180,10 +182,22 @@ def make_build_python(context, working_dir):
180182

181183

182184
def find_wasi_sdk():
183-
"""Find the path to wasi-sdk."""
185+
"""Find the path to the WASI SDK."""
184186
if wasi_sdk_path := os.environ.get("WASI_SDK_PATH"):
185187
return pathlib.Path(wasi_sdk_path)
186-
elif (default_path := pathlib.Path("/opt/wasi-sdk")).exists():
188+
189+
opt_path = pathlib.Path("/opt")
190+
# WASI SDK versions have a ``.0`` suffix, but it's a constant; the WASI SDK team
191+
# has said they don't plan to ever do a point release and all of their Git tags
192+
# lack the ``.0`` suffix.
193+
# Starting with WASI SDK 23, the tarballs went from containing a directory named
194+
# ``wasi-sdk-{WASI_SDK_VERSION}.0`` to e.g.
195+
# ``wasi-sdk-{WASI_SDK_VERSION}.0-x86_64-linux``.
196+
potential_sdks = [path for path in opt_path.glob(f"wasi-sdk-{WASI_SDK_VERSION}.0*")
197+
if path.is_dir()]
198+
if len(potential_sdks) == 1:
199+
return potential_sdks[0]
200+
elif (default_path := opt_path / "wasi-sdk").is_dir():
187201
return default_path
188202

189203

@@ -313,6 +327,8 @@ def clean_contents(context):
313327

314328

315329
def main():
330+
default_host_triple = "wasm32-wasip1"
331+
default_wasi_sdk = find_wasi_sdk()
316332
default_host_runner = (f"{WASMTIME_HOST_RUNNER_VAR} run "
317333
# Make sure the stack size will work for a pydebug
318334
# build.
@@ -360,17 +376,17 @@ def main():
360376
for subcommand in build, configure_host:
361377
subcommand.add_argument("--wasi-sdk", type=pathlib.Path,
362378
dest="wasi_sdk_path",
363-
default=find_wasi_sdk(),
364-
help="Path to wasi-sdk; defaults to "
365-
"$WASI_SDK_PATH or /opt/wasi-sdk")
379+
default=default_wasi_sdk,
380+
help=f"Path to the WASI SDK; defaults to {default_wasi_sdk}")
366381
subcommand.add_argument("--host-runner", action="store",
367382
default=default_host_runner, dest="host_runner",
368-
help="Command template for running the WASI host "
369-
"(default designed for wasmtime 14 or newer: "
370-
f"`{default_host_runner}`)")
383+
help="Command template for running the WASI host; defaults to "
384+
f"`{default_host_runner}`")
371385
for subcommand in build, configure_host, make_host:
372-
subcommand.add_argument("--host-triple", action="store", default="wasm32-wasip1",
373-
help="The target triple for the WASI host build")
386+
subcommand.add_argument("--host-triple", action="store",
387+
default=default_host_triple,
388+
help="The target triple for the WASI host build; "
389+
f"defaults to {default_host_triple}")
374390

375391
context = parser.parse_args()
376392
context.init_dir = pathlib.Path().absolute()

0 commit comments

Comments
 (0)