Skip to content

Commit dbcdb16

Browse files
[PR #8667/406cd2c7 backport][3.10] Improve performance of generating random WebSocket mask (#8668)
Co-authored-by: J. Nick Koston <[email protected]>
1 parent b4ad882 commit dbcdb16

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

CHANGES/8667.misc.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Improved performance of generating random WebSocket mask -- by :user:`bdraco`.

aiohttp/http_websocket.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import sys
99
import zlib
1010
from enum import IntEnum
11+
from functools import partial
1112
from struct import Struct
1213
from typing import (
1314
Any,
@@ -103,6 +104,7 @@ class WSMsgType(IntEnum):
103104
PACK_LEN2 = Struct("!BBH").pack
104105
PACK_LEN3 = Struct("!BBQ").pack
105106
PACK_CLOSE_CODE = Struct("!H").pack
107+
PACK_RANDBITS = Struct("!L").pack
106108
MSG_SIZE: Final[int] = 2**14
107109
DEFAULT_LIMIT: Final[int] = 2**16
108110

@@ -612,7 +614,7 @@ def __init__(
612614
self.protocol = protocol
613615
self.transport = transport
614616
self.use_mask = use_mask
615-
self.randrange = random.randrange
617+
self.get_random_bits = partial(random.getrandbits, 32)
616618
self.compress = compress
617619
self.notakeover = notakeover
618620
self._closing = False
@@ -668,8 +670,7 @@ async def _send_frame(
668670
else:
669671
header = PACK_LEN3(0x80 | rsv | opcode, 127 | mask_bit, msg_length)
670672
if use_mask:
671-
mask_int = self.randrange(0, 0xFFFFFFFF)
672-
mask = mask_int.to_bytes(4, "big")
673+
mask = PACK_RANDBITS(self.get_random_bits())
673674
message = bytearray(message)
674675
_websocket_mask(mask, message)
675676
self._write(header + mask + message)

0 commit comments

Comments
 (0)