From patchwork Tue Nov 26 17:11:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Simon Marchi (Code Review)" X-Patchwork-Id: 36209 Received: (qmail 91527 invoked by alias); 26 Nov 2019 17:11:39 -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 91519 invoked by uid 89); 26 Nov 2019 17:11:39 -0000 Authentication-Results: sourceware.org; auth=none 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 autolearn=ham version=3.3.1 spammy=13106 X-HELO: mx1.osci.io Received: from polly.osci.io (HELO mx1.osci.io) (8.43.85.229) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 26 Nov 2019 17:11:37 +0000 Received: by mx1.osci.io (Postfix, from userid 994) id ED3312227B; Tue, 26 Nov 2019 12:11:35 -0500 (EST) Received: from gnutoolchain-gerrit.osci.io (gnutoolchain-gerrit.osci.io [IPv6:2620:52:3:1:5054:ff:fe06:16ca]) by mx1.osci.io (Postfix) with ESMTP id 9F110201F1; Tue, 26 Nov 2019 12:11:30 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by gnutoolchain-gerrit.osci.io (Postfix) with ESMTP id 8757220AF6; Tue, 26 Nov 2019 12:11:30 -0500 (EST) X-Gerrit-PatchSet: 2 Date: Tue, 26 Nov 2019 12:11:28 -0500 From: "Tom Tromey (Code Review)" To: Luis Machado , Simon Marchi , gdb-patches@sourceware.org Auto-Submitted: auto-generated X-Gerrit-MessageType: newpatchset Subject: [review v2] Remove the "next" field from windows_thread_info X-Gerrit-Change-Id: Ib93c54e529a5d82515883f44a478eeb0ff0dbae9 X-Gerrit-Change-Number: 404 X-Gerrit-ChangeURL: X-Gerrit-Commit: ca3826a5afb473d7b3aef63d6949d7150e9c3e67 In-Reply-To: References: Reply-To: tromey@sourceware.org, simon.marchi@polymtl.ca, luis.machado@linaro.org, gdb-patches@sourceware.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Gerrit/3.0.3-79-g83ff7f88f1 Message-Id: <20191126171130.8757220AF6@gnutoolchain-gerrit.osci.io> Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/404 ...................................................................... Remove the "next" field from windows_thread_info This changes windows_thread_info to remove the "next" field, replacing the linked list of threads with a vector. This is a prerequisite to sharing this structure with gdbserver, which manages threads differently. gdb/ChangeLog 2019-11-26 Tom Tromey * windows-nat.c (struct windows_thread_info): Remove typedef. (thread_head): Remove. (thread_list): New global. (thread_rec, windows_add_thread, windows_init_thread_list) (windows_delete_thread, windows_continue): Update. Change-Id: Ib93c54e529a5d82515883f44a478eeb0ff0dbae9 --- M gdb/ChangeLog M gdb/windows-nat.c 2 files changed, 29 insertions(+), 31 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index fdba64e..a081fce 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2019-11-26 Tom Tromey + + * windows-nat.c (struct windows_thread_info): Remove typedef. + (thread_head): Remove. + (thread_list): New global. + (thread_rec, windows_add_thread, windows_init_thread_list) + (windows_delete_thread, windows_continue): Update. + 2019-11-25 Tom de Vries * contrib/words.sh: Add -c option. diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index fdc21f3..88e04e7 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -43,6 +43,7 @@ #include #endif #include +#include #include "filenames.h" #include "symfile.h" @@ -214,9 +215,8 @@ /* Thread information structure used to track information that is not available in gdb's thread structure. */ -typedef struct windows_thread_info_struct +struct windows_thread_info { - struct windows_thread_info_struct *next; DWORD id; HANDLE h; CORE_ADDR thread_local_base; @@ -224,10 +224,9 @@ int suspended; int reload_context; CONTEXT context; - } -windows_thread_info; + }; -static windows_thread_info thread_head; +static std::vector thread_list; /* The process and thread handles for the above context. */ @@ -384,9 +383,7 @@ static windows_thread_info * thread_rec (DWORD id, int get_context) { - windows_thread_info *th; - - for (th = &thread_head; (th = th->next) != NULL;) + for (windows_thread_info *th : thread_list) if (th->id == id) { if (!th->suspended && get_context) @@ -448,8 +445,7 @@ th->id = id; th->h = h; th->thread_local_base = (CORE_ADDR) (uintptr_t) tlb; - th->next = thread_head.next; - thread_head.next = th; + thread_list.push_back (th); /* Add this new thread to the list of threads. @@ -484,17 +480,13 @@ static void windows_init_thread_list (void) { - windows_thread_info *th = &thread_head; - DEBUG_EVENTS (("gdb: windows_init_thread_list\n")); init_thread_list (); - while (th->next != NULL) - { - windows_thread_info *here = th->next; - th->next = here->next; - xfree (here); - } - thread_head.next = NULL; + + for (windows_thread_info *here : thread_list) + xfree (here); + + thread_list.clear (); } /* Delete a thread from the list of threads. @@ -507,7 +499,6 @@ static void windows_delete_thread (ptid_t ptid, DWORD exit_code, bool main_thread_p) { - windows_thread_info *th; DWORD id; gdb_assert (ptid.tid () != 0); @@ -530,17 +521,17 @@ delete_thread (find_thread_ptid (ptid)); - for (th = &thread_head; - th->next != NULL && th->next->id != id; - th = th->next) - continue; + auto iter = std::find_if (thread_list.begin (), thread_list.end (), + [=] (windows_thread_info *th) + { + return th->id == id; + }); - if (th->next != NULL) + if (iter != thread_list.end ()) { - windows_thread_info *here = th->next; - th->next = here->next; - xfree (here->name); - xfree (here); + xfree ((*iter)->name); + xfree (*iter); + thread_list.erase (iter); } } @@ -1319,7 +1310,6 @@ static BOOL windows_continue (DWORD continue_status, int id, int killed) { - windows_thread_info *th; BOOL res; DEBUG_EVENTS (("ContinueDebugEvent (cpid=%d, ctid=0x%x, %s);\n", @@ -1328,7 +1318,7 @@ continue_status == DBG_CONTINUE ? "DBG_CONTINUE" : "DBG_EXCEPTION_NOT_HANDLED")); - for (th = &thread_head; (th = th->next) != NULL;) + for (windows_thread_info *th : thread_list) if ((id == -1 || id == (int) th->id) && th->suspended) {