Skip to content

[pull] master from aio-libs:master #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Apr 19, 2025
Merged

[pull] master from aio-libs:master #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES/10740.misc.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Improved performance of the WebSocket reader -- by :user:`bdraco`.
36 changes: 20 additions & 16 deletions aiohttp/_websocket/reader_c.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,17 @@ cdef unsigned int READ_PAYLOAD_LENGTH
cdef unsigned int READ_PAYLOAD_MASK
cdef unsigned int READ_PAYLOAD

cdef unsigned int OP_CODE_CONTINUATION
cdef unsigned int OP_CODE_TEXT
cdef unsigned int OP_CODE_BINARY
cdef unsigned int OP_CODE_CLOSE
cdef unsigned int OP_CODE_PING
cdef unsigned int OP_CODE_PONG
cdef int OP_CODE_NOT_SET
cdef int OP_CODE_CONTINUATION
cdef int OP_CODE_TEXT
cdef int OP_CODE_BINARY
cdef int OP_CODE_CLOSE
cdef int OP_CODE_PING
cdef int OP_CODE_PONG

cdef int COMPRESSED_NOT_SET
cdef int COMPRESSED_FALSE
cdef int COMPRESSED_TRUE

cdef object UNPACK_LEN3
cdef object UNPACK_CLOSE_CODE
Expand Down Expand Up @@ -66,9 +71,9 @@ cdef class WebSocketReader:
cdef bytearray _partial
cdef unsigned int _state

cdef object _opcode
cdef object _frame_fin
cdef object _frame_opcode
cdef int _opcode
cdef bint _frame_fin
cdef int _frame_opcode
cdef object _frame_payload
cdef unsigned long long _frame_payload_len

Expand All @@ -77,7 +82,7 @@ cdef class WebSocketReader:
cdef bytes _frame_mask
cdef unsigned long long _payload_length
cdef unsigned int _payload_length_flag
cdef object _compressed
cdef int _compressed
cdef object _decompressobj
cdef bint _compress

Expand All @@ -88,22 +93,21 @@ cdef class WebSocketReader:
fin=bint,
has_partial=bint,
payload_merged=bytes,
opcode="unsigned int",
)
cpdef void _feed_data(self, bytes data)
cpdef void _handle_frame(self, bint fin, int opcode, object payload, int compressed) except *

@cython.locals(
start_pos="unsigned int",
buf_len="unsigned int",
data_len="unsigned int",
length="unsigned int",
chunk_size="unsigned int",
chunk_len="unsigned int",
buf_length="unsigned int",
buf_cstr="const unsigned char *",
data_length="unsigned int",
data_cstr="const unsigned char *",
first_byte="unsigned char",
second_byte="unsigned char",
end_pos="unsigned int",
has_mask=bint,
fin=bint,
)
cpdef list parse_frame(self, bytes buf)
cpdef void _feed_data(self, bytes data) except *
Loading
Loading