From patchwork Tue Oct 29 17:57:54 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: 35419 Received: (qmail 47675 invoked by alias); 29 Oct 2019 17:58:06 -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 47571 invoked by uid 89); 29 Oct 2019 17:58:06 -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=2317 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, 29 Oct 2019 17:58:04 +0000 Received: by mx1.osci.io (Postfix, from userid 994) id 25D5721610; Tue, 29 Oct 2019 13:58:03 -0400 (EDT) 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 5ECA021251 for ; Tue, 29 Oct 2019 13:57:54 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by gnutoolchain-gerrit.osci.io (Postfix) with ESMTP id 36E3A20AF6 for ; Tue, 29 Oct 2019 13:57:54 -0400 (EDT) X-Gerrit-PatchSet: 1 Date: Tue, 29 Oct 2019 13:57:54 -0400 From: "Tom Tromey (Code Review)" To: gdb-patches@sourceware.org Message-ID: Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange Subject: [review] Use new and delete for windows_thread_info X-Gerrit-Change-Id: I2100e91f371b1fa0ae51aabb2a59ae393f789923 X-Gerrit-Change-Number: 408 X-Gerrit-ChangeURL: X-Gerrit-Commit: 2755ed9071a4abc3bbd327d3f497463d10b236f2 References: Reply-To: tromey@sourceware.org, gdb-patches@sourceware.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Gerrit/3.0.3-74-g460fb0f7e9 Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/408 ...................................................................... Use new and delete for windows_thread_info This adds a constructor, destructor, and member initializers to windows_thread_info, and changes gdb and gdbserver to use new and delete. gdb/ChangeLog 2019-10-29 Tom Tromey * windows-nat.c (windows_add_thread): Use new. (windows_init_thread_list, windows_delete_thread): Use delete. (get_windows_debug_event): Update. * nat/windows-nat.h (struct windows_thread_info): Add constructor, destructor, and initializers. gdb/gdbserver/ChangeLog 2019-10-29 Tom Tromey * win32-low.c (child_add_thread): Use new. (delete_thread_info): Use delete. Change-Id: I2100e91f371b1fa0ae51aabb2a59ae393f789923 --- M gdb/ChangeLog M gdb/gdbserver/ChangeLog M gdb/gdbserver/win32-low.c M gdb/nat/windows-nat.h M gdb/windows-nat.c 5 files changed, 39 insertions(+), 19 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index da276ab..d014dc8 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,13 @@ 2019-10-29 Tom Tromey + * windows-nat.c (windows_add_thread): Use new. + (windows_init_thread_list, windows_delete_thread): Use delete. + (get_windows_debug_event): Update. + * nat/windows-nat.h (struct windows_thread_info): Add constructor, + destructor, and initializers. + +2019-10-29 Tom Tromey + * windows-nat.c (struct windows_thread_info): Remove. * nat/windows-nat.h: New file. diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index bf0f3e0..5819b74 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,5 +1,10 @@ 2019-10-29 Tom Tromey + * win32-low.c (child_add_thread): Use new. + (delete_thread_info): Use delete. + +2019-10-29 Tom Tromey + * win32-low.h (struct windows_thread_info): Remove. 2019-10-29 Tom Tromey diff --git a/gdb/gdbserver/win32-low.c b/gdb/gdbserver/win32-low.c index 6a081e2..7e3afff 100644 --- a/gdb/gdbserver/win32-low.c +++ b/gdb/gdbserver/win32-low.c @@ -213,10 +213,7 @@ if ((th = thread_rec (ptid, FALSE))) return th; - th = XCNEW (windows_thread_info); - th->tid = tid; - th->h = h; - th->thread_local_base = (CORE_ADDR) (uintptr_t) tlb; + th = new windows_thread_info (tid, h, (CORE_ADDR) (uintptr_t) tlb); add_thread (ptid, th); @@ -234,7 +231,7 @@ remove_thread (thread); CloseHandle (th->h); - free (th); + delete th; } /* Delete a thread from the list of threads. */ diff --git a/gdb/nat/windows-nat.h b/gdb/nat/windows-nat.h index 30fce27..2fe2a2f 100644 --- a/gdb/nat/windows-nat.h +++ b/gdb/nat/windows-nat.h @@ -23,6 +23,20 @@ each thread. */ struct windows_thread_info { + windows_thread_info (DWORD tid_, HANDLE h_, CORE_ADDR tlb) + : tid (tid_), + h (h_), + thread_local_base (tlb) + { + } + + ~windows_thread_info () + { + xfree (name); + } + + DISABLE_COPY_AND_ASSIGN (windows_thread_info); + /* The Win32 thread identifier. */ DWORD tid; @@ -33,26 +47,26 @@ CORE_ADDR thread_local_base; /* Non zero if SuspendThread was called on this thread. */ - int suspended; + int suspended = 0; #ifdef _WIN32_WCE /* The context as retrieved right after suspending the thread. */ - CONTEXT base_context; + CONTEXT base_context {}; #endif /* The context of the thread, including any manipulations. */ - CONTEXT context; + CONTEXT context {}; /* Whether debug registers changed since we last set CONTEXT back to the thread. */ - int debug_registers_changed; + int debug_registers_changed = 0; /* Nonzero if CONTEXT is invalidated and must be re-read from the inferior thread. */ - int reload_context; + int reload_context = 0; /* The name of the thread, allocated by xmalloc. */ - char *name; + char *name = nullptr; }; #endif diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index 19a2b2d..d18c37b 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -429,10 +429,7 @@ if ((th = thread_rec (id, FALSE))) return th; - th = XCNEW (windows_thread_info); - th->tid = id; - th->h = h; - th->thread_local_base = (CORE_ADDR) (uintptr_t) tlb; + th = new windows_thread_info (id, h, (CORE_ADDR) (uintptr_t) tlb); thread_list.push_back (th); /* Add this new thread to the list of threads. @@ -472,7 +469,7 @@ init_thread_list (); for (windows_thread_info *here : thread_list) - xfree (here); + delete here; thread_list.clear (); } @@ -517,8 +514,7 @@ if (iter != thread_list.end ()) { - xfree ((*iter)->name); - xfree (*iter); + delete *iter; thread_list.erase (iter); } } @@ -1501,7 +1497,7 @@ BOOL debug_event; DWORD continue_status, event_code; windows_thread_info *th; - static windows_thread_info dummy_thread_info; + static windows_thread_info dummy_thread_info (0, 0, 0); DWORD thread_id = 0; last_sig = GDB_SIGNAL_0;