diff --git a/tools/idf_monitor.py b/tools/idf_monitor.py index ccaddffa13..f0dcd6f7c6 100755 --- a/tools/idf_monitor.py +++ b/tools/idf_monitor.py @@ -443,13 +443,25 @@ class Monitor(object): with self: # disable console control sys.stderr.write(ANSI_NORMAL) try: - subprocess.call(["%sgdb" % self.toolchain_prefix, + process = subprocess.Popen(["%sgdb" % self.toolchain_prefix, "-ex", "set serial baud %d" % self.serial.baudrate, "-ex", "target remote %s" % self.serial.port, "-ex", "interrupt", # monitor has already parsed the first 'reason' command, need a second self.elf_file], cwd=".") + process.wait() except KeyboardInterrupt: pass # happens on Windows, maybe other OSes + finally: + try: + # on Linux, maybe other OSes, gdb sometimes seems to be alive even after wait() returns... + process.terminate() + except: + pass + try: + # also on Linux, maybe other OSes, gdb sometimes exits uncleanly and breaks the tty mode + subprocess.call(["stty", "sane"]) + except: + pass # don't care if there's no stty, we tried... self.prompt_next_action("gdb exited") def output_enable(self, enable): @@ -567,6 +579,17 @@ if os.name == 'nt': self.handle = GetStdHandle(STD_ERROR_HANDLE if self.output == sys.stderr else STD_OUTPUT_HANDLE) self.matched = b'' + def _output_write(self, data): + # Windows 10 bug since the Fall Creators Update, sometimes writing to console randomly fails + # (but usually succeeds afterwards, it seems.) + # Ref https://github.com/espressif/esp-idf/issues/1136 + for tries in range(3): + try: + self.output.write(data) + return + except IOError: + pass + def write(self, data): for b in data: l = len(self.matched) @@ -585,18 +608,10 @@ if os.name == 'nt': color |= FOREGROUND_INTENSITY SetConsoleTextAttribute(self.handle, color) else: - self.output.write(self.matched) # not an ANSI color code, display verbatim + self._output_write(self.matched) # not an ANSI color code, display verbatim self.matched = b'' else: - try: - self.output.write(b) - except IOError: - # Windows 10 bug since the Fall Creators Update, sometimes writing to console randomly fails - # (but usually succeeds the second time, it seems.) Ref https://github.com/espressif/esp-idf/issues/1136 - try: - self.output.write(b) - except IOError: - pass + self._output_write(b) self.matched = b'' def flush(self):