aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gdb/breakpoint.c3
-rw-r--r--gdb/gdbthread.h30
-rw-r--r--gdb/infrun.c4
-rw-r--r--gdb/python/py-infthread.c9
-rw-r--r--gdb/target.h5
-rw-r--r--gdb/thread.c36
6 files changed, 57 insertions, 30 deletions
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 10b28c9..3b626b8 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -4565,13 +4565,12 @@ maybe_print_thread_hit_breakpoint (struct ui_out *uiout)
if (show_thread_that_caused_stop ())
{
- const char *name;
struct thread_info *thr = inferior_thread ();
uiout->text ("Thread ");
uiout->field_string ("thread-id", print_thread_id (thr));
- name = thr->name != NULL ? thr->name : target_thread_name (thr);
+ const char *name = thread_name (thr);
if (name != NULL)
{
uiout->text (" \"");
diff --git a/gdb/gdbthread.h b/gdb/gdbthread.h
index 4b27194..7beccba 100644
--- a/gdb/gdbthread.h
+++ b/gdb/gdbthread.h
@@ -235,7 +235,6 @@ class thread_info : public refcounted_object,
{
public:
explicit thread_info (inferior *inf, ptid_t ptid);
- ~thread_info ();
bool deletable () const;
@@ -286,9 +285,21 @@ public:
/* The inferior this thread belongs to. */
struct inferior *inf;
- /* The name of the thread, as specified by the user. This is NULL
- if the thread does not have a user-given name. */
- char *name = NULL;
+ /* The user-given name of the thread.
+
+ Returns nullptr if the thread does not have a user-given name. */
+ const char *name () const
+ {
+ return m_name.get ();
+ }
+
+ /* Set the user-given name of the thread.
+
+ Pass nullptr to clear the name. */
+ void set_name (gdb::unique_xmalloc_ptr<char> name)
+ {
+ m_name = std::move (name);
+ }
bool executing () const
{ return m_executing; }
@@ -523,6 +534,11 @@ private:
/* State of inferior thread to restore after GDB is done with an inferior
call. See `struct thread_suspend_state'. */
thread_suspend_state m_suspend;
+
+ /* The user-given name of the thread.
+
+ Nullptr if the thread does not have a user-given name. */
+ gdb::unique_xmalloc_ptr<char> m_name;
};
using thread_info_resumed_with_pending_wait_status_node
@@ -953,4 +969,10 @@ extern void print_selected_thread_frame (struct ui_out *uiout,
alive anymore. */
extern void thread_select (const char *tidstr, class thread_info *thr);
+/* Return THREAD's name.
+
+ If THREAD has a user-given name, return it. Otherwise, query the thread's
+ target to get the name. May return nullptr. */
+extern const char *thread_name (thread_info *thread);
+
#endif /* GDBTHREAD_H */
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 9567130..0acb3f7 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -8185,12 +8185,10 @@ print_signal_received_reason (struct ui_out *uiout, enum gdb_signal siggnal)
;
else if (show_thread_that_caused_stop ())
{
- const char *name;
-
uiout->text ("\nThread ");
uiout->field_string ("thread-id", print_thread_id (thr));
- name = thr->name != NULL ? thr->name : target_thread_name (thr);
+ const char *name = thread_name (thr);
if (name != NULL)
{
uiout->text (" \"");
diff --git a/gdb/python/py-infthread.c b/gdb/python/py-infthread.c
index 74bbe99..a815f3f 100644
--- a/gdb/python/py-infthread.c
+++ b/gdb/python/py-infthread.c
@@ -66,14 +66,10 @@ static PyObject *
thpy_get_name (PyObject *self, void *ignore)
{
thread_object *thread_obj = (thread_object *) self;
- const char *name;
THPY_REQUIRE_VALID (thread_obj);
- name = thread_obj->thread->name;
- if (name == NULL)
- name = target_thread_name (thread_obj->thread);
-
+ const char *name = thread_name (thread_obj->thread);
if (name == NULL)
Py_RETURN_NONE;
@@ -115,8 +111,7 @@ thpy_set_name (PyObject *self, PyObject *newvalue, void *ignore)
return -1;
}
- xfree (thread_obj->thread->name);
- thread_obj->thread->name = name.release ();
+ thread_obj->thread->set_name (std::move (name));
return 0;
}
diff --git a/gdb/target.h b/gdb/target.h
index 61febdb..4dc17fd 100644
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -1924,7 +1924,10 @@ extern std::string normal_pid_to_str (ptid_t ptid);
extern const char *target_extra_thread_info (thread_info *tp);
/* Return the thread's name, or NULL if the target is unable to determine it.
- The returned value must not be freed by the caller. */
+ The returned value must not be freed by the caller.
+
+ You likely don't want to call this function, but use the thread_name
+ function instead, which prefers the user-given thread name, if set. */
extern const char *target_thread_name (struct thread_info *);
diff --git a/gdb/thread.c b/gdb/thread.c
index 10c3dcd..ebe2d78 100644
--- a/gdb/thread.c
+++ b/gdb/thread.c
@@ -302,11 +302,6 @@ thread_info::thread_info (struct inferior *inf_, ptid_t ptid_)
this->m_suspend.waitstatus.kind = TARGET_WAITKIND_IGNORE;
}
-thread_info::~thread_info ()
-{
- xfree (this->name);
-}
-
/* See gdbthread.h. */
bool
@@ -998,7 +993,7 @@ thread_target_id_str (thread_info *tp)
{
std::string target_id = target_pid_to_str (tp->ptid);
const char *extra_info = target_extra_thread_info (tp);
- const char *name = tp->name != nullptr ? tp->name : target_thread_name (tp);
+ const char *name = thread_name (tp);
if (extra_info != nullptr && name != nullptr)
return string_printf ("%s \"%s\" (%s)", target_id.c_str (), name,
@@ -1140,9 +1135,7 @@ print_thread_info_1 (struct ui_out *uiout, const char *requested_threads,
if (extra_info != nullptr)
uiout->field_string ("details", extra_info);
- const char *name = (tp->name != nullptr
- ? tp->name
- : target_thread_name (tp));
+ const char *name = thread_name (tp);
if (name != NULL)
uiout->field_string ("name", name);
}
@@ -1835,8 +1828,7 @@ thread_name_command (const char *arg, int from_tty)
arg = skip_spaces (arg);
info = inferior_thread ();
- xfree (info->name);
- info->name = arg ? xstrdup (arg) : NULL;
+ info->set_name (arg != nullptr ? make_unique_xstrdup (arg) : nullptr);
}
/* Find thread ids with a name, target pid, or extra info matching ARG. */
@@ -1863,10 +1855,10 @@ thread_find_command (const char *arg, int from_tty)
{
switch_to_inferior_no_thread (tp->inf);
- if (tp->name != NULL && re_exec (tp->name))
+ if (tp->name () != nullptr && re_exec (tp->name ()))
{
printf_filtered (_("Thread %s has name '%s'\n"),
- print_thread_id (tp), tp->name);
+ print_thread_id (tp), tp->name ());
match++;
}
@@ -2010,6 +2002,24 @@ update_thread_list (void)
update_threads_executing ();
}
+/* See gdbthread.h. */
+
+const char *
+thread_name (thread_info *thread)
+{
+ /* Use the manually set name if there is one. */
+ const char *name = thread->name ();
+ if (name != nullptr)
+ return name;
+
+ /* Otherwise, ask the target. Ensure we query the right target stack. */
+ scoped_restore_current_thread restore_thread;
+ if (thread->inf != current_inferior ())
+ switch_to_inferior_no_thread (thread->inf);
+
+ return target_thread_name (thread);
+}
+
/* Return a new value for the selected thread's id. Return a value of
0 if no thread is selected. If GLOBAL is true, return the thread's
global number. Otherwise return the per-inferior number. */
generated by cgit v1.1 at 2024-11-25 02:27:07 +0000