mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-21 04:42:53 +08:00
5be5dbf0ce
This commit fixes a "-gdb-set logging redirect on" crash by not handling "logging redirect on" on the fly. Previous discussion here: https://sourceware.org/ml/gdb-patches/2017-01/msg00467.html Code for handling "logging redirect on" on the fly was added here: https://sourceware.org/ml/gdb-patches/2010-08/msg00202.html Meanwhile, MI gained support for logging, but flipping redirect "on" on the fly was not considered. The result is that this sequence of commands crashes GDB: -gdb-set logging on -gdb-set logging redirect on Program received signal SIGSEGV, Segmentation fault. 0x00000000008dd7bc in gdb_flush (file=0x2a097f0) at /home/pedro/gdb/mygit/cxx-convertion/src/gdb/ui-file.c:95 194 file->to_flush (file); (top-gdb) bt #0 0x00000000008dd7bc in gdb_flush(ui_file*) (file=0x2a097f0) at /home/pedro/gdb/mygit/cxx-convertion/src/gdb/ui-file.c:95 #1 0x00000000007b5f34 in gdb_wait_for_event(int) (block=0) at /home/pedro/gdb/mygit/cxx-convertion/src/gdb/event-loop.c:752 #2 0x00000000007b52b6 in gdb_do_one_event() () at /home/pedro/gdb/mygit/cxx-convertion/src/gdb/event-loop.c:322 #3 0x00000000007b5362 in start_event_loop() () at /home/pedro/gdb/mygit/cxx-convertion/src/gdb/event-loop.c:371 #4 0x000000000082704a in captured_command_loop(void*) (data=0x0) at /home/pedro/gdb/mygit/cxx-convertion/src/gdb/main.c:325 #5 0x00000000007b8d7c in catch_errors(int (*)(void*), void*, char*, return_mask) (func=0x827008 <captured_command_loop(void*)>, func_args=0x0, errstring=0x11dee51 "", mask=RETURN_MASK_ALL) at /home/pedro/gdb/mygit/cxx-convertion/src/gdb/exceptions.c:236 #6 0x000000000082839b in captured_main(void*) (data=0x7fffffffd820) at /home/pedro/gdb/mygit/cxx-convertion/src/gdb/main.c:1148 During symbol reading, cannot get low and high bounds for subprogram DIE at 24065. #7 0x00000000008283c4 in gdb_main(captured_main_args*) (args=0x7fffffffd820) at /home/pedro/gdb/mygit/cxx-convertion/src/gdb/main.c:1158 #8 0x0000000000412d4d in main(int, char**) (argc=4, argv=0x7fffffffd928) at /home/pedro/gdb/mygit/cxx-convertion/src/gdb/gdb.c:32 The handling of redirect on the fly is not really a use case we need to handle, IMO. Its inconsistent (other "set logging foo" commands aren't handled on the fly), and complicates the code significantly. Instead of complicating it further for MI, go back to the original idea of warning, only: https://sourceware.org/ml/gdb-patches/2010-08/msg00083.html New test included. gdb/ChangeLog: 2017-02-02 Pedro Alves <palves@redhat.com> * cli/cli-logging.c (maybe_warn_already_logging): New factored out from ... (set_logging_overwrite): ... here. (logging_no_redirect_file): Delete. (set_logging_redirect): Don't handle redirection on the fly. Instead warn that "logging off" / "logging on" is necessary. (pop_output_files): Delete references to logging_no_redirect_file. (show_logging_command): Always speak in terms of what will happen once logging is reenabled. gdb/testsuite/ChangeLog: 2017-02-02 Pedro Alves <palves@redhat.com> * gdb.mi/mi-logging.exp: Add "redirect while already logging" tests.
102 lines
3.2 KiB
Plaintext
102 lines
3.2 KiB
Plaintext
# Copyright 2012-2017 Free Software Foundation, Inc.
|
|
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
load_lib mi-support.exp
|
|
set MIFLAGS "-i=mi"
|
|
|
|
gdb_exit
|
|
if [mi_gdb_start] {
|
|
continue
|
|
}
|
|
|
|
standard_testfile basics.c
|
|
set opts {debug}
|
|
|
|
if [build_executable $testfile.exp $testfile $srcfile $opts] {
|
|
untested "failed to compile"
|
|
return -1
|
|
}
|
|
|
|
if {[mi_run_to_main] < 0} {
|
|
return -1
|
|
}
|
|
|
|
set milogfile [standard_output_file "milog.txt"]
|
|
|
|
mi_gdb_test "-gdb-set logging file $milogfile" ".*"
|
|
|
|
mi_gdb_test "-gdb-set logging overwrite on" ".*"
|
|
|
|
mi_gdb_test "-gdb-set logging on" ".*" "logging on"
|
|
|
|
mi_step "logged step"
|
|
|
|
mi_next "logged next"
|
|
|
|
mi_gdb_test "-gdb-set logging off" ".*" "logging off"
|
|
|
|
set chan [open $milogfile]
|
|
set logcontent [read $chan]
|
|
close $chan
|
|
|
|
set mi_log_prompt "\[(\]gdb\[)\] \[\r\n\]+"
|
|
|
|
if [regexp "\\^done\[\r\n\]+$mi_log_prompt\\^running\[\r\n\]+\\*running,thread-id=\"all\"\[\r\n\]+$mi_log_prompt\\*stopped,reason=\"end-stepping-range\",.*\[\r\n\]+$mi_log_prompt\\^running\[\r\n\]+\\*running,thread-id=\"all\"\[\r\n\]+$mi_log_prompt\\*stopped,reason=\"end-stepping-range\",.*\[\r\n\]+$mi_log_prompt" $logcontent] {
|
|
pass "log file contents"
|
|
} else {
|
|
fail "log file contents"
|
|
}
|
|
|
|
# Now try the redirect, which writes into the file only.
|
|
|
|
mi_gdb_test "-gdb-set logging redirect on" ".*" "redirect logging on"
|
|
|
|
# Since all output will be going into the file, just keep sending commands
|
|
# and don't expect anything to appear until logging is turned off.
|
|
|
|
send_gdb "1001-gdb-set logging on\n"
|
|
send_gdb "1002-exec-step\n"
|
|
send_gdb "1003-exec-next\n"
|
|
|
|
mi_gdb_test "1004-gdb-set logging off" ".*" "redirect logging off"
|
|
|
|
set chan [open $milogfile]
|
|
set logcontent [read $chan]
|
|
close $chan
|
|
|
|
if [regexp "1001\\^done\[\r\n\]+$mi_log_prompt.*1002\\^running\[\r\n\]+\\*running,thread-id=\"all\"\[\r\n\]+$mi_log_prompt\\*stopped,reason=\"end-stepping-range\",.*\[\r\n\]+$mi_log_prompt.*1003\\^running\[\r\n\]+\\*running,thread-id=\"all\"\[\r\n\]+$mi_log_prompt\\*stopped,reason=\"end-stepping-range\",.*\[\r\n\]+$mi_log_prompt" $logcontent] {
|
|
pass "redirect log file contents"
|
|
} else {
|
|
fail "redirect log file contents"
|
|
}
|
|
|
|
# Now try enabling a redirect while GDB is already logging. This used
|
|
# to crash GDB.
|
|
with_test_prefix "redirect while already logging" {
|
|
mi_gdb_test "-gdb-set logging redirect off" ".*" \
|
|
"logging redirect off"
|
|
mi_gdb_test "-gdb-set logging on" ".*" \
|
|
"logging on"
|
|
mi_gdb_test "-gdb-set logging redirect on" \
|
|
".*warning: Currently logging .*Turn the logging off and on to make the new setting effective.*" \
|
|
"logging redirect on"
|
|
mi_gdb_test "-gdb-set logging off" ".*" \
|
|
"logging off"
|
|
}
|
|
|
|
mi_gdb_exit
|
|
|
|
remote_file host delete $milogfile
|