From patchwork Thu Jan 28 00:48:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Breazeal X-Patchwork-Id: 10646 Received: (qmail 60975 invoked by alias); 28 Jan 2016 00:48:40 -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 60931 invoked by uid 89); 28 Jan 2016 00:48:39 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=subsequently, pthread_join, resumed, ecs X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 28 Jan 2016 00:48:37 +0000 Received: from svr-orw-fem-03.mgc.mentorg.com ([147.34.97.39]) by relay1.mentorg.com with esmtp id 1aOalG-00049B-Uq from Don_Breazeal@mentor.com for gdb-patches@sourceware.org; Wed, 27 Jan 2016 16:48:34 -0800 Received: from build4-lucid-cs (147.34.91.1) by svr-orw-fem-03.mgc.mentorg.com (147.34.97.39) with Microsoft SMTP Server id 14.3.224.2; Wed, 27 Jan 2016 16:48:34 -0800 Received: by build4-lucid-cs (Postfix, from userid 1905) id 77DF941276; Wed, 27 Jan 2016 16:48:34 -0800 (PST) From: Don Breazeal To: Subject: [PATCH 3/3] PR remote/19496, timeout in forking-threads-plus-bkpt Date: Wed, 27 Jan 2016 16:48:31 -0800 Message-ID: <1453942111-1215-4-git-send-email-donb@codesourcery.com> In-Reply-To: <1453942111-1215-1-git-send-email-donb@codesourcery.com> References: <1453942111-1215-1-git-send-email-donb@codesourcery.com> MIME-Version: 1.0 X-IsSubscribed: yes This patch addresses a failure in gdb.threads/forking-threads-plus-breakpoint.exp: FAIL: gdb.threads/forking-threads-plus-breakpoint.exp: cond_bp_target=1: detach_on_fork=on: inferior 1 exited (timeout) Cause: A fork event was reported to GDB before GDB knew about the parent thread, followed immediately by a breakpoint event in a different thread. The parent thread was subsequently added via remote_notice_new_inferior in process_stop_reply, but when the thread was added the thread_info.state was set to THREAD_STOPPED. The fork event was then handled correctly, but when the fork parent was resumed via a call to keep_going, the state was unchanged. The breakpoint event was then handled, which caused all the non-breakpoint threads to be stopped. When the breakpoint thread was resumed, all the non-breakpoint threads were resumed via infrun.c:restart_threads. Our old fork parent wasn't restarted, because it still had thread_info.state set to THREAD_STOPPED. Ultimately the program under debug hung waiting for a pthread_join while the old fork parent was stopped forever by GDB. Fix: Add a call to set_running just before resuming the fork parent in infrun.c:handle_inferior_event_1. The call could be put elsewhere (e.g. in keep_going) but this approach makes the change for the case of resuming after a fork event, without potential side-effects for other cases where keep_going is called. Tested on x86_64 Linux and Nios II Linux target with x86 Linux host. Thanks, --Don gdb/ChangeLog: 2016-01-27 Don Breazeal PR remote/19496 * infrun.c (handle_inferior_event_1): Call set_running before resuming. --- gdb/infrun.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gdb/infrun.c b/gdb/infrun.c index 15210c9..e324864 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -5232,7 +5232,13 @@ Cannot fill $_exitsignal with the correct signal number.\n")); ecs->ptid = inferior_ptid; if (should_resume) - keep_going (ecs); + { + /* Make sure the thread is marked as running. If the event + occurred in the thread before we added it, it may have + never been marked running. */ + set_running (inferior_ptid, 1); + keep_going (ecs); + } else stop_waiting (ecs); return;