From patchwork Tue Feb 11 09:01:42 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: 37915 Received: (qmail 121282 invoked by alias); 11 Feb 2020 09:03:51 -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 118627 invoked by uid 89); 11 Feb 2020 09:03:32 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-23.9 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=HX-Languages-Length:4879 X-HELO: mga09.intel.com Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 11 Feb 2020 09:03:24 +0000 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Feb 2020 01:03:23 -0800 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga001.fm.intel.com with ESMTP; 11 Feb 2020 01:03:22 -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 01B93Les002229; Tue, 11 Feb 2020 09:03:21 GMT Received: from ulvlx001.iul.intel.com (localhost [127.0.0.1]) by ulvlx001.iul.intel.com with ESMTP id 01B93LxR010555; Tue, 11 Feb 2020 10:03:21 +0100 Received: (from taktemur@localhost) by ulvlx001.iul.intel.com with LOCAL id 01B93LqN010551; Tue, 11 Feb 2020 10:03:21 +0100 From: Tankut Baris Aktemur To: gdb-patches@sourceware.org Subject: [PATCH 30/58] gdbserver: turn target op 'supports_multi_process' into a method Date: Tue, 11 Feb 2020 10:01:42 +0100 Message-Id: <7c45bb1d232f11d7449cfc9404739c146eaa9534.1581410934.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 supports_multi_process op a method of process_target. * target.h (struct process_stratum_target): Remove the target op. (class process_target): Add the target op. * target.c (process_target::supports_multi_process): Define. (target_supports_multi_process): Update. Update the derived structs and callers below. * linux-low.c (linux_target_ops): Update. (linux_supports_multi_process): Turn into ... (linux_process_target::supports_multi_process): ... this. * linux-low.h (class linux_process_target): Update. * lynx-low.c (lynx_target_ops): Update. * nto-low.c (nto_target_ops): Update. * win32-low.c (win32_target_ops): Update. --- gdbserver/linux-low.c | 7 +++---- gdbserver/linux-low.h | 2 ++ gdbserver/lynx-low.c | 1 - gdbserver/nto-low.c | 1 - gdbserver/target.c | 9 +++++++-- gdbserver/target.h | 6 +++--- gdbserver/win32-low.c | 1 - 7 files changed, 15 insertions(+), 12 deletions(-) diff --git a/gdbserver/linux-low.c b/gdbserver/linux-low.c index a13edfd067b..30c65bf0bfd 100644 --- a/gdbserver/linux-low.c +++ b/gdbserver/linux-low.c @@ -6327,10 +6327,10 @@ linux_process_target::start_non_stop (bool nonstop) return 0; } -static int -linux_supports_multi_process (void) +bool +linux_process_target::supports_multi_process () { - return 1; + return true; } /* Check if fork events are supported. */ @@ -7418,7 +7418,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { - linux_supports_multi_process, linux_supports_fork_events, linux_supports_vfork_events, linux_supports_exec_events, diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index 0f1dfa45fba..ed3546f4356 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -366,6 +366,8 @@ public: bool async (bool enable) override; int start_non_stop (bool enable) override; + + bool supports_multi_process () 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 ad2c2f72a73..11179ce3c4e 100644 --- a/gdbserver/lynx-low.c +++ b/gdbserver/lynx-low.c @@ -735,7 +735,6 @@ static lynx_process_target the_lynx_target; /* The LynxOS target_ops vector. */ static process_stratum_target lynx_target_ops = { - NULL, /* supports_multi_process */ NULL, /* supports_fork_events */ NULL, /* supports_vfork_events */ NULL, /* supports_exec_events */ diff --git a/gdbserver/nto-low.c b/gdbserver/nto-low.c index cbbf67af917..a26c6696104 100644 --- a/gdbserver/nto-low.c +++ b/gdbserver/nto-low.c @@ -947,7 +947,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, /* supports_multi_process */ NULL, /* supports_fork_events */ NULL, /* supports_vfork_events */ NULL, /* supports_exec_events */ diff --git a/gdbserver/target.c b/gdbserver/target.c index 33e31a748ef..485eecbee91 100644 --- a/gdbserver/target.c +++ b/gdbserver/target.c @@ -260,8 +260,7 @@ target_continue (ptid_t ptid, enum gdb_signal signal) int target_supports_multi_process (void) { - return (the_target->supports_multi_process != NULL ? - (*the_target->supports_multi_process) () : 0); + return the_target->pt->supports_multi_process (); } void @@ -548,3 +547,9 @@ process_target::start_non_stop (bool enable) else return 0; } + +bool +process_target::supports_multi_process () +{ + return false; +} diff --git a/gdbserver/target.h b/gdbserver/target.h index 88b4762a30c..b9e36af456f 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,9 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* Returns true if the target supports multi-process debugging. */ - int (*supports_multi_process) (void); - /* Returns true if fork events are supported. */ int (*supports_fork_events) (void); @@ -486,6 +483,9 @@ public: /* Switch to non-stop (ENABLE == true) or all-stop (ENABLE == false) mode. Return 0 on success, -1 otherwise. */ virtual int start_non_stop (bool enable); + + /* Returns true if the target supports multi-process debugging. */ + virtual bool supports_multi_process (); }; extern process_stratum_target *the_target; diff --git a/gdbserver/win32-low.c b/gdbserver/win32-low.c index 15431047814..8d6fba16240 100644 --- a/gdbserver/win32-low.c +++ b/gdbserver/win32-low.c @@ -1842,7 +1842,6 @@ win32_sw_breakpoint_from_kind (int kind, int *size) static win32_process_target the_win32_target; static process_stratum_target win32_target_ops = { - NULL, /* supports_multi_process */ NULL, /* supports_fork_events */ NULL, /* supports_vfork_events */ NULL, /* supports_exec_events */