diff options
| -rw-r--r-- | gdbserver/ChangeLog | 29 | ||||
| -rw-r--r-- | gdbserver/linux-low.cc | 10 | ||||
| -rw-r--r-- | gdbserver/linux-low.h | 2 | ||||
| -rw-r--r-- | gdbserver/lynx-low.cc | 5 | ||||
| -rw-r--r-- | gdbserver/lynx-low.h | 2 | ||||
| -rw-r--r-- | gdbserver/nto-low.cc | 7 | ||||
| -rw-r--r-- | gdbserver/nto-low.h | 2 | ||||
| -rw-r--r-- | gdbserver/target.h | 9 | ||||
| -rw-r--r-- | gdbserver/win32-low.cc | 7 | ||||
| -rw-r--r-- | gdbserver/win32-low.h | 2 |
10 files changed, 54 insertions, 21 deletions
diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index c283b925653..818a53c9b5c 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,5 +1,34 @@ 2020-02-20 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com> + Turn process_stratum_target's thread_alive op into a method of + process_target. + + * target.h (struct process_stratum_target): Remove the target op. + (class process_target): Add the target op. + (mythread_alive): Update the macro. + + Update the derived classes and callers below. + + * linux-low.cc (linux_target_ops): Update. + (linux_thread_alive): Turn into ... + (linux_process_target::thread_alive): ... this. + (wait_for_sigstop): Update. + * linux-low.h (class linux_process_target): Update. + * lynx-low.cc (lynx_target_ops): Update. + (lynx_thread_alive): Turn into ... + (lynx_process_target::thread_alive): ... this. + * lynx-low.h (class lynx_process_target): Update. + * nto-low.cc (nto_target_ops): Update. + (nto_thread_alive): Turn into ... + (nto_process_target::thread_alive): ... this. + * nto-low.h (class nto_process_target): Update. + * win32-low.cc (win32_target_ops): Update. + (win32_thread_alive): Turn into ... + (win32_process_target::thread_alive): ... this. + * win32-low.h (class win32_process_target): Update. + +2020-02-20 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com> + Turn process_stratum_target's join op into a method of process_target. diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index 39099cb37dd..f7b1fc095fd 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -1681,9 +1681,10 @@ linux_process_target::join (int pid) } while (ret != -1 || errno != ECHILD); } -/* Return nonzero if the given thread is still alive. */ -static int -linux_thread_alive (ptid_t ptid) +/* Return true if the given thread is still alive. */ + +bool +linux_process_target::thread_alive (ptid_t ptid) { struct lwp_info *lwp = find_lwp_pid (ptid); @@ -4004,7 +4005,7 @@ wait_for_sigstop (void) &wstat, __WALL); gdb_assert (ret == -1); - if (saved_thread == NULL || linux_thread_alive (saved_tid)) + if (saved_thread == NULL || mythread_alive (saved_tid)) current_thread = saved_thread; else { @@ -7358,7 +7359,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { - linux_thread_alive, linux_resume, linux_wait, linux_fetch_registers, diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index 772da9ef30b..a11964d61ef 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -284,6 +284,8 @@ public: void mourn (process_info *proc) override; void join (int pid) override; + + bool thread_alive (ptid_t pid) override; }; #define get_thread_lwp(thr) ((struct lwp_info *) (thread_target_data (thr))) diff --git a/gdbserver/lynx-low.cc b/gdbserver/lynx-low.cc index b2ce1559e85..24908786fad 100644 --- a/gdbserver/lynx-low.cc +++ b/gdbserver/lynx-low.cc @@ -570,8 +570,8 @@ lynx_process_target::join (int pid) /* Implement the thread_alive target_ops method. */ -static int -lynx_thread_alive (ptid_t ptid) +bool +lynx_process_target::thread_alive (ptid_t ptid) { /* The list of threads is updated at the end of each wait, so it should be up to date. No need to re-fetch it. */ @@ -726,7 +726,6 @@ static lynx_process_target the_lynx_target; /* The LynxOS target_ops vector. */ static process_stratum_target lynx_target_ops = { - lynx_thread_alive, lynx_resume, lynx_wait, lynx_fetch_registers, diff --git a/gdbserver/lynx-low.h b/gdbserver/lynx-low.h index 3f42407a4d7..b12e6cd2721 100644 --- a/gdbserver/lynx-low.h +++ b/gdbserver/lynx-low.h @@ -70,6 +70,8 @@ public: void mourn (process_info *proc) override; void join (int pid) override; + + bool thread_alive (ptid_t pid) override; }; /* The inferior's target description. This is a global because the diff --git a/gdbserver/nto-low.cc b/gdbserver/nto-low.cc index 2d6aaa0368e..4153a4adde3 100644 --- a/gdbserver/nto-low.cc +++ b/gdbserver/nto-low.cc @@ -431,10 +431,10 @@ nto_process_target::join (int pid) /* Check if the given thread is alive. - Return 1 if alive, 0 otherwise. */ + Return true if alive, false otherwise. */ -static int -nto_thread_alive (ptid_t ptid) +bool +nto_process_target::thread_alive (ptid_t ptid) { int res; @@ -941,7 +941,6 @@ nto_sw_breakpoint_from_kind (int kind, int *size) static nto_process_target the_nto_target; static process_stratum_target nto_target_ops = { - nto_thread_alive, nto_resume, nto_wait, nto_fetch_registers, diff --git a/gdbserver/nto-low.h b/gdbserver/nto-low.h index 6e3471cc151..e861b5e885c 100644 --- a/gdbserver/nto-low.h +++ b/gdbserver/nto-low.h @@ -60,6 +60,8 @@ public: void mourn (process_info *proc) override; void join (int pid) override; + + bool thread_alive (ptid_t pid) override; }; /* The inferior's target description. This is a global because the diff --git a/gdbserver/target.h b/gdbserver/target.h index 32905b176da..923c92c7cb8 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,10 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* Return 1 iff the thread with process ID PID is alive. */ - - int (*thread_alive) (ptid_t pid); - /* Resume the inferior process. */ void (*resume) (struct thread_resume *resume_info, size_t n); @@ -484,6 +480,9 @@ public: /* Wait for process PID to exit. */ virtual void join (int pid) = 0; + + /* Return true iff the thread with process ID PID is alive. */ + virtual bool thread_alive (ptid_t pid) = 0; }; extern process_stratum_target *the_target; @@ -524,7 +523,7 @@ int kill_inferior (process_info *proc); the_target->pt->detach (proc) #define mythread_alive(pid) \ - (*the_target->thread_alive) (pid) + the_target->pt->thread_alive (pid) #define fetch_inferior_registers(regcache, regno) \ (*the_target->fetch_registers) (regcache, regno) diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index 0dd1137db87..46f0ddd58b8 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -897,9 +897,9 @@ win32_process_target::join (int pid) } } -/* Return 1 iff the thread with thread ID TID is alive. */ -static int -win32_thread_alive (ptid_t ptid) +/* Return true iff the thread with thread ID TID is alive. */ +bool +win32_process_target::thread_alive (ptid_t ptid) { /* Our thread list is reliable; don't bother to poll target threads. */ @@ -1839,7 +1839,6 @@ win32_sw_breakpoint_from_kind (int kind, int *size) static win32_process_target the_win32_target; static process_stratum_target win32_target_ops = { - win32_thread_alive, win32_resume, win32_wait, win32_fetch_inferior_registers, diff --git a/gdbserver/win32-low.h b/gdbserver/win32-low.h index a9da8d3a11f..b222fd3b57d 100644 --- a/gdbserver/win32-low.h +++ b/gdbserver/win32-low.h @@ -119,6 +119,8 @@ public: void mourn (process_info *proc) override; void join (int pid) override; + + bool thread_alive (ptid_t pid) override; }; /* Retrieve the context for this thread, if not already retrieved. */ |