From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by sourceware.org (Postfix) with ESMTPS id B8A7B385B834 for ; Mon, 30 Mar 2020 14:30:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org B8A7B385B834 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tdevries@suse.de X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id D6498ADC1; Mon, 30 Mar 2020 14:30:21 +0000 (UTC) Subject: [PING][RFC][gdb/testsuite] Fix silent timeout in gdb.multi/multi-target.exp From: Tom de Vries To: gdb-patches@sourceware.org Cc: Pedro Alves References: <20200316170131.GA20089@delia> Autocrypt: addr=tdevries@suse.de; keydata= xsBNBF0ltCcBCADDhsUnMMdEXiHFfqJdXeRvgqSEUxLCy/pHek88ALuFnPTICTwkf4g7uSR7 HvOFUoUyu8oP5mNb4VZHy3Xy8KRZGaQuaOHNhZAT1xaVo6kxjswUi3vYgGJhFMiLuIHdApoc u5f7UbV+egYVxmkvVLSqsVD4pUgHeSoAcIlm3blZ1sDKviJCwaHxDQkVmSsGXImaAU+ViJ5l CwkvyiiIifWD2SoOuFexZyZ7RUddLosgsO0npVUYbl6dEMq2a5ijGF6/rBs1m3nAoIgpXk6P TCKlSWVW6OCneTaKM5C387972qREtiArTakRQIpvDJuiR2soGfdeJ6igGA1FZjU+IsM5ABEB AAHNH1RvbSBkZSBWcmllcyA8dGRldnJpZXNAc3VzZS5kZT7CwKsEEwEIAD4WIQSsnSe5hKbL MK1mGmjuhV2rbOJEoAUCXSW0JwIbAwUJA8JnAAULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAh CRDuhV2rbOJEoBYhBKydJ7mEpsswrWYaaO6FXats4kSgc48H/Ra2lq5p3dHsrlQLqM7N68Fo eRDf3PMevXyMlrCYDGLVncQwMw3O/AkousktXKQ42DPJh65zoXB22yUt8m0g12xkLax98KFJ 5NyUloa6HflLl+wQL/uZjIdNUQaHQLw3HKwRMVi4l0/Jh/TygYG1Dtm8I4o708JS4y8GQxoQ UL0z1OM9hyM3gI2WVTTyprsBHy2EjMOu/2Xpod95pF8f90zBLajy6qXEnxlcsqreMaqmkzKn 3KTZpWRxNAS/IH3FbGQ+3RpWkNGSJpwfEMVCeyK5a1n7yt1podd1ajY5mA1jcaUmGppqx827 8TqyteNe1B/pbiUt2L/WhnTgW1NC1QDOwE0EXSW0JwEIAM99H34Bu4MKM7HDJVt864MXbx7B 1M93wVlpJ7Uq+XDFD0A0hIal028j+h6jA6bhzWto4RUfDl/9mn1StngNVFovvwtfzbamp6+W pKHZm9X5YvlIwCx131kTxCNDcF+/adRW4n8CU3pZWYmNVqhMUiPLxElA6QhXTtVBh1RkjCZQ Kmbd1szvcOfaD8s+tJABJzNZsmO2hVuFwkDrRN8Jgrh92a+yHQPd9+RybW2l7sJv26nkUH5Z 5s84P6894ebgimcprJdAkjJTgprl1nhgvptU5M9Uv85Pferoh2groQEAtRPlCGrZ2/2qVNe9 XJfSYbiyedvApWcJs5DOByTaKkcAEQEAAcLAkwQYAQgAJhYhBKydJ7mEpsswrWYaaO6FXats 4kSgBQJdJbQnAhsMBQkDwmcAACEJEO6FXats4kSgFiEErJ0nuYSmyzCtZhpo7oVdq2ziRKD3 twf7BAQBZ8TqR812zKAD7biOnWIJ0McV72PFBxmLIHp24UVe0ZogtYMxSWKLg3csh0yLVwc7 H3vldzJ9AoK3Qxp0Q6K/rDOeUy3HMqewQGcqrsRRh0NXDIQk5CgSrZslPe47qIbe3O7ik/MC q31FNIAQJPmKXX25B115MMzkSKlv4udfx7KdyxHrTSkwWZArLQiEZj5KG4cCKhIoMygPTA3U yGaIvI/BGOtHZ7bEBVUCFDFfOWJ26IOCoPnSVUvKPEOH9dv+sNy7jyBsP5QxeTqwxC/1ZtNS DUCSFQjqA6bEGwM22dP8OUY6SC94x1G81A9/xbtm9LQxKm0EiDH8KBMLfQ== Message-ID: Date: Mon, 30 Mar 2020 16:30:21 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: <20200316170131.GA20089@delia> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-33.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Mar 2020 14:30:24 -0000 On 16-03-2020 18:01, Tom de Vries wrote: > Hi, > > While running test-case gdb.multi/multi-target.exp, I observed a silent > timeout related to "monitor exit". > > By making the timeout explicit in an expect clause in gdbserver_gdb_exit: > ... > + timeout { > + warning "Timed out waiting for EOF in server after $monitor_exit" > + } > ... > we get in the log: > ... > monitor exit^M > "monitor" command not supported by this target.^M > (gdb) WARNING: Timed out waiting for EOF in server after monitor exit > ... > > What happens is the following: > - the inferior 5 is selected > - a breakpoint is set in inferior 1 > - the breakpoint triggers and we switch to inferior 1 > - setup is called by test_continue, which calls clean_restarts, which calls > gdbserver_gdb_exit (due to load_lib gdbserver-support.exp) > - gdbserver_gdb_exit issues "monitor exit" > - gdb responds with "not supported by this target" because inferior 1 is > native > > Fix this by keeping a list of server_spawn_id, and cleaning those up before > calling gdbserver_gdb_exit. > > This reduces testing time from 1m22s to 32s. > > Any comments? > Ping. Thanks, - Tom > [gdb/testsuite] Fix silent timeout in gdb.multi/multi-target.exp > > gdb/testsuite/ChangeLog: > > 2020-03-16 Tom de Vries > > * lib/gdbserver-support.exp (gdbserver_exit): Factor out of ... > (gdbserver_gdb_exit): ... here. Add timeout warning. > * gdb.multi/multi-target.exp (server_spawn_ids): New global var. > (connect_target_extended_remote): Append new server_spawn_id to > server_spawn_ids. > (cleanup): New proc. > (setup, ): Call cleanup. > > --- > gdb/testsuite/gdb.multi/multi-target.exp | 29 +++++++++++++++++++++++ > gdb/testsuite/lib/gdbserver-support.exp | 40 +++++++++++++++++++++----------- > 2 files changed, 56 insertions(+), 13 deletions(-) > > diff --git a/gdb/testsuite/gdb.multi/multi-target.exp b/gdb/testsuite/gdb.multi/multi-target.exp > index 6c727b5e3b..2e66cb55fa 100644 > --- a/gdb/testsuite/gdb.multi/multi-target.exp > +++ b/gdb/testsuite/gdb.multi/multi-target.exp > @@ -33,8 +33,13 @@ if { [prepare_for_testing "failed to prepare" ${binfile} "${srcfile}" \ > return > } > > +# Keep list of server_spawn_id > +set server_spawn_ids [list] > + > proc connect_target_extended_remote {binfile} { > set res [gdbserver_start "--multi" ""] > + global server_spawn_ids server_spawn_id > + lappend server_spawn_ids $server_spawn_id > set gdbserver_gdbport [lindex $res 1] > return [gdb_target_cmd "extended-remote" $gdbserver_gdbport] > } > @@ -99,12 +104,34 @@ proc next_live_inferior {inf} { > return $inf > } > > +# Clean up the server_spawn_ids. > +proc cleanup_gdbservers { } { > + global server_spawn_id > + global server_spawn_ids > + set n 1 > + foreach id $server_spawn_ids { > + set server_spawn_id $id > + if { $n == 1 } { > + set inferior 2 > + } elseif { $n == 2 } { > + set inferior 5 > + } else { > + gdb_assert 0 "Unexpected amount of gdb servers" > + } > + gdb_test "inferior $inferior" > + gdbserver_exit 0 > + incr n > + } > + set server_spawn_ids [list] > +} > + > # Return true on success, false otherwise. > > proc setup {non-stop} { > global gcorefile gcore_created > global binfile > > + cleanup_gdbservers > clean_restart ${binfile} > > # multi-target depends on target running in non-stop mode. Force > @@ -448,3 +475,5 @@ with_test_prefix "info-inferiors" { > test_info_inferiors $multi_process > } > } > + > +cleanup_gdbservers > diff --git a/gdb/testsuite/lib/gdbserver-support.exp b/gdb/testsuite/lib/gdbserver-support.exp > index 706bbeb9df..a2cc80f28d 100644 > --- a/gdb/testsuite/lib/gdbserver-support.exp > +++ b/gdb/testsuite/lib/gdbserver-support.exp > @@ -431,21 +431,11 @@ if { [info procs gdbserver_orig_gdb_exit] == "" } { > rename mi_gdb_exit gdbserver_orig_mi_gdb_exit > } > > -proc gdbserver_gdb_exit { is_mi } { > +# Cleanup gdbserver $server_spawn_id > + > +proc gdbserver_exit { is_mi } { > global gdb_spawn_id server_spawn_id > global gdb_prompt > - global gdbserver_reconnect_p > - > - # Leave GDBserver running if we're exiting GDB in order to > - # reconnect to the same instance of GDBserver again. > - if {[info exists gdbserver_reconnect_p] && $gdbserver_reconnect_p} { > - if { $is_mi } { > - gdbserver_orig_mi_gdb_exit > - } else { > - gdbserver_orig_gdb_exit > - } > - return > - } > > if {[info exists gdb_spawn_id] && [info exists server_spawn_id]} { > # GDB may be terminated in an expected way or an unexpected way, > @@ -469,10 +459,34 @@ proc gdbserver_gdb_exit { is_mi } { > wait -i $expect_out(spawn_id) > unset server_spawn_id > } > + timeout { > + warning "Timed out waiting for EOF in server after $monitor_exit" > + } > } > } > } > close_gdbserver > +} > + > +# Local version of gdb_exit that also cleans up gdbserver $server_spawn_id. > + > +proc gdbserver_gdb_exit { is_mi } { > + global gdb_spawn_id server_spawn_id > + global gdb_prompt > + global gdbserver_reconnect_p > + > + # Leave GDBserver running if we're exiting GDB in order to > + # reconnect to the same instance of GDBserver again. > + if {[info exists gdbserver_reconnect_p] && $gdbserver_reconnect_p} { > + if { $is_mi } { > + gdbserver_orig_mi_gdb_exit > + } else { > + gdbserver_orig_gdb_exit > + } > + return > + } > + > + gdbserver_exit $is_mi > > if { $is_mi } { > gdbserver_orig_mi_gdb_exit >