Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
af53ead6
Commit
af53ead6
authored
Oct 05, 2016
by
Yury Selivanov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #28370: Speedup asyncio.StreamReader.readexactly
Patch by Коренберг Марк.
parent
ab485051
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
19 deletions
+20
-19
Lib/asyncio/streams.py
Lib/asyncio/streams.py
+17
-19
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/asyncio/streams.py
View file @
af53ead6
...
...
@@ -448,6 +448,7 @@ class StreamReader:
assert
not
self
.
_eof
,
'_wait_for_data after EOF'
# Waiting for data while paused will make deadlock, so prevent it.
# This is essential for readexactly(n) for case when n > self._limit.
if
self
.
_paused
:
self
.
_paused
=
False
self
.
_transport
.
resume_reading
()
...
...
@@ -658,25 +659,22 @@ class StreamReader:
if
n
==
0
:
return
b''
# There used to be "optimized" code here. It created its own
# Future and waited until self._buffer had at least the n
# bytes, then called read(n). Unfortunately, this could pause
# the transport if the argument was larger than the pause
# limit (which is twice self._limit). So now we just read()
# into a local buffer.
blocks
=
[]
while
n
>
0
:
block
=
yield
from
self
.
read
(
n
)
if
not
block
:
partial
=
b''
.
join
(
blocks
)
raise
IncompleteReadError
(
partial
,
len
(
partial
)
+
n
)
blocks
.
append
(
block
)
n
-=
len
(
block
)
assert
n
==
0
return
b''
.
join
(
blocks
)
while
len
(
self
.
_buffer
)
<
n
:
if
self
.
_eof
:
incomplete
=
bytes
(
self
.
_buffer
)
self
.
_buffer
.
clear
()
raise
IncompleteReadError
(
incomplete
,
n
)
yield
from
self
.
_wait_for_data
(
'readexactly'
)
if
len
(
self
.
_buffer
)
==
n
:
data
=
bytes
(
self
.
_buffer
)
self
.
_buffer
.
clear
()
else
:
data
=
bytes
(
self
.
_buffer
[:
n
])
del
self
.
_buffer
[:
n
]
self
.
_maybe_resume_transport
()
return
data
if
compat
.
PY35
:
@
coroutine
...
...
Misc/NEWS
View file @
af53ead6
...
...
@@ -353,6 +353,9 @@ Library
- Issue #28369: Raise RuntimeError when transport'
s
FD
is
used
with
add_reader
,
add_writer
,
etc
.
-
Issue
#
28370
:
Speedup
asyncio
.
StreamReader
.
readexactly
.
Patch
by
Коренберг
Марк
.
IDLE
----
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment