aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@adacore.com>2020-04-08 14:33:35 -0600
committerTom Tromey <tromey@adacore.com>2020-04-08 14:47:57 -0600
commit55a1e039f9d5e2ae144b64f52f2034e4f9177336 (patch)
treef199303a609a28ce388414b093543854c808fb6b
parente56f8ccb07890fc2c0413c530d27d105c74f622c (diff)
downloadgdb-55a1e039f9d5e2ae144b64f52f2034e4f9177336.zip
gdb-55a1e039f9d5e2ae144b64f52f2034e4f9177336.tar.gz
gdb-55a1e039f9d5e2ae144b64f52f2034e4f9177336.tar.bz2
Rename windows_thread_info::id to "tid"
This changes the name of a field in windows_thread_info, bringing gdb and gdbserver closer into sync. gdb/ChangeLog 2020-04-08 Tom Tromey <tromey@adacore.com> * windows-nat.c (struct windows_thread_info) <tid>: Rename from "id". (thread_rec, windows_add_thread, windows_delete_thread) (windows_continue): Update.
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/windows-nat.c10
2 files changed, 11 insertions, 5 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1ab9f47..1c46aaf 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
2020-04-08 Tom Tromey <tromey@adacore.com>
+ * windows-nat.c (struct windows_thread_info) <tid>: Rename from "id".
+ (thread_rec, windows_add_thread, windows_delete_thread)
+ (windows_continue): Update.
+
+2020-04-08 Tom Tromey <tromey@adacore.com>
+
* windows-nat.c (struct windows_thread_info): Remove typedef.
(thread_head): Remove.
(thread_list): New global.
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 2f9e00a..837359e 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -248,7 +248,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;
@@ -429,7 +429,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)
{
@@ -487,7 +487,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;
#ifdef __x86_64__
@@ -594,7 +594,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 ())
@@ -1477,7 +1477,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)
{
#ifdef __x86_64__