From patchwork Thu Oct 19 13:19:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 23683 Received: (qmail 42573 invoked by alias); 19 Oct 2017 13:19:42 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 42515 invoked by uid 89); 19 Oct 2017 13:19:41 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=disconnected, sk:connect X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 19 Oct 2017 13:19:39 +0000 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 669BF99DA6; Thu, 19 Oct 2017 13:19:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 669BF99DA6 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=palves@redhat.com Received: from cascais.lan (ovpn04.gateway.prod.ext.ams2.redhat.com [10.39.146.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id 90E13A0BF0; Thu, 19 Oct 2017 13:19:37 +0000 (UTC) From: Pedro Alves To: gdb-patches@sourceware.org Cc: Dmitry Antipov Subject: [PATCH] GDBserver: Fix ignored Ctrl-C after reconnection Date: Thu, 19 Oct 2017 14:19:36 +0100 Message-Id: <1508419176-31873-1-git-send-email-palves@redhat.com> This fixes the issue reported by Dmitry Antipov here: https://sourceware.org/ml/gdb/2017-10/msg00048.html The problem is that GDBserver stops listening to Ctrl-C/interrupt requests if you disconnect and reconnect back. Dmitry wrote: ~~~ Currently gdbserver installs SIGIO handler just once, in initialize_async_io() called from captured_main(), and this handler is removed when remote_desc is closed in remote_close(). Next, when a new instance of remote_desc is fetched from accept() and has '\003' arrived, input_interrupt() is never called because it is not registered as SIGIO handler. ~~~ The fix here is not remove the SIGIO handler in the first place, thus going back to the original before-first-connection state. (I haven't gone back to try it, but I think this was a regression caused by commit 8b2073398477 ("[GDBserver] Block and unblock SIGIO"), which was what made remote_close remove the signal handler.) New test included. gdb/gdbserver/ChangeLog: yyyy-mm-dd Pedro Alves * remote-utils.c (remote_close): Block SIGIO signals instead of uninstalling the SIGIO handler. gdb/testsuite/ChangeLog: yyyy-mm-dd Pedro Alves * gdb.server/reconnect-ctrl-c.c: New file. * gdb.server/reconnect-ctrl-c.exp: New file. --- gdb/gdbserver/remote-utils.c | 5 +- gdb/testsuite/gdb.server/reconnect-ctrl-c.c | 28 +++++++++++ gdb/testsuite/gdb.server/reconnect-ctrl-c.exp | 72 +++++++++++++++++++++++++++ 3 files changed, 101 insertions(+), 4 deletions(-) create mode 100644 gdb/testsuite/gdb.server/reconnect-ctrl-c.c create mode 100644 gdb/testsuite/gdb.server/reconnect-ctrl-c.exp diff --git a/gdb/gdbserver/remote-utils.c b/gdb/gdbserver/remote-utils.c index 66e0652..14697dc 100644 --- a/gdb/gdbserver/remote-utils.c +++ b/gdb/gdbserver/remote-utils.c @@ -403,10 +403,7 @@ remote_close (void) { delete_file_handler (remote_desc); -#ifndef USE_WIN32API - /* Remove SIGIO handler. */ - signal (SIGIO, SIG_IGN); -#endif + disable_async_io (); #ifdef USE_WIN32API closesocket (remote_desc); diff --git a/gdb/testsuite/gdb.server/reconnect-ctrl-c.c b/gdb/testsuite/gdb.server/reconnect-ctrl-c.c new file mode 100644 index 0000000..e722a6d --- /dev/null +++ b/gdb/testsuite/gdb.server/reconnect-ctrl-c.c @@ -0,0 +1,28 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 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 . */ + +#include + +int +main () +{ + int secs = 30; + + while (secs--) + sleep (1); + return 0; +} diff --git a/gdb/testsuite/gdb.server/reconnect-ctrl-c.exp b/gdb/testsuite/gdb.server/reconnect-ctrl-c.exp new file mode 100644 index 0000000..4571111 --- /dev/null +++ b/gdb/testsuite/gdb.server/reconnect-ctrl-c.exp @@ -0,0 +1,72 @@ +# This testcase is part of GDB, the GNU debugger. +# +# Copyright 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 . + +# Test that Ctrl-C works after reconnecting. + +load_lib gdbserver-support.exp + +if { [skip_gdbserver_tests] } { + verbose "skipping gdbserver tests" + return -1 +} + +standard_testfile +if [prepare_for_testing "failed to prepare" $testfile $srcfile] { + return -1 +} + +# Make sure we're disconnected, in case we're testing with an +# extended-remote board, therefore already connected. +with_test_prefix "preparation" { + gdb_test "disconnect" ".*" +} + +# Connect, continue, send Ctrl-C and expect a SIGINT stop. + +proc connect_continue_ctrl_c {} { + global gdbserver_protocol gdbserver_gdbport + + set res [gdb_target_cmd $gdbserver_protocol $gdbserver_gdbport] + if ![gdb_assert {$res == 0} "connect"] { + return + } + + set test "continue for ctrl-c" + gdb_test_multiple "continue" $test { + -re "Continuing" { + pass $test + } + } + + after 1000 {send_gdb "\003"} + gdb_test "" "Program received signal SIGINT.*" "stop with control-c" +} + +with_test_prefix "first" { + # Start GDBserver. + set gdbserver_reconnect_p 1 + set res [gdbserver_start "" $binfile] + set gdbserver_protocol [lindex $res 0] + set gdbserver_gdbport [lindex $res 1] + + connect_continue_ctrl_c +} + +with_test_prefix "second" { + gdb_test "disconnect" "Ending remote debugging." + connect_continue_ctrl_c +}