darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

PR gdb/544

Browse source 
Suggested by Jan Kratochvil:
	* top.c (gdb_rl_operate_and_get_next_completion): Call
	rl_redisplay_function.
	(gdb_rl_redisplay): New.
	(init_main): Set rl_redisplay_function.

	* gdb.cp/annota2.exp, gdb.cp/annota3.exp: Remove KFAIL for
	fixed PR gdb/544.
This commit is contained in:
Daniel Jacobowitz 2008-03-21 21:44:30 +00:00
parent ed1bd5f57f
commit b562a0cb2a
5 changed files with 39 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gdb/ChangeLog
View file

@ -1,3 +1,12 @@
2008-03-21 Daniel Jacobowitz <dan@codesourcery.com>
PR gdb/544
Suggested by Jan Kratochvil:
* top.c (gdb_rl_operate_and_get_next_completion): Call
rl_redisplay_function.
(gdb_rl_redisplay): New.
(init_main): Set rl_redisplay_function.
2008-03-21 Thomas Mittelstaedt <T.Mittelstaedt@cadenas.de> (tiny change)
* aix-thread.c (pdc_read_regs): Fix compiler warning.

5
gdb/testsuite/ChangeLog
View file

@ -1,3 +1,8 @@
2008-03-21 Daniel Jacobowitz <dan@codesourcery.com>
* gdb.cp/annota2.exp, gdb.cp/annota3.exp: Remove KFAIL for
fixed PR gdb/544.
2008-03-21 Pedro Alves <pedro@codesourcery.com>
* gdb.threads/fork-child-threads.exp: Test next over fork.

3
gdb/testsuite/gdb.cp/annota2.exp
View file

@ -205,13 +205,10 @@ gdb_expect {
# test:
# annotate-quit
#
# This test sometimes fails, but not reproducibly. See gdb/544.
#
send_gdb "\003"
gdb_expect {
-re "\r\n\032\032error-begin\r\nQuit\r\n\r\n\032\032quit\r\n$gdb_prompt$" \
{ pass "annotate-quit" }
-re "$gdb_prompt$" { kfail "gdb/544" "annotate-quit" }
-re ".*$gdb_prompt$" { fail "annotate-quit" }
timeout { fail "annotate-quit (timeout)" }
}

2
gdb/testsuite/gdb.cp/annota3.exp
View file

@ -208,8 +208,6 @@ gdb_expect {
# test:
# annotate-quit
#
# This test sometimes fails, but not reproducibly. See gdb/544.
#
send_gdb "\003"
gdb_expect_list "annotate-quit" "$gdb_prompt$" {
"\r\n\032\032error-begin\r\n"

26
gdb/top.c
View file

@ -921,7 +921,7 @@ gdb_rl_operate_and_get_next_completion (void)
operate_saved_history = -1;
/* readline doesn't automatically update the display for us. */
rl_redisplay ();
rl_redisplay_function ();
after_char_processing_hook = NULL;
rl_pre_input_hook = NULL;
@ -956,6 +956,29 @@ gdb_rl_operate_and_get_next (int count, int key)
return rl_newline (1, key);
}
/* Readline 5.2 and earlier do not block SIGINT while redrawing the prompt.
This can lead to corrupted internal state. As long as we do not require
a newer readline version, compensate for it. */
static void
gdb_rl_redisplay (void)
{
#if HAVE_SIGPROCMASK
sigset_t sigint_set, sigint_oset;
sigemptyset (&sigint_set);
sigemptyset (&sigint_oset);
sigaddset (&sigint_set, SIGINT);
sigprocmask (SIG_BLOCK, &sigint_set, &sigint_oset);
#endif
rl_redisplay ();
#if HAVE_SIGPROCMASK
sigprocmask (SIG_SETMASK, &sigint_oset, (sigset_t *)NULL);
#endif
}
/* Read one line from the command input stream `instream'
into the local static buffer `linebuffer' (whose current length
@ -1581,6 +1604,7 @@ init_main (void)
rl_completer_quote_characters = get_gdb_completer_quote_characters ();
rl_readline_name = "gdb";
rl_terminal_name = getenv ("TERM");
rl_redisplay_function = gdb_rl_redisplay;
/* The name for this defun comes from Bash, where it originated.
15 is Control-o, the same binding this function has in Bash. */