From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2057.outbound.protection.outlook.com [40.107.92.57]) by sourceware.org (Postfix) with ESMTPS id C75C13858D3C for ; Mon, 28 Nov 2022 10:46:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C75C13858D3C Authentication-Results: sourceware.org; dmarc=fail (p=quarantine dis=none) header.from=amd.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=amd.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EyxzdRRqAQWiO4Z5zP2jsTI2zB40EyoLJMNsw/uuEKgk5tv6qLVgocic8fNr5JD4d1Aqr2DRqdS6rfd74OvhHsijXT7pCe1LBD/C6f1AeYPnPK4JFg2m4zV0RiIvdTBdp+7+JF85SJAdIAf7dBjLTnZB+S0oGoVhcpSHZtikrTHqJns11Iu6SGy+gWf5S59UrlIeICi6cCY0lJsDx3Od1YDUzvz/r3LSSk5VA4g8XbjB1E0oX+rK5p9vQ3Bh6+P4siVAw/8PO6po/se346+lwJmCgAe6l2vt1BgCvPHJ0yTYRuZgBKe9vHwWDCqFSeBZcYO6KGswlzRJCCGX7T7KoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=/RVb9jtCZiSdsq9u+3IAfr7adj1/CcDFirYNmiGelDM=; b=bxp1zTlO+MH8bx0sVtB6rkFSgzNr6hvXirKaEm1tdxBesaYWEg+WkNK/030NjgurlAqhXVzgWPH2CphCai4Oprin2KDgTsonQyYotWZZYe5f0at5AE5HuZj8isf/m6C9zakgxEL/50NN2SVkkDFL+VDQxy3NmTtrxUh8sa34eXojC4MTwqTaenas2A51dKBIbXLxp7pMu0Z5D+fXvgembk1tPtyL6CCRa2v1F65yhOz3OYC23VL9+sN4H8+DfF/Bu6VOJOhw09D2bMyWoMNOmPzeYrnGFjqN6eL1UGNZCkpZJLVQRE8jouvrxnpcMBl0N5uj7g50IykOPr5UyRzBxA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/RVb9jtCZiSdsq9u+3IAfr7adj1/CcDFirYNmiGelDM=; b=xC0IgonDCgiMYB4Fr4ghSRS7CH45srD1rQynJU2quGnrTSX3oAwdPtKa/iF4l+wEdJPNAbJ83kNTJ8TU8lRJpzc58+CW2LPn72Yven9kj6YH1shfU28YU+1c7/sZTR/QxUpY1sWiWJTQ0gZ8aBwxu0iDzTCg93creqgVqBVZcbA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=amd.com; Received: from DM4PR12MB5745.namprd12.prod.outlook.com (2603:10b6:8:5c::7) by BN9PR12MB5097.namprd12.prod.outlook.com (2603:10b6:408:136::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5857.23; Mon, 28 Nov 2022 10:46:27 +0000 Received: from DM4PR12MB5745.namprd12.prod.outlook.com ([fe80::5fc0:b696:455b:8330]) by DM4PR12MB5745.namprd12.prod.outlook.com ([fe80::5fc0:b696:455b:8330%7]) with mapi id 15.20.5857.021; Mon, 28 Nov 2022 10:46:27 +0000 Message-ID: Date: Mon, 28 Nov 2022 10:46:22 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Subject: [PING] [PATCH v3] gdb/gcore: interrupt all threads before generating the corefile To: gdb-patches@sourceware.org Cc: lsix@lancelotsix.com References: <20221116123649.2430701-1-lancelot.six@amd.com> Content-Language: en-US From: Lancelot SIX In-Reply-To: <20221116123649.2430701-1-lancelot.six@amd.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FRYP281CA0009.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10::19) To DM4PR12MB5745.namprd12.prod.outlook.com (2603:10b6:8:5c::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM4PR12MB5745:EE_|BN9PR12MB5097:EE_ X-MS-Office365-Filtering-Correlation-Id: 46595a08-5319-4958-925a-08dad12dccff X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XXNDEsdzhoAzM6ZlhqRVAgeU6DCO9IuX/Lhw+yfO/lgmGd1znCZbAncqOaSI/jbriz6RmC6+qm+g13dQuCcdrlDCKZ/68roLxvdOkj+DdMdjnafQudnJv3LBx4wyvp366J+yVFlC1obDQY89x5nGVuHcVic/M5vnpWzzgwD53loOE6PS15AjSK/E72PyfWGg+r1MJzxmR9q6fh8lbC93n0lgUM/F+/FY/F2ohE1SoFf1jE4If5eGJchDpLJaauMr3GkJ5wgcNPxNvtroF9PSBdzeHPkWOUw/EPo2+544U6rix0SO3l/IU17H9GqMnC0SVjMYIfbCfzq8Bo1xbR+WDJPyFqba3HWnP7xKZ8o4jXJojSf57aWWb1tlrXT/DVJVaavcR98vX1hVeB32kgynGKGLUnyw6VB4DZAW77z8sdg7a2Mrqn4A+LWpn7IuuGxt1HhfwmHbbn4Uy6pC9OktvaxisAr2t0V9IpxLe4sMZVF6mbMz5CpoHlEWmnjW1I48BXBglASHWdjCYWAlu0cR73MuYa2q2bDS3QiuCCuPY3ZO7+omk5gYb1YRCGSidgQWjPge+fBYpRt40YqO+CnWQz/HxQhO8E8qhVxozWPNWWq/bjQWXzoeqsr6jW1cmznfbWg+nBlBGxHMu5IkFdUNiNx9gcuH7Qr854dSpRjf/BziXgP3gC1nPlJoUFyk4YxbAiDz02MhW/mGT1XeQuCYadIO41H0Q0li0noaskZ+W2bVIokDaZM5BklstUOsQ4dqgMsln9EaCr/k9wjGIxLLtCeNDEYjYS/8r7uEhr3lx/LK1RnU9V7phQ1D9Fquc4Bv X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM4PR12MB5745.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(346002)(39860400002)(376002)(136003)(366004)(396003)(451199015)(186003)(8936002)(5660300002)(316002)(2616005)(30864003)(6916009)(6512007)(4326008)(66476007)(41300700001)(66946007)(8676002)(66556008)(31696002)(36756003)(38100700002)(83380400001)(86362001)(2906002)(966005)(6486002)(478600001)(31686004)(6506007)(6666004)(66899015)(53546011)(2004002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?M2dPWkRGLzByWmE0Q0ZZdVBId0R6UDJKTnJsNDdDVlUvMUtaWmFHT1FjaDJH?= =?utf-8?B?TERLS3hXOGg4T3Uvak93VytSQkY3dlV2cytST0tuZWltdndwaXBjSm03RFdy?= =?utf-8?B?VVNlMmNnMG5BdHMwSUJFbys2SnU2YmNqMWNkTHBLQWRtL3ViYmhxV3ZhcHA0?= =?utf-8?B?eDE0Z1FGNzM2OTJxODg1WHpBVkJaZnVZbGo5bEwyaWFoWXpKN0Q5OHUrdHZi?= =?utf-8?B?bDlLR3E4Nys2WDZMVGxsTS9YNXhTcm83aWpJNnJtWFNBZHFEVml4SXZQWTFE?= =?utf-8?B?Z0JIOUlMZnM4eGExdzIzWlp1NFBZYzhPaC96bmxsbC9NN3JYWXB3a3pkL0d3?= =?utf-8?B?eWpVTTRRVjJFWThiK3c4TnlzWEcvM05hWW5lMThpT3RDUlduSWl5S0Z6T2Js?= =?utf-8?B?SDdDRkFaMklIeS9HbG5mN0x6Y2VJRmdyQ1VNa1ppQUllak9uNnlqS2VaMVNS?= =?utf-8?B?S2QvNUN4aGFyV2loQWFqTFdCL3VBa21CM1c0TU5zdUNaUXN3MmkveGFPK2E0?= =?utf-8?B?V0ZET3pzMWMwNmEzUmQvcUhHODFNZGZWQXhodDErMmhZdFphQXRJWFhJZUR1?= =?utf-8?B?ZDEybGgzNnRPa1czZHY3MFIvL3hjaVZNZGt2TGNRbmtQV0RZaUhlZTNKTUtH?= =?utf-8?B?dy9TTkZCK09Cc3VmUWFHeCtmUUlzVDhEa1o1R1dwUzNhckR4MDlyaFBhMTU3?= =?utf-8?B?aHpzMDNSWisyaUR3OS91OTd0Um1oaXV4MmllOHhGZ3VaaFhFRVVycW9wUEVG?= =?utf-8?B?R1Q0YVlmWkZHalgrNFR0Q2RtcXhPOXJUbGhtMEZZeGtDclJuVlZVSFRiYk50?= =?utf-8?B?ODRlWU5kQzkrdjVrcWh3NWN1VC9DWmplZUVhenVLZE5mUTREeE9yTGVuelcv?= =?utf-8?B?QlhDMjIrUVJKZzg4a2JQVzczbGNaNWdyQjFiQVlxNHQrbk1BQUd5UG9iTnpw?= =?utf-8?B?NFBpMXlETWFwY09tejFBb2lVK1BDK3RTT1E1YmtxMGo1N0JHVm1UMXl0Q2gw?= =?utf-8?B?WFQ1dEZkQmFkS2hjVEVEOEJKM2U4SjJCTzhiOEVXbndwMXpEbzQxbkJtSXZW?= =?utf-8?B?cmtnNGdrNGg5cjdZK1hqUVo1Q0QyVWdxa1orUzlqWmhtNFRQOHJ2elRiVmpi?= =?utf-8?B?S1RQYi9mSjEwWklTLytxR1AwSXU5KzBWblFpb1o3YkZkbDdOeFVPMkVJRWFx?= =?utf-8?B?djlWbmpidXJvUktHaWVBV2JCRFhWd3d3bTZkMDc4TkRyWnhTS1grb281cVQ5?= =?utf-8?B?anljWXhWanJYVlNxODRzSEZkWENqNXhBZHFyaDJuVWpFSFlmSDFKYS9QUUtJ?= =?utf-8?B?QzFjY3E1c1duWjZmVUFhQlZnZGVCVkoveWJUekVGeVVFb3pqOXdGVFlTTHpR?= =?utf-8?B?NnFQNmlCNElpQWRIWEdvR25kcDVCRlROSDN0ekVZWTMyVDlDcmFicURzVDBq?= =?utf-8?B?YiszSVRGZXo4Q3d6MVBTRmg2c0p2S3lnTU9iMVB3R1ljNDJ3Mk1leUVmUDhw?= =?utf-8?B?Z3loTi9mb2M4UHpzeWEwOU9WbjRTTEdha0lxVXJxdFkwMlI2ZjBrVTZISkdI?= =?utf-8?B?VGRBRzIxUTU3MDZ1b2t4aDVreDRtNkNJb2tUUVMwUk1aWXhKdGpiY1Q0L2Rk?= =?utf-8?B?U3NXb0tlUkhQSXB2OW9KeitvQU9sa1FVcmJXVGtCZFpJMmIvRDJxU1lhK2NH?= =?utf-8?B?bGVDVXNzbEo0Q0JTMHZEQWFZSzl0UDdaSklnLzFoTkhsenZNQnI5SytKUTV4?= =?utf-8?B?akpFTUowZkE1NkFPYkwyazZHQlg4cjc3MFQ0WWhVaVA4SUwrdEcxclhlb3BM?= =?utf-8?B?ZFpOR3NIL2hkeUZ4T0diaytQVDdPSlFLUWhjUnFCUlRUS1dXaVhxY3cydTdw?= =?utf-8?B?MVFTWkJBeEdJemhnTlM0TDlkMTJKYlU4UklGY1VQY2JhcUMvcDhJa2NKa3dL?= =?utf-8?B?Y2ppd29KbU5RSmNWZHJVZjJBS1M2MFZQMjNlN21uU1lQY3pOelJ1ZjFPbXJ4?= =?utf-8?B?cDVSOU9NaDNtSFJLSUYyQ25hNXNxSlJDYnlSc2d0Z3FpUjJSSzdKV2lzYkVz?= =?utf-8?B?WGdYZkYrbThqQ09lQ3YySU83dUNFdllIU2haRjBiVGFtZHRUSDlWalIwdUhB?= =?utf-8?B?TTNkaWd3d3Zoa3NjWncwcXV5QmNtNGorcytzbmxudHdCTDhwbGpXSHlUS2xM?= =?utf-8?Q?KY/8SQDXHp4AC1WO5jtY4RM=3D?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 46595a08-5319-4958-925a-08dad12dccff X-MS-Exchange-CrossTenant-AuthSource: DM4PR12MB5745.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2022 10:46:27.0942 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: MjSvdRt04gWKGuEFRF6Hw6EZg48fcPeT5bPbXzA8BHRvPC81WDWmDAP9qjerX26Xcbv++Lmdh5g+yEWQST5+kw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5097 X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Kindly pinging. Best, Lancelot. On 16/11/2022 12:36, Lancelot SIX wrote: > Hi, > > This is a V3 following > https://sourceware.org/pipermail/gdb-patches/2022-October/192746.html. > > Noticeable changes since V2: > - The test have been updated following Pedro's comment to be compatible > with --target_board=native-extended-gdbserver. > - Running the entire testsuite against gdbserver revealed that the > original implementation was incompatible with all-stop targets. The > V3 improves the implementation to support both all-stop and non-stop > targets. > > This patch have been regression tested against gdb and gdbserver > (native-extended-gdbserver). > > All feedbacks are welcome. > > Best, > Lancelot > > --- > > In non-stop mode, if the user tries to generate a core dump (using the > gcore command) while some threads are running, a non-helpful error > message is shown. > > Lets consider the following session as an example (debugging the test > program included in this patch): > > (gdb) set non-stop on > (gdb) b 37 > (gdb) r > Thread 1 "gcore-nonstop" hit Breakpoint 1, main () at gcore-nonstop.c:39 > (gdb) info thread > Id Target Id Frame > * 1 Thread 0x7ffff7d7a740 (LWP 431838) "gcore-nonstop" main () at gcore-nonstop.c:39 > 2 Thread 0x7ffff7d79640 (LWP 431841) "gcore-nonstop" (running) > (gdb) gcore > Couldn't get registers: No such process. > > The reported error ("No such process") does not help the user understand > what happens. This is due to the fact that we cannot access the > registers of a running thread. Even if we ignore this error, generating > a core dump while any thread might update memory would most likely > result in a core file with an inconsistent view of the process' memory. > > To solve this, this patch proposes to change the gcore command so it > first stops all running threads (from the current inferior) before > generating the corefile, and then resumes them in their previous state. > > To achieve this, this patch exposes the restart_threads function in infrun.h > (used to be local to infrun.c). We also allow the first parameter > (event_thread) to be nullptr as it is possible that the gcore command is > called while all threads are running, in which case we want all threads > to be restarted at the end of the procedure. > > When testing this patch against gdbserver, it appears that using > stop_all_threads / restart_threads was not compatible with all-stop > targets. For those targets, we need to call target_stop_and_wait / > target_resume. The gcore_command has code to handle both > configurations. I could not use a RAII-like object to have a cleaner > way to restore the state at the end as the restore procedure could > throw. Instead, the procedure keeps track of which method was used to > interrupt threads so the appropriate method can be used to restore their > state. > > Tested on x86_64 on navite GDB and the native-extended-gdbserver board. > --- > gdb/NEWS | 5 ++ > gdb/doc/gdb.texinfo | 5 ++ > gdb/gcore.c | 37 ++++++++++++ > gdb/infrun.c | 16 ++--- > gdb/infrun.h | 9 +++ > gdb/testsuite/gdb.base/gcore-nonstop.c | 44 ++++++++++++++ > gdb/testsuite/gdb.base/gcore-nonstop.exp | 77 ++++++++++++++++++++++++ > 7 files changed, 182 insertions(+), 11 deletions(-) > create mode 100644 gdb/testsuite/gdb.base/gcore-nonstop.c > create mode 100644 gdb/testsuite/gdb.base/gcore-nonstop.exp > > diff --git a/gdb/NEWS b/gdb/NEWS > index 3f31515297c..adc0963aecb 100644 > --- a/gdb/NEWS > +++ b/gdb/NEWS > @@ -128,6 +128,11 @@ set style tui-current-position [on|off] > > * Changed commands > > +gcore > + GDB now ensures that all threads of the current inferior are stopped > + before generating a core dump. At the end of the command, threads are > + restored to their previous state. > + > document user-defined > It is now possible to document user-defined aliases. > When a user-defined alias is documented, the help and apropos commands > diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo > index f5f664fd168..ec2eba4b410 100644 > --- a/gdb/doc/gdb.texinfo > +++ b/gdb/doc/gdb.texinfo > @@ -13570,6 +13570,11 @@ Produce a core dump of the inferior process. The optional argument > specified, the file name defaults to @file{core.@var{pid}}, where > @var{pid} is the inferior process ID. > > +@value{GDBN} ensures that all threads of the current inferior are stopped > +while generating the core dump. If any of the inferior's thread is found > +running when executing this command, @value{GDBN} stops it and resumes it > +when the command is done. > + > Note that this command is implemented only for some systems (as of > this writing, @sc{gnu}/Linux, FreeBSD, Solaris, and S390). > > diff --git a/gdb/gcore.c b/gdb/gcore.c > index ede78534bd8..dda9e7af50b 100644 > --- a/gdb/gcore.c > +++ b/gdb/gcore.c > @@ -34,6 +34,7 @@ > #include "regset.h" > #include "gdb_bfd.h" > #include "readline/tilde.h" > +#include "infrun.h" > #include > #include "gdbsupport/gdb_unlinker.h" > #include "gdbsupport/byte-vector.h" > @@ -131,6 +132,35 @@ gcore_command (const char *args, int from_tty) > if (!target_has_execution ()) > noprocess (); > > + scoped_restore_current_thread restore_current_thread; > + scoped_disable_commit_resumed disable_commit_resume ("generating coredump"); > + struct inferior *inf = current_inferior (); > + scoped_finish_thread_state finish_state (inf->process_target (), > + ptid_t (inferior_ptid.pid ())); > + bool all_stop_was_running = false; > + if (exists_non_stop_target ()) > + stop_all_threads ("generating coredump", inf); > + else > + { > + for (thread_info *t > + : all_non_exited_threads (inf->process_target (), > + ptid_t (inferior_ptid.pid ()))) > + { > + /* All threads are executing or none is, no need to go through the > + entire list. */ > + all_stop_was_running = t->executing (); > + break; > + } > + > + if (all_stop_was_running) > + { > + if (!may_stop) > + error (_("Cannot stop the target to generate the core dump.")); > + > + target_stop_and_wait (ptid_t (inferior_ptid.pid ())); > + } > + } > + > if (args && *args) > corefilename.reset (tilde_expand (args)); > else > @@ -161,6 +191,13 @@ gcore_command (const char *args, int from_tty) > } > > gdb_printf ("Saved corefile %s\n", corefilename.get ()); > + > + if (exists_non_stop_target ()) > + restart_threads (nullptr, inf); > + else if (all_stop_was_running) > + target_resume (ptid_t (inferior_ptid.pid ()), 0, GDB_SIGNAL_0); > + > + disable_commit_resume.reset_and_commit (); > } > > static enum bfd_architecture > diff --git a/gdb/infrun.c b/gdb/infrun.c > index 6da46b75ac7..c7c8ad5456f 100644 > --- a/gdb/infrun.c > +++ b/gdb/infrun.c > @@ -96,9 +96,6 @@ static void resume (gdb_signal sig); > > static void wait_for_inferior (inferior *inf); > > -static void restart_threads (struct thread_info *event_thread, > - inferior *inf = nullptr); > - > static bool start_step_over (void); > > static bool step_over_info_valid_p (void); > @@ -5886,18 +5883,15 @@ handle_inferior_event (struct execution_control_state *ecs) > } > } > > -/* Restart threads back to what they were trying to do back when we > - paused them (because of an in-line step-over or vfork, for example). > - The EVENT_THREAD thread is ignored (not restarted). > - > - If INF is non-nullptr, only resume threads from INF. */ > +/* See infrun.h. */ > > -static void > +void > restart_threads (struct thread_info *event_thread, inferior *inf) > { > INFRUN_SCOPED_DEBUG_START_END ("event_thread=%s, inf=%d", > - event_thread->ptid.to_string ().c_str (), > - inf != nullptr ? inf->num : -1); > + (event_thread != nullptr > + ? event_thread->ptid.to_string ().c_str () > + : "None"), inf != nullptr ? inf->num : -1); > > gdb_assert (!step_over_info_valid_p ()); > > diff --git a/gdb/infrun.h b/gdb/infrun.h > index c711b9b21cc..4cd98ec06c5 100644 > --- a/gdb/infrun.h > +++ b/gdb/infrun.h > @@ -175,6 +175,15 @@ extern void nullify_last_target_wait_ptid (); > all threads of all inferiors. */ > extern void stop_all_threads (const char *reason, inferior *inf = nullptr); > > +/* Restart threads back to what they were trying to do back when we > + paused them (because of an in-line step-over or vfork, for example). > + The EVENT_THREAD thread, if non-nullptr, is ignored (not restarted). > + > + If INF is non-nullptr, only resume threads from INF. */ > + > +extern void restart_threads (struct thread_info *event_thread, > + inferior *inf = nullptr); > + > extern void prepare_for_detach (void); > > extern void fetch_inferior_event (); > diff --git a/gdb/testsuite/gdb.base/gcore-nonstop.c b/gdb/testsuite/gdb.base/gcore-nonstop.c > new file mode 100644 > index 00000000000..191a1a26849 > --- /dev/null > +++ b/gdb/testsuite/gdb.base/gcore-nonstop.c > @@ -0,0 +1,44 @@ > +/* This testcase is part of GDB, the GNU debugger. > + > + Copyright 2022 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 > + > +static pthread_barrier_t barrier; > + > +static void * > +worker_func (void *) > +{ > + pthread_barrier_wait (&barrier); > + return NULL; > +} > + > +int > +main (void) > +{ > + pthread_t worker_thread; > + pthread_barrier_init (&barrier, NULL, 2); > + > + pthread_create (&worker_thread, NULL, worker_func, NULL); > + > + /* Break here. */ > + > + pthread_barrier_wait (&barrier); > + pthread_join (worker_thread, NULL); > + pthread_barrier_destroy (&barrier); > + > + return 0; > +} > diff --git a/gdb/testsuite/gdb.base/gcore-nonstop.exp b/gdb/testsuite/gdb.base/gcore-nonstop.exp > new file mode 100644 > index 00000000000..56fc909b00b > --- /dev/null > +++ b/gdb/testsuite/gdb.base/gcore-nonstop.exp > @@ -0,0 +1,77 @@ > +# Copyright 2022 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 . > + > +# This testcase checks that when in non-stop mode with some threads running > +# the gcore command can interrupt all threads, generate a core dump and > +# restart threads as required. > + > +standard_testfile > + > +if { [prepare_for_testing "failed to prepare" \ > + ${testfile} ${srcfile} {threads debug}] } { > + return > +} > + > +save_vars { GDBFLAGS } { > + append GDBFLAGS " -ex \"set non-stop on\"" > + clean_restart ${binfile} > +} > + > +set lineno [gdb_get_line_number "Break here"] > +if { ![runto $lineno] } { > + return > +} > + > +# We should be stopped in thread 1 while thread 2 is running. > +gdb_test_sequence "info threads" "info threads" { > + {Id\s+Target Id\s+Frame} > + {\*\s+1[^\n]*\n} > + {\s+2\s+[^\n]*\(running\)[^\n]*\n} > +} > + > +set th1_pc "" > +gdb_test_multiple "p/x \$pc" "fetch thread 1 PC" { > + -wrap -re "$::decimal = ($::hex)" { > + set th1_pc $expect_out(1,string) > + pass $gdb_test_name > + } > +} > + > +set corefile [standard_output_file "corefile"] > +if {![gdb_gcore_cmd $corefile "generate corefile"]} { > + # gdb_gcore_cmd issues a "UNSUPPORTED". > + return > +} > + > +# After the core file is generated, thread 2 should be back running > +# and thread 1 should still be selected. > +gdb_test_sequence "info threads" "correct thread selection after gcore" { > + {Id\s+Target Id\s+Frame} > + {\*\s+1[^\n]*\n} > + {\s+2\s+[^\n]*\(running\)[^\n]*\n} > +} > + > +# Thread 1 is at the same stop it was before calling the gcore command. > +gdb_test "p/x \$pc" "\\\$$::decimal = $th1_pc" "thread 1 unchanged" > + > +clean_restart $binfile > +gdb_test "core-file $corefile" "Core was generated by.*" "load corefile" > + > +# The core file has the 2 threads. > +gdb_test_sequence "info threads" "threads in corefile" { > + {Id\s+Target Id\s+Frame} > + {\s+1\s+Thread[^\n]*\n} > + {\s+2\s+Thread[^\n]*\n} > +} >