[pypy-commit] pypy use-file-star-for-file: release gil around entire readline loop

[bdkearns]

Author: Brian Kearns <bdkearns at gmail.com>
Branch: use-file-star-for-file
Changeset: r73569:b06d8ebb3fa4
Date: 2014-09-16 17:42 -0400
http://bitbucket.org/pypy/pypy/changeset/b06d8ebb3fa4/

Log:	release gil around entire readline loop

diff --git a/rpython/rlib/rfile.py b/rpython/rlib/rfile.py
--- a/rpython/rlib/rfile.py
+++ b/rpython/rlib/rfile.py
@@ -94,12 +94,12 @@
     USE_FGETS_IN_GETLINE = True
     c_flockfile = lambda ll_file: None
     c_funlockfile = lambda ll_file: None
-    c_getc_unlocked = llexternal('getc', [FILEP], rffi.INT)
+    c_getc_unlocked = c_getc
 else:
     USE_FGETS_IN_GETLINE = False
-    c_flockfile = llexternal('flockfile', [FILEP], lltype.Void)
-    c_funlockfile = llexternal('funlockfile', [FILEP], lltype.Void)
-    c_getc_unlocked = llexternal('getc_unlocked', [FILEP], rffi.INT)
+    c_flockfile = llexternal('flockfile', [FILEP], lltype.Void, releasegil=False)
+    c_funlockfile = llexternal('funlockfile', [FILEP], lltype.Void, releasegil=False)
+    c_getc_unlocked = llexternal('getc_unlocked', [FILEP], rffi.INT, releasegil=False)
 
 c_fgets = llexternal('fgets', [rffi.CCHARP, rffi.INT, FILEP], rffi.CCHARP)
 c_fread = llexternal('fread', [rffi.CCHARP, rffi.SIZE_T, rffi.SIZE_T, FILEP],
@@ -513,7 +513,8 @@
             i = 0
             c = ord('x')
             while True:
-                # XXX release gil for all of this rather than each getc
+                before = rffi.aroundstate.before
+                if before: before()
                 c_flockfile(ll_file)
                 if self._univ_newline:
                     while i < remainsize:
@@ -541,6 +542,8 @@
                     if c == EOF:
                         if c_ferror(ll_file) and rposix.get_errno() == errno.EINTR:
                             c_funlockfile(ll_file)
+                            after = rffi.aroundstate.after
+                            if after: after()
                             self._newlinetypes = newlinetypes
                             self._skipnextlf = skipnextlf
                             if self._signal_checker is not None:
@@ -559,6 +562,8 @@
                         if c == ord('\n'):
                             break
                 c_funlockfile(ll_file)
+                after = rffi.aroundstate.after
+                if after: after()
                 self._newlinetypes = newlinetypes
                 self._skipnextlf = skipnextlf
                 if i == size: