From patchwork Mon Feb 17 16:57:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Aktemur, Tankut Baris" X-Patchwork-Id: 38137 Received: (qmail 110901 invoked by alias); 17 Feb 2020 16:59:32 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 110741 invoked by uid 89); 17 Feb 2020 16:59:31 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.0 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.1 spammy=thr, sk:linux_p, the_target, linux-low.h X-HELO: mga03.intel.com Received: from mga03.intel.com (HELO mga03.intel.com) (134.134.136.65) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 17 Feb 2020 16:59:22 +0000 Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Feb 2020 08:59:20 -0800 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga007.fm.intel.com with ESMTP; 17 Feb 2020 08:59:19 -0800 Received: from ulvlx001.iul.intel.com (ulvlx001.iul.intel.com [172.28.207.17]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id 01HGxITt028157; Mon, 17 Feb 2020 16:59:18 GMT Received: from ulvlx001.iul.intel.com (localhost [127.0.0.1]) by ulvlx001.iul.intel.com with ESMTP id 01HGxIgK026971; Mon, 17 Feb 2020 17:59:18 +0100 Received: (from taktemur@localhost) by ulvlx001.iul.intel.com with LOCAL id 01HGxI0Z026967; Mon, 17 Feb 2020 17:59:18 +0100 From: Tankut Baris Aktemur To: gdb-patches@sourceware.org Cc: palves@redhat.com Subject: [PATCH v2 05/58] gdbserver: turn target op 'kill' into a method Date: Mon, 17 Feb 2020 17:57:13 +0100 Message-Id: <0d5af59a12021a548325aded2af044d132d08498.1581956646.git.tankut.baris.aktemur@intel.com> In-Reply-To: References: In-Reply-To: References: X-IsSubscribed: yes gdbserver/ChangeLog: 2020-02-10 Tankut Baris Aktemur Turn process_stratum_target's kill op into a method of process_target. * target.h (struct process_stratum_target): Remove the target op. (class process_target): Add the target op. Update the derived classes and callers below. * target.cc (kill_inferior): Update. * linux-low.cc (linux_target_ops): Update. (linux_kill): Turn into ... (linux_process_target::kill): ... this. * linux-low.h (class linux_process_target): Update. * lynx-low.cc (lynx_target_ops): Update. (lynx_kill): Turn into ... (lynx_process_target::kill): ... this. * lynx-low.h (class lynx_process_target): Update. * nto-low.cc (nto_target_ops): Update. (nto_kill): Turn into ... (nto_process_target::kill): ... this. * nto-low.h (class nto_process_target): Update. * win32-low.cc (win32_target_ops): Update. (win32_kill): Turn into ... (win32_process_target::kill): ... this. * win32-low.h (class win32_process_target): Update. --- gdbserver/linux-low.cc | 5 ++--- gdbserver/linux-low.h | 2 ++ gdbserver/lynx-low.cc | 5 ++--- gdbserver/lynx-low.h | 2 ++ gdbserver/nto-low.cc | 5 ++--- gdbserver/nto-low.h | 2 ++ gdbserver/target.cc | 2 +- gdbserver/target.h | 7 +++---- gdbserver/win32-low.cc | 5 ++--- gdbserver/win32-low.h | 2 ++ 10 files changed, 20 insertions(+), 17 deletions(-) diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index aae29306df6..4510e3a1c5f 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -1386,8 +1386,8 @@ kill_one_lwp_callback (thread_info *thread, int pid) kill_wait_lwp (lwp); } -static int -linux_kill (process_info *process) +int +linux_process_target::kill (process_info *process) { int pid = process->pid; @@ -7359,7 +7359,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { - linux_kill, linux_detach, linux_mourn, linux_join, diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index 5458a9b99b9..4f8801150d5 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -276,6 +276,8 @@ public: void post_create_inferior () override; int attach (unsigned long pid) override; + + int kill (process_info *proc) 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 60abc75d8da..f6359e81575 100644 --- a/gdbserver/lynx-low.cc +++ b/gdbserver/lynx-low.cc @@ -521,8 +521,8 @@ lynx_wait (ptid_t ptid, struct target_waitstatus *status, int options) /* Implement the kill target_ops method. */ -static int -lynx_kill (process_info *process) +int +lynx_process_target::kill (process_info *process) { ptid_t ptid = lynx_ptid_t (process->pid, 0); struct target_waitstatus status; @@ -726,7 +726,6 @@ static lynx_process_target the_lynx_target; /* The LynxOS target_ops vector. */ static process_stratum_target lynx_target_ops = { - lynx_kill, lynx_detach, lynx_mourn, lynx_join, diff --git a/gdbserver/lynx-low.h b/gdbserver/lynx-low.h index 142a774011c..cf357ff9a1f 100644 --- a/gdbserver/lynx-low.h +++ b/gdbserver/lynx-low.h @@ -62,6 +62,8 @@ public: const std::vector &program_args) override; int attach (unsigned long pid) override; + + int kill (process_info *proc) 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 77b5fce4c50..15b3dc37f01 100644 --- a/gdbserver/nto-low.cc +++ b/gdbserver/nto-low.cc @@ -396,8 +396,8 @@ nto_process_target::attach (unsigned long pid) /* Send signal to process PID. */ -static int -nto_kill (process_info *proc) +int +nto_process_target::kill (process_info *proc) { int pid = proc->pid; @@ -935,7 +935,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_kill, nto_detach, nto_mourn, NULL, /* nto_join */ diff --git a/gdbserver/nto-low.h b/gdbserver/nto-low.h index f6faacb425e..5564dda3bb2 100644 --- a/gdbserver/nto-low.h +++ b/gdbserver/nto-low.h @@ -52,6 +52,8 @@ public: const std::vector &program_args) override; int attach (unsigned long pid) override; + + int kill (process_info *proc) override; }; /* The inferior's target description. This is a global because the diff --git a/gdbserver/target.cc b/gdbserver/target.cc index 81092e81ea4..a9632aa8cd9 100644 --- a/gdbserver/target.cc +++ b/gdbserver/target.cc @@ -319,7 +319,7 @@ kill_inferior (process_info *proc) { gdb_agent_about_to_close (proc->pid); - return (*the_target->kill) (proc); + return the_target->pt->kill (proc); } /* Target can do hardware single step. */ diff --git a/gdbserver/target.h b/gdbserver/target.h index bd99737d4f1..0f3cb35f453 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,10 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* Kill process PROC. Return -1 on failure, and 0 on success. */ - - int (*kill) (process_info *proc); - /* Detach from process PROC. Return -1 on failure, and 0 on success. */ @@ -488,6 +484,9 @@ public: Returns -1 if attaching is unsupported, 0 on success, and calls error() otherwise. */ virtual int attach (unsigned long pid) = 0; + + /* Kill process PROC. Return -1 on failure, and 0 on success. */ + virtual int kill (process_info *proc) = 0; }; extern process_stratum_target *the_target; diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index 0e7c1640522..a7fb1244e34 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -819,8 +819,8 @@ win32_clear_inferiors (void) /* Implementation of target_ops::kill. */ -static int -win32_kill (process_info *process) +int +win32_process_target::kill (process_info *process) { TerminateProcess (current_process_handle, 0); for (;;) @@ -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_kill, win32_detach, win32_mourn, win32_join, diff --git a/gdbserver/win32-low.h b/gdbserver/win32-low.h index fd6662dcab2..45a6262e38e 100644 --- a/gdbserver/win32-low.h +++ b/gdbserver/win32-low.h @@ -111,6 +111,8 @@ public: const std::vector &program_args) override; int attach (unsigned long pid) override; + + int kill (process_info *proc) override; }; /* Retrieve the context for this thread, if not already retrieved. */