public inbox for gdb-testers@sourceware.org help / color / mirror / Atom feed
From: gdb-buildbot@sergiodj.net To: gdb-testers@sourceware.org Subject: [binutils-gdb] gdbserver: turn target op 'join' into a method Date: Fri, 28 Feb 2020 09:03:00 -0000 [thread overview] Message-ID: <95a49a3939127a22c2c5e0401d97e00995593bc4@gdb-build> (raw) *** TEST RESULTS FOR COMMIT 95a49a3939127a22c2c5e0401d97e00995593bc4 *** commit 95a49a3939127a22c2c5e0401d97e00995593bc4 Author: Tankut Baris Aktemur <tankut.baris.aktemur@intel.com> AuthorDate: Mon Feb 17 16:11:52 2020 +0100 Commit: Tankut Baris Aktemur <tankut.baris.aktemur@intel.com> CommitDate: Thu Feb 20 17:35:03 2020 +0100 gdbserver: turn target op 'join' into a method gdbserver/ChangeLog: 2020-02-20 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com> Turn process_stratum_target's join op into a method of process_target. * target.h (struct process_stratum_target): Remove the target op. (class process_target): Add the target op. (join_inferior): Update the macro. Update the derived classes and callers below. * linux-low.cc (linux_target_ops): Update. (linux_join): Turn into ... (linux_process_target::join): ... this. * linux-low.h (class linux_process_target): Update. * lynx-low.cc (lynx_target_ops): Update. (lynx_join): Turn into ... (lynx_process_target::join): ... this. * lynx-low.h (class lynx_process_target): Update. * nto-low.cc (nto_target_ops): Update. (nto_process_target::join): Define. * nto-low.h (class nto_process_target): Update. * win32-low.cc (win32_target_ops): Update. (win32_join): Turn into ... (win32_process_target::join): ... this. * win32-low.h (class win32_process_target): Update. diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index eac95ee81e..c283b92565 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,3 +1,30 @@ +2020-02-20 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com> + + Turn process_stratum_target's join op into a method of + process_target. + + * target.h (struct process_stratum_target): Remove the target op. + (class process_target): Add the target op. + (join_inferior): Update the macro. + + Update the derived classes and callers below. + + * linux-low.cc (linux_target_ops): Update. + (linux_join): Turn into ... + (linux_process_target::join): ... this. + * linux-low.h (class linux_process_target): Update. + * lynx-low.cc (lynx_target_ops): Update. + (lynx_join): Turn into ... + (lynx_process_target::join): ... this. + * lynx-low.h (class lynx_process_target): Update. + * nto-low.cc (nto_target_ops): Update. + (nto_process_target::join): Define. + * nto-low.h (class nto_process_target): Update. + * win32-low.cc (win32_target_ops): Update. + (win32_join): Turn into ... + (win32_process_target::join): ... 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 mourn op into a method of diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index 66790ee5ce..39099cb37d 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -1669,8 +1669,8 @@ linux_process_target::mourn (process_info *process) remove_process (process); } -static void -linux_join (int pid) +void +linux_process_target::join (int pid) { int status, ret; @@ -7358,7 +7358,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { - linux_join, linux_thread_alive, linux_resume, linux_wait, diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index 8f43812766..772da9ef30 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -282,6 +282,8 @@ public: int detach (process_info *proc) override; void mourn (process_info *proc) override; + + void join (int 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 558f4aea8d..b2ce1559e8 100644 --- a/gdbserver/lynx-low.cc +++ b/gdbserver/lynx-low.cc @@ -561,8 +561,8 @@ lynx_process_target::mourn (struct process_info *proc) /* Implement the join target_ops method. */ -static void -lynx_join (int pid) +void +lynx_process_target::join (int pid) { /* The PTRACE_DETACH is sufficient to detach from the process. So no need to do anything extra. */ @@ -726,7 +726,6 @@ static lynx_process_target the_lynx_target; /* The LynxOS target_ops vector. */ static process_stratum_target lynx_target_ops = { - lynx_join, lynx_thread_alive, lynx_resume, lynx_wait, diff --git a/gdbserver/lynx-low.h b/gdbserver/lynx-low.h index 6cffe6d811..3f42407a4d 100644 --- a/gdbserver/lynx-low.h +++ b/gdbserver/lynx-low.h @@ -68,6 +68,8 @@ public: int detach (process_info *proc) override; void mourn (process_info *proc) override; + + void join (int 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 263f73d42c..2d6aaa0368 100644 --- a/gdbserver/nto-low.cc +++ b/gdbserver/nto-low.cc @@ -423,6 +423,12 @@ nto_process_target::mourn (struct process_info *process) remove_process (process); } +void +nto_process_target::join (int pid) +{ + error (_("nto target does not implement the join op")); +} + /* Check if the given thread is alive. Return 1 if alive, 0 otherwise. */ @@ -935,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 = { - NULL, /* nto_join */ nto_thread_alive, nto_resume, nto_wait, diff --git a/gdbserver/nto-low.h b/gdbserver/nto-low.h index 69728b8279..6e3471cc15 100644 --- a/gdbserver/nto-low.h +++ b/gdbserver/nto-low.h @@ -58,6 +58,8 @@ public: int detach (process_info *proc) override; void mourn (process_info *proc) override; + + void join (int pid) override; }; /* The inferior's target description. This is a global because the diff --git a/gdbserver/target.h b/gdbserver/target.h index d6b7377722..32905b176d 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,10 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* Wait for process PID to exit. */ - - void (*join) (int pid); - /* Return 1 iff the thread with process ID PID is alive. */ int (*thread_alive) (ptid_t pid); @@ -485,6 +481,9 @@ public: /* The inferior process has died. Do what is right. */ virtual void mourn (process_info *proc) = 0; + + /* Wait for process PID to exit. */ + virtual void join (int pid) = 0; }; extern process_stratum_target *the_target; @@ -534,7 +533,7 @@ int kill_inferior (process_info *proc); (*the_target->store_registers) (regcache, regno) #define join_inferior(pid) \ - (*the_target->join) (pid) + the_target->pt->join (pid) #define target_supports_non_stop() \ (the_target->supports_non_stop ? (*the_target->supports_non_stop ) () : 0) diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index 9bccc1bb9c..0dd1137db8 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -886,8 +886,8 @@ win32_process_target::mourn (struct process_info *process) /* Implementation of target_ops::join. */ -static void -win32_join (int pid) +void +win32_process_target::join (int pid) { HANDLE h = OpenProcess (PROCESS_ALL_ACCESS, FALSE, pid); if (h != NULL) @@ -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_join, win32_thread_alive, win32_resume, win32_wait, diff --git a/gdbserver/win32-low.h b/gdbserver/win32-low.h index d07d99881e..a9da8d3a11 100644 --- a/gdbserver/win32-low.h +++ b/gdbserver/win32-low.h @@ -117,6 +117,8 @@ public: int detach (process_info *proc) override; void mourn (process_info *proc) override; + + void join (int pid) override; }; /* Retrieve the context for this thread, if not already retrieved. */
next reply other threads:[~2020-02-28 7:53 UTC|newest] Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-02-28 9:03 gdb-buildbot [this message] 2020-02-28 8:59 ` Failures on Ubuntu-Aarch64-native-extended-gdbserver-m64, branch master gdb-buildbot 2020-02-28 10:58 ` Failures on Ubuntu-Aarch64-native-gdbserver-m64, " gdb-buildbot 2020-02-29 9:30 ` Failures on Fedora-x86_64-cc-with-index, " gdb-buildbot 2020-02-29 9:56 ` Failures on Fedora-i686, " gdb-buildbot 2020-02-29 10:45 ` Failures on Fedora-x86_64-m64, " gdb-buildbot 2020-02-29 11:02 ` Failures on Fedora-x86_64-native-extended-gdbserver-m64, " gdb-buildbot 2020-02-29 11:02 ` Failures on Fedora-x86_64-native-extended-gdbserver-m32, " gdb-buildbot 2020-02-29 20:19 ` Failures on Fedora-x86_64-native-gdbserver-m64, " gdb-buildbot 2020-03-02 9:53 ` Failures on Fedora-x86_64-native-gdbserver-m32, " gdb-buildbot
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=95a49a3939127a22c2c5e0401d97e00995593bc4@gdb-build \ --to=gdb-buildbot@sergiodj.net \ --cc=gdb-testers@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).