default exec timeout=None, mount: removed auto-repl/monitor, added bench comparison

Author: pavelrevak

README.md

@@ -497,7 +497,7 @@ For reporting bugs, please include `-ddd` output in the issue.
 
 ## Performance
 
-`mpytool` uses optimized chunked transfer with automatic compression, which allows copying files very quickly. See [README_BENCH.md](README_BENCH.md) for detailed benchmarks.
+`mpytool` uses optimized chunked transfer with automatic compression, which allows copying files very quickly. See [README_bench.md](README_bench.md) for detailed benchmarks.
 
 ### Summary
 

README_BENCH.md README_bench.mdREADME_BENCH.md renamed to README_bench.md

@@ -66,3 +66,25 @@ Higher speed achieved by automatic compression of text-based files during transf
 - **Skip unchanged: 1.5x - 2.9x faster** than mpremote
 
 Many more test scenarios could be designed (different file types, sizes, mixed workloads), but in most cases mpytool would be **at least 2x faster** than mpremote.
+
+## Mount VFS Benchmark
+
+Reading files from mounted VFS (PC filesystem accessible on device).
+
+### RP2040 - USB-CDC - MacOS
+
+| Test | mpytool | mpremote | Speedup |
+|------|---------|----------|---------|
+| Read 50 x 2KB files | **1.5s** | 3.9s | **2.5x** |
+| Read 1 x 100KB file | **1.0s** | 1.1s | **1.1x** |
+
+### ESP32-C6 - USB-CDC - MacOS
+
+| Test | mpytool | mpremote | Speedup |
+|------|---------|----------|---------|
+| Read 50 x 2KB files | **0.6s** | 3.2s | **5.6x** |
+| Read 1 x 100KB file | **0.3s** | 0.5s | **1.8x** |
+
+### Summary
+
+Batch LISTDIR (1 RTT) vs iterative ilistdir (N+1 RTT) makes significant difference when opening many files. The speedup is more pronounced on faster CPUs (ESP32-C6 160MHz vs RP2040 133MHz).

mpytool/mpy_comm.py

@@ -182,12 +182,12 @@ def reset_state(self):
         self._repl_mode = None
         self._raw_paste_supported = None
 
-    def exec(self, command, timeout=5):
+    def exec(self, command, timeout=None):
         """Execute command
 
         Arguments:
             command: command to execute
-            timeout: maximum waiting time for result,
+            timeout: maximum waiting time for result (None = wait forever),
                 0 = submit only (send code, don't wait for output)
 
         Returns:

mpytool/mpytool.py

@@ -4,6 +4,7 @@
 import fnmatch as _fnmatch
 import importlib.metadata as _metadata
 import os as _os
+import sys as _sys
 import time as _time
 
 import mpytool as _mpytool
@@ -410,6 +411,9 @@ def cmd_repl(self):
         if not _terminal.AVAILABLE:
             self._log.error("REPL not available on this platform")
             return
+        if not _sys.stdin.isatty():
+            self._log.error("REPL requires interactive terminal")
+            return
         self.verbose("REPL (Ctrl+] to exit)", 1)
         terminal = _terminal.Terminal(self.conn, self._log)
         terminal.run()
@@ -1316,26 +1320,6 @@ def _parse_chunk_size(value):
     return num
 
 
-def _mount_auto_repl(command_groups):
-    """Append repl to command groups if mount is used without terminal command.
-
-    mount requires mpytool to stay alive (PC handles FS requests).
-    If the last command after mount is not repl or monitor, auto-append repl.
-    """
-    # mount with args = real mount (needs repl to stay alive)
-    # mount without args = listing only (no repl needed)
-    has_mount = any(
-        group[0] == 'mount' and len(group) > 1
-        for group in command_groups if group)
-    if not has_mount:
-        return
-    # Check first item (command name) of last group
-    last_group = command_groups[-1] if command_groups else []
-    last_cmd = last_group[0] if last_group else None
-    if last_cmd not in ('repl', 'monitor'):
-        command_groups.append(['repl'])
-
-
 def _build_main_parser():
     """Build the main argument parser."""
     _description = _about["Summary"] if _about else None
@@ -1402,8 +1386,6 @@ def main():
         force=args.force, compress=compress, chunk_size=args.chunk_size,
         port=args.port, address=args.address, baudrate=args.baud)
     command_groups = _utils.split_commands(args.commands)
-    # Auto-REPL for mount: if mount is used and last command is not repl/monitor
-    _mount_auto_repl(command_groups)
     try:
         with_progress = args.verbose >= 1
         _run_commands(mpy_tool, command_groups, with_progress=with_progress)

tests/test_mount.py

@@ -713,61 +713,6 @@ def test_reboot_split_across_reads(self):
         self.assertTrue(intercept._needs_remount)
 
 
-class TestMountAutoRepl(unittest.TestCase):
-    """Tests for auto-REPL logic with mount command"""
-
-    def test_mount_only(self):
-        """mount without repl/monitor appends repl"""
-        from mpytool.mpytool import _mount_auto_repl
-        groups = [['mount', './src']]
-        _mount_auto_repl(groups)
-        self.assertEqual(len(groups), 2)
-        self.assertEqual(groups[1], ['repl'])
-
-    def test_mount_with_repl(self):
-        """mount -- repl does not append extra repl"""
-        from mpytool.mpytool import _mount_auto_repl
-        groups = [['mount', './src'], ['repl']]
-        _mount_auto_repl(groups)
-        self.assertEqual(len(groups), 2)
-
-    def test_mount_with_monitor(self):
-        """mount -- monitor does not append repl"""
-        from mpytool.mpytool import _mount_auto_repl
-        groups = [['mount', './src'], ['monitor']]
-        _mount_auto_repl(groups)
-        self.assertEqual(len(groups), 2)
-
-    def test_mount_with_exec(self):
-        """mount -- exec "..." appends repl"""
-        from mpytool.mpytool import _mount_auto_repl
-        groups = [['mount', './src'], ['exec', 'import app']]
-        _mount_auto_repl(groups)
-        self.assertEqual(len(groups), 3)
-        self.assertEqual(groups[2], ['repl'])
-
-    def test_mount_exec_monitor(self):
-        """mount -- exec -- monitor does not append repl"""
-        from mpytool.mpytool import _mount_auto_repl
-        groups = [['mount', './src'], ['exec', 'import app'], ['monitor']]
-        _mount_auto_repl(groups)
-        self.assertEqual(len(groups), 3)
-
-    def test_no_mount(self):
-        """Without mount, no auto-repl"""
-        from mpytool.mpytool import _mount_auto_repl
-        groups = [['exec', 'print(1)']]
-        _mount_auto_repl(groups)
-        self.assertEqual(len(groups), 1)
-
-    def test_mount_list_no_auto_repl(self):
-        """mount without args (listing) does not append repl"""
-        from mpytool.mpytool import _mount_auto_repl
-        groups = [['mount']]
-        _mount_auto_repl(groups)
-        self.assertEqual(len(groups), 1)
-
-
 class TestMountDispatch(unittest.TestCase):
     """Tests for mount command dispatch"""