From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14518 invoked by alias); 21 Mar 2008 21:45:13 -0000 Received: (qmail 14504 invoked by uid 22791); 21 Mar 2008 21:45:11 -0000 X-Spam-Check-By: sourceware.org Received: from NaN.false.org (HELO nan.false.org) (208.75.86.248) by sourceware.org (qpsmtpd/0.31) with ESMTP; Fri, 21 Mar 2008 21:44:51 +0000 Received: from nan.false.org (localhost [127.0.0.1]) by nan.false.org (Postfix) with ESMTP id B98EB98298; Fri, 21 Mar 2008 21:44:49 +0000 (GMT) Received: from caradoc.them.org (22.svnf5.xdsl.nauticom.net [209.195.183.55]) by nan.false.org (Postfix) with ESMTP id 905A098278; Fri, 21 Mar 2008 21:44:49 +0000 (GMT) Received: from drow by caradoc.them.org with local (Exim 4.69) (envelope-from ) id 1Jcp2e-0007md-Ht; Fri, 21 Mar 2008 17:44:48 -0400 Date: Fri, 21 Mar 2008 21:45:00 -0000 From: Daniel Jacobowitz To: gdb-patches@sourceware.org Cc: Jan Kratochvil , Chet Ramey Subject: Re: [patch] Fix testsuite annotate-quit race (PR 544) Message-ID: <20080321214448.GB29593@caradoc.them.org> Mail-Followup-To: gdb-patches@sourceware.org, Jan Kratochvil , Chet Ramey References: <20080318225436.GA27374@host0.dyn.jankratochvil.net> <20080318231738.GA22432@caradoc.them.org> <20080319081056.GA32510@host0.dyn.jankratochvil.net> <20080321204506.GA5033@host0.dyn.jankratochvil.net> <20080321210323.GA30247@caradoc.them.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20080321210323.GA30247@caradoc.them.org> User-Agent: Mutt/1.5.17 (2007-12-11) X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2008-03/txt/msg00322.txt.bz2 On Fri, Mar 21, 2008 at 05:03:24PM -0400, Daniel Jacobowitz wrote: > We have a --with-system-readline option, which many distributors use > instead of the internal readline. So I would rather fix it in GDB. > I did it just the way you suggested. > > I'm running some stress tests with this patch. So far it hasn't > failed once. Checked in as so. -- Daniel Jacobowitz CodeSourcery 2008-03-21 Daniel Jacobowitz 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 Daniel Jacobowitz * gdb.cp/annota2.exp, gdb.cp/annota3.exp: Remove KFAIL for fixed PR gdb/544. Index: top.c =================================================================== RCS file: /cvs/src/src/gdb/top.c,v retrieving revision 1.135 diff -u -p -r1.135 top.c --- top.c 21 Mar 2008 14:39:22 -0000 1.135 +++ top.c 21 Mar 2008 21:01:37 -0000 @@ -921,7 +921,7 @@ gdb_rl_operate_and_get_next_completion ( 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, 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. */ Index: testsuite/gdb.cp/annota2.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.cp/annota2.exp,v retrieving revision 1.10 diff -u -p -r1.10 annota2.exp --- testsuite/gdb.cp/annota2.exp 28 Feb 2008 16:24:25 -0000 1.10 +++ testsuite/gdb.cp/annota2.exp 21 Mar 2008 21:43:11 -0000 @@ -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)" } } Index: testsuite/gdb.cp/annota3.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.cp/annota3.exp,v retrieving revision 1.11 diff -u -p -r1.11 annota3.exp --- testsuite/gdb.cp/annota3.exp 1 Jan 2008 22:53:19 -0000 1.11 +++ testsuite/gdb.cp/annota3.exp 21 Mar 2008 21:43:11 -0000 @@ -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"