From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sat, 15 Jun 2019 11:27:10 +0000 (-0700)
Subject: Use threadpool for reading from file in sendfile fallback mode (GH-14076)
X-Git-Tag: v3.7.4rc1~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5e97450d83d4f4240315f46419686ec193273e13;p=thirdparty%2FPython%2Fcpython.git

Use threadpool for reading from file in sendfile fallback mode (GH-14076)

(cherry picked from commit 0237265e8287141c40faa8719da3a2d21d511d0d)

Co-authored-by: Andrew Svetlov <andrew.svetlov@gmail.com>
---

diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py
index a736d01d6f37..a9660ca1089c 100644
--- a/Lib/asyncio/base_events.py
+++ b/Lib/asyncio/base_events.py
@@ -1078,7 +1078,7 @@ class BaseEventLoop(events.AbstractEventLoop):
                     if blocksize <= 0:
                         return total_sent
                 view = memoryview(buf)[:blocksize]
-                read = file.readinto(view)
+                read = await self.run_in_executor(None, file.readinto, view)
                 if not read:
                     return total_sent  # EOF
                 await proto.drain()
diff --git a/Misc/NEWS.d/next/Library/2019-06-14-13-30-47.bpo-37280.Fxur0F.rst b/Misc/NEWS.d/next/Library/2019-06-14-13-30-47.bpo-37280.Fxur0F.rst
new file mode 100644
index 000000000000..7cdc56a72ce4
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-06-14-13-30-47.bpo-37280.Fxur0F.rst
@@ -0,0 +1 @@
+Use threadpool for reading from file for sendfile fallback mode.