Skip to content

Commit

Permalink
Remove line finalization when coredump is active to avoid coredump fa…
Browse files Browse the repository at this point in the history
…ilure

Closes espressif/esp-idf#8099
  • Loading branch information
sio13 committed Feb 24, 2022
1 parent 9cf6aca commit 0bcb5d6
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 14 deletions.
6 changes: 5 additions & 1 deletion tools/idf_monitor.py
Original file line number Diff line number Diff line change
Expand Up @@ -216,10 +216,14 @@ def _main_loop(self) -> None:
# generates an event which will result in the finishing of
# the last line. This is fix for handling lines sent
# without EOL.
# finalizing the line when coredump is in progress causes decoding issues
# the espcoredump loader uses empty line as a sign for end-of-coredump
# line is finalized only for non coredump data
elif event_tag == TAG_SERIAL_FLUSH:
self.serial_handler.handle_serial_input(data, self.console_parser, self.coredump,
self.gdb_helper, self._line_matcher,
self.check_gdb_stub_and_run, finalize_line=True)
self.check_gdb_stub_and_run,
finalize_line=not self.coredump.in_progress)
else:
raise RuntimeError('Bad event data %r' % ((event_tag, data),))

Expand Down
15 changes: 2 additions & 13 deletions tools/idf_monitor_base/constants.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,5 @@
# Copyright 2015-2021 Espressif Systems (Shanghai) CO LTD
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
# SPDX-License-Identifier: Apache-2.0

import os
import re
Expand Down
4 changes: 4 additions & 0 deletions tools/idf_monitor_base/coredump.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ def __init__(self, decode_coredumps, event_queue, logger, websocket_client, elf_
self.websocket_client = websocket_client
self.elf_file = elf_file

@property
def in_progress(self) -> bool:
return bool(self._coredump_buffer)

def _process_coredump(self): # type: () -> None
if self._decode_coredumps != COREDUMP_DECODE_INFO:
raise NotImplementedError('process_coredump: %s not implemented' % self._decode_coredumps)
Expand Down

0 comments on commit 0bcb5d6

Please sign in to comment.