summaryrefslogtreecommitdiffstatshomepage
path: root/py/reader.c
diff options
context:
space:
mode:
authorDavid Lechner <david@pybricks.com>2020-01-24 11:50:31 -0600
committerDamien George <damien.p.george@gmail.com>2020-01-26 23:26:31 +1100
commit62537a18e3743a040e8b673686665f27f7504ca8 (patch)
tree3d8c1c4ac93427f4f6ee4283d7c27af6f6ce685a /py/reader.c
parent35f66d38b8e153399b5d277b6e02ea1a98eccee1 (diff)
downloadmicropython-62537a18e3743a040e8b673686665f27f7504ca8.tar.gz
micropython-62537a18e3743a040e8b673686665f27f7504ca8.zip
py: Release GIL during syscalls in reader and writer code.
This releases the GIL during POSIX system calls that could block.
Diffstat (limited to 'py/reader.c')
-rw-r--r--py/reader.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/py/reader.c b/py/reader.c
index 80364104bb..d99dfc5672 100644
--- a/py/reader.c
+++ b/py/reader.c
@@ -29,6 +29,7 @@
#include "py/runtime.h"
#include "py/mperrno.h"
+#include "py/mpthread.h"
#include "py/reader.h"
typedef struct _mp_reader_mem_t {
@@ -86,7 +87,9 @@ STATIC mp_uint_t mp_reader_posix_readbyte(void *data) {
if (reader->len == 0) {
return MP_READER_EOF;
} else {
+ MP_THREAD_GIL_EXIT();
int n = read(reader->fd, reader->buf, sizeof(reader->buf));
+ MP_THREAD_GIL_ENTER();
if (n <= 0) {
reader->len = 0;
return MP_READER_EOF;
@@ -101,7 +104,9 @@ STATIC mp_uint_t mp_reader_posix_readbyte(void *data) {
STATIC void mp_reader_posix_close(void *data) {
mp_reader_posix_t *reader = (mp_reader_posix_t*)data;
if (reader->close_fd) {
+ MP_THREAD_GIL_EXIT();
close(reader->fd);
+ MP_THREAD_GIL_ENTER();
}
m_del_obj(mp_reader_posix_t, reader);
}
@@ -110,13 +115,16 @@ void mp_reader_new_file_from_fd(mp_reader_t *reader, int fd, bool close_fd) {
mp_reader_posix_t *rp = m_new_obj(mp_reader_posix_t);
rp->close_fd = close_fd;
rp->fd = fd;
+ MP_THREAD_GIL_EXIT();
int n = read(rp->fd, rp->buf, sizeof(rp->buf));
if (n == -1) {
if (close_fd) {
close(fd);
}
+ MP_THREAD_GIL_ENTER();
mp_raise_OSError(errno);
}
+ MP_THREAD_GIL_ENTER();
rp->len = n;
rp->pos = 0;
reader->data = rp;
@@ -127,7 +135,9 @@ void mp_reader_new_file_from_fd(mp_reader_t *reader, int fd, bool close_fd) {
#if !MICROPY_VFS_POSIX
// If MICROPY_VFS_POSIX is defined then this function is provided by the VFS layer
void mp_reader_new_file(mp_reader_t *reader, const char *filename) {
+ MP_THREAD_GIL_EXIT();
int fd = open(filename, O_RDONLY, 0644);
+ MP_THREAD_GIL_ENTER();
if (fd < 0) {
mp_raise_OSError(errno);
}