From patchwork Tue Feb 11 09:01:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tankut Baris Aktemur X-Patchwork-Id: 37899 Received: (qmail 117183 invoked by alias); 11 Feb 2020 09:03:24 -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 117096 invoked by uid 89); 11 Feb 2020 09:03:23 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-23.0 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy=8088 X-HELO: mga12.intel.com Received: from mga12.intel.com (HELO mga12.intel.com) (192.55.52.136) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 11 Feb 2020 09:03:18 +0000 Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Feb 2020 01:03:16 -0800 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga008.fm.intel.com with ESMTP; 11 Feb 2020 01:03:16 -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 01B93FLH002102; Tue, 11 Feb 2020 09:03:15 GMT Received: from ulvlx001.iul.intel.com (localhost [127.0.0.1]) by ulvlx001.iul.intel.com with ESMTP id 01B93Frl010377; Tue, 11 Feb 2020 10:03:15 +0100 Received: (from taktemur@localhost) by ulvlx001.iul.intel.com with LOCAL id 01B93FS5010373; Tue, 11 Feb 2020 10:03:15 +0100 From: Tankut Baris Aktemur To: gdb-patches@sourceware.org Subject: [PATCH 05/58] gdbserver: turn target op 'kill' into a method Date: Tue, 11 Feb 2020 10:01:17 +0100 Message-Id: <88f6c67eb79f9b2f79c9344bfdf761c3a861c041.1581410932.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 Make process_stratum_target's kill op 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 structs and callers below. * target.c (kill_inferior): Update. * linux-low.c (linux_target_ops): Update. (linux_kill): Turn into ... (linux_process_target::kill): ... this. * linux-low.h (class linux_process_target): Update. * lynx-low.c (lynx_target_ops): Update. (lynx_kill): Turn into ... (lynx_process_target::kill): ... this. * lynx-low.h (class lynx_process_target): Update. * nto-low.c (nto_target_ops): Update. (nto_kill): Turn into ... (nto_process_target::kill): ... this. * nto-low.h (class nto_process_target): Update. * win32-low.c (win32_target_ops): Update. (win32_kill): Turn into ... (win32_process_target::kill): ... this. * win32-low.h (class win32_process_target): Update. --- gdbserver/linux-low.c | 5 ++--- gdbserver/linux-low.h | 2 ++ gdbserver/lynx-low.c | 5 ++--- gdbserver/lynx-low.h | 2 ++ gdbserver/nto-low.c | 5 ++--- gdbserver/nto-low.h | 2 ++ gdbserver/target.c | 2 +- gdbserver/target.h | 7 +++---- gdbserver/win32-low.c | 5 ++--- gdbserver/win32-low.h | 2 ++ 10 files changed, 20 insertions(+), 17 deletions(-) diff --git a/gdbserver/linux-low.c b/gdbserver/linux-low.c index 8e62ed91a77..3298d142f26 100644 --- a/gdbserver/linux-low.c +++ b/gdbserver/linux-low.c @@ -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 673c5bbc407..636032e3212 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -275,6 +275,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.c b/gdbserver/lynx-low.c index 2e2535e1d61..fb59d5105cb 100644 --- a/gdbserver/lynx-low.c +++ b/gdbserver/lynx-low.c @@ -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 7a3f03fb36e..749b0dee19f 100644 --- a/gdbserver/lynx-low.h +++ b/gdbserver/lynx-low.h @@ -61,6 +61,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.c b/gdbserver/nto-low.c index 47be6eeab86..0af8fb1bcee 100644 --- a/gdbserver/nto-low.c +++ b/gdbserver/nto-low.c @@ -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 e5d2fa83135..fbef01dedc9 100644 --- a/gdbserver/nto-low.h +++ b/gdbserver/nto-low.h @@ -51,6 +51,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.c b/gdbserver/target.c index 81092e81ea4..a9632aa8cd9 100644 --- a/gdbserver/target.c +++ b/gdbserver/target.c @@ -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 a2bbfed5b07..a1e9de15c2a 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. */ @@ -487,6 +483,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.c b/gdbserver/win32-low.c index 1acab18d09f..7c86080ed3b 100644 --- a/gdbserver/win32-low.c +++ b/gdbserver/win32-low.c @@ -808,8 +808,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 (;;) @@ -1828,7 +1828,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 f626db6cf60..c2d5b577e98 100644 --- a/gdbserver/win32-low.h +++ b/gdbserver/win32-low.h @@ -110,6 +110,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. */