[PATCH v3 07/29] Make windows_thread_info::name a unique_xmalloc_ptr

Tom Tromey
2020-03-13T19:08:59Z

This changes windows_thread_info::name to be a unique_xmalloc_ptr,
removing some manual memory management.

gdb/ChangeLog
2020-03-13 Tom Tromey <tromey@adacore.com>

* windows-nat.c (handle_exception)
(windows_nat_target::thread_name): Update.
* nat/windows-nat.h (windows_thread_info): Remove destructor.
<name>: Now unique_xmalloc_ptr.
---
gdb/ChangeLog | 7 +++++++
gdb/nat/windows-nat.h | 7 +------
gdb/windows-nat.c | 5 ++---
3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/gdb/nat/windows-nat.h b/gdb/nat/windows-nat.h
index 27fd7ed19da..543de895e77 100644
--- a/gdb/nat/windows-nat.h
+++ b/gdb/nat/windows-nat.h
@@ -32,11 +32,6 @@ struct windows_thread_info
{
}

- ~windows_thread_info ()
- {
- xfree (name);
- }
-
DISABLE_COPY_AND_ASSIGN (windows_thread_info);

/* The Win32 thread identifier. */
@@ -77,7 +72,7 @@ struct windows_thread_info
bool reload_context = false;

/* The name of the thread, allocated by xmalloc. */
- char *name = nullptr;
+ gdb::unique_xmalloc_ptr<char> name;
};

#endif
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 866afffa262..4fe5dfe7db0 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -1414,8 +1414,7 @@ handle_exception (struct target_waitstatus *ourstatus)
if (thread_name_len > 0)
{
thread_name.get ()[thread_name_len - 1] = '\0';
- xfree (named_thread->name);
- named_thread->name = thread_name.release ();
+ named_thread->name = std::move (thread_name);
}
}
ourstatus->value.sig = GDB_SIGNAL_TRAP;
@@ -3351,7 +3350,7 @@ windows_nat_target::get_ada_task_ptid (long lwp, long thread)
const char *
windows_nat_target::thread_name (struct thread_info *thr)
{
- return thread_rec (thr->ptid.tid (), 0)->name;
+ return thread_rec (thr->ptid.tid (), 0)->name.get ();
}

--
2.21.1