TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

tools/mpremote: Optimise readline support in mount.

Browse Source 
This significantly speeds up readline on files opened directly from an
mpremote mount.

Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>
This commit is contained in:
Andrew Leech
2025-02-26 14:37:55 +11:00
committed by Damien George
parent 5fdd249c55
commit 86526e9c2b
1 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
tools/mpremote/mpremote/transport_serial.py
View File

@@ -404,12 +404,13 @@ fs_hook_cmds = {
"CMD_OPEN": 4, "CMD_OPEN": 4,
"CMD_CLOSE": 5, "CMD_CLOSE": 5,
"CMD_READ": 6, "CMD_READ": 6,
"CMD_WRITE": 7, "CMD_READLINE": 7,
"CMD_SEEK": 8, "CMD_WRITE": 8,
"CMD_REMOVE": 9, "CMD_SEEK": 9,
"CMD_RENAME": 10, "CMD_REMOVE": 10,
"CMD_MKDIR": 11, "CMD_RENAME": 11,
"CMD_RMDIR": 12, "CMD_MKDIR": 12,
"CMD_RMDIR": 13,
} }
fs_hook_code = """\ fs_hook_code = """\
@@ -592,12 +593,16 @@ class RemoteFile(io.IOBase):
return n return n
def readline(self): def readline(self):
l = '' c = self.cmd
while 1: c.begin(CMD_READLINE)
c = self.read(1) c.wr_s8(self.fd)
l += c data = c.rd_bytes(None)
if c == '\\n' or c == '': c.end()
return l if self.is_text:
data = str(data, 'utf8')
else:
data = bytes(data)
return data
def readlines(self): def readlines(self):
ls = [] ls = []
@@ -746,8 +751,7 @@ def __mount():
""" """
# Apply basic compression on hook code. # Apply basic compression on hook code.
for key, value in fs_hook_cmds.items(): fs_hook_code = re.sub(r"CMD_[A-Z_]+", lambda m: str(fs_hook_cmds[m.group(0)]), fs_hook_code)
fs_hook_code = re.sub(key, str(value), fs_hook_code)
fs_hook_code = re.sub(" *#.*$", "", fs_hook_code, flags=re.MULTILINE) fs_hook_code = re.sub(" *#.*$", "", fs_hook_code, flags=re.MULTILINE)
fs_hook_code = re.sub("\n\n+", "\n", fs_hook_code) fs_hook_code = re.sub("\n\n+", "\n", fs_hook_code)
fs_hook_code = re.sub(" ", " ", fs_hook_code) fs_hook_code = re.sub(" ", " ", fs_hook_code)
@@ -887,6 +891,14 @@ class PyboardCommand:
self.wr_bytes(buf) self.wr_bytes(buf)
# self.log_cmd(f"read {fd} {n} -> {len(buf)}") # self.log_cmd(f"read {fd} {n} -> {len(buf)}")
def do_readline(self):
fd = self.rd_s8()
buf = self.data_files[fd][0].readline()
if self.data_files[fd][1]:
buf = bytes(buf, "utf8")
self.wr_bytes(buf)
# self.log_cmd(f"readline {fd} -> {len(buf)}")
def do_seek(self): def do_seek(self):
fd = self.rd_s8() fd = self.rd_s8()
n = self.rd_s32() n = self.rd_s32()
@@ -960,6 +972,7 @@ class PyboardCommand:
fs_hook_cmds["CMD_OPEN"]: do_open, fs_hook_cmds["CMD_OPEN"]: do_open,
fs_hook_cmds["CMD_CLOSE"]: do_close, fs_hook_cmds["CMD_CLOSE"]: do_close,
fs_hook_cmds["CMD_READ"]: do_read, fs_hook_cmds["CMD_READ"]: do_read,
fs_hook_cmds["CMD_READLINE"]: do_readline,
fs_hook_cmds["CMD_WRITE"]: do_write, fs_hook_cmds["CMD_WRITE"]: do_write,
fs_hook_cmds["CMD_SEEK"]: do_seek, fs_hook_cmds["CMD_SEEK"]: do_seek,
fs_hook_cmds["CMD_REMOVE"]: do_remove, fs_hook_cmds["CMD_REMOVE"]: do_remove,