From patchwork Mon Oct 14 16:15:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 34944 Received: (qmail 123682 invoked by alias); 14 Oct 2019 16:15:53 -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 123440 invoked by uid 89); 14 Oct 2019 16:15:34 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-22.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=th, suspended, HANDLE, HContent-Transfer-Encoding:8bit X-HELO: rock.gnat.com Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 14 Oct 2019 16:15:32 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id A4FD056049; Mon, 14 Oct 2019 12:15:23 -0400 (EDT) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id YmF0nkMVzaTP; Mon, 14 Oct 2019 12:15:23 -0400 (EDT) Received: from murgatroyd.Home (174-29-53-230.hlrn.qwest.net [174.29.53.230]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by rock.gnat.com (Postfix) with ESMTPSA id 5086456043; Mon, 14 Oct 2019 12:15:23 -0400 (EDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 3/9] Rename windows_thread_info::id to "tid" Date: Mon, 14 Oct 2019 10:15:14 -0600 Message-Id: <20191014161520.13150-4-tromey@adacore.com> In-Reply-To: <20191014161520.13150-1-tromey@adacore.com> References: <20191014161520.13150-1-tromey@adacore.com> MIME-Version: 1.0 This changes the name of a field in windows_thread_info, bringing gdb and gdbserver closer into sync. gdb/ChangeLog 2019-10-14 Tom Tromey * windows-nat.c (struct windows_thread_info) : Rename from "id". (thread_rec, windows_add_thread, windows_delete_thread) (windows_continue): Update. --- gdb/ChangeLog | 6 ++++++ gdb/windows-nat.c | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index d3413a3e319..7911afe80a2 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -217,7 +217,7 @@ static enum gdb_signal last_sig = GDB_SIGNAL_0; not available in gdb's thread structure. */ struct windows_thread_info { - DWORD id; + DWORD tid; HANDLE h; CORE_ADDR thread_local_base; char *name; @@ -384,7 +384,7 @@ static windows_thread_info * thread_rec (DWORD id, int get_context) { for (windows_thread_info *th : thread_list) - if (th->id == id) + if (th->tid == id) { if (!th->suspended && get_context) { @@ -442,7 +442,7 @@ windows_add_thread (ptid_t ptid, HANDLE h, void *tlb, bool main_thread_p) return th; th = XCNEW (windows_thread_info); - th->id = id; + th->tid = id; th->h = h; th->thread_local_base = (CORE_ADDR) (uintptr_t) tlb; thread_list.push_back (th); @@ -524,7 +524,7 @@ windows_delete_thread (ptid_t ptid, DWORD exit_code, bool main_thread_p) auto iter = std::find_if (thread_list.begin (), thread_list.end (), [=] (windows_thread_info *th) { - return th->id == id; + return th->tid == id; }); if (iter != thread_list.end ()) @@ -1319,7 +1319,7 @@ windows_continue (DWORD continue_status, int id, int killed) "DBG_CONTINUE" : "DBG_EXCEPTION_NOT_HANDLED")); for (windows_thread_info *th : thread_list) - if ((id == -1 || id == (int) th->id) + if ((id == -1 || id == (int) th->tid) && th->suspended) { if (debug_registers_changed)