From patchwork Tue Feb 11 09:01:41 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: 37924 Received: (qmail 122033 invoked by alias); 11 Feb 2020 09:03:56 -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 119403 invoked by uid 89); 11 Feb 2020 09:03:38 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-24.2 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=Forcing X-HELO: mga04.intel.com Received: from mga04.intel.com (HELO mga04.intel.com) (192.55.52.120) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 11 Feb 2020 09:03:28 +0000 Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Feb 2020 01:03:22 -0800 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga006.fm.intel.com with ESMTP; 11 Feb 2020 01:03:21 -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 01B93LJM002226; 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 01B93LUO010548; Tue, 11 Feb 2020 10:03:21 +0100 Received: (from taktemur@localhost) by ulvlx001.iul.intel.com with LOCAL id 01B93KWG010544; Tue, 11 Feb 2020 10:03:21 +0100 From: Tankut Baris Aktemur To: gdb-patches@sourceware.org Subject: [PATCH 29/58] gdbserver: turn non-stop and async target ops into methods Date: Tue, 11 Feb 2020 10:01:41 +0100 Message-Id: <8a8f4a556c9c0344bbeffb262489503bb998dea6.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_non_stop, async, and start_non_stop ops methods of process_target. * target.h (struct process_stratum_target): Remove the target ops. (class process_target): Add the target ops. (target_supports_non_stop): Update the macro. (target_async): Update the macro. (start_non_stop): Remove declaration. * target.c (process_target::supports_non_stop): Define. (process_target::async): Define. (process_target::start_non_stop): Define. (start_non_stop): Remove. Update the derived structs and callers below. * server.c (handle_qxfer_siginfo): Update. (handle_query): Update. * linux-low.c (linux_target_ops): Update. (linux_supports_non_stop): Turn into ... (linux_process_target::supports_non_stop): ... this. (linux_async): Turn into ... (linux_process_target::async): ... this. (linux_start_non_stop): Turn into ... (linux_process_target::start_non_stop): ... this. * linux-low.h (class linux_process_target): Update. * lynx-low.c (lynx_target_ops): Update. * nto-low.c (nto_target_ops): Update. (nto_supports_non_stop): Remove; rely on the default behavior instead. * win32-low.c (win32_target_ops): Update. --- gdbserver/linux-low.c | 23 ++++++++++------------- gdbserver/linux-low.h | 6 ++++++ gdbserver/lynx-low.c | 3 --- gdbserver/nto-low.c | 12 ------------ gdbserver/server.c | 6 +++--- gdbserver/target.c | 35 +++++++++++++++++++++-------------- gdbserver/target.h | 29 +++++++++++++---------------- gdbserver/win32-low.c | 3 --- 8 files changed, 53 insertions(+), 64 deletions(-) diff --git a/gdbserver/linux-low.c b/gdbserver/linux-low.c index 387e160b8de..a13edfd067b 100644 --- a/gdbserver/linux-low.c +++ b/gdbserver/linux-low.c @@ -6254,16 +6254,16 @@ sigchld_handler (int signo) errno = old_errno; } -static int -linux_supports_non_stop (void) +bool +linux_process_target::supports_non_stop () { - return 1; + return true; } -static int -linux_async (int enable) +bool +linux_process_target::async (bool enable) { - int previous = target_is_async_p (); + bool previous = target_is_async_p (); if (debug_threads) debug_printf ("linux_async (%d), previous=%d\n", @@ -6315,13 +6315,13 @@ linux_async (int enable) return previous; } -static int -linux_start_non_stop (int nonstop) +int +linux_process_target::start_non_stop (bool nonstop) { /* Register or unregister from event-loop accordingly. */ - linux_async (nonstop); + target_async (nonstop); - if (target_is_async_p () != (nonstop != 0)) + if (target_is_async_p () != (nonstop != false)) return -1; return 0; @@ -7418,9 +7418,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { - linux_supports_non_stop, - linux_async, - linux_start_non_stop, linux_supports_multi_process, linux_supports_fork_events, linux_supports_vfork_events, diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index a008dac66f4..0f1dfa45fba 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -360,6 +360,12 @@ public: int qxfer_siginfo (const char *annex, unsigned char *readbuf, unsigned const char *writebuf, CORE_ADDR offset, int len) override; + + bool supports_non_stop () override; + + bool async (bool enable) override; + + int start_non_stop (bool enable) 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 d45e598cb26..ad2c2f72a73 100644 --- a/gdbserver/lynx-low.c +++ b/gdbserver/lynx-low.c @@ -735,9 +735,6 @@ static lynx_process_target the_lynx_target; /* The LynxOS target_ops vector. */ static process_stratum_target lynx_target_ops = { - NULL, /* supports_non_stop */ - NULL, /* async */ - NULL, /* start_non_stop */ NULL, /* supports_multi_process */ NULL, /* supports_fork_events */ NULL, /* supports_vfork_events */ diff --git a/gdbserver/nto-low.c b/gdbserver/nto-low.c index 4d3ef38a976..cbbf67af917 100644 --- a/gdbserver/nto-low.c +++ b/gdbserver/nto-low.c @@ -933,15 +933,6 @@ nto_process_target::stopped_data_address () return ret; } -/* We do not currently support non-stop. */ - -static int -nto_supports_non_stop (void) -{ - TRACE ("%s\n", __func__); - return 0; -} - /* Implementation of the target_ops method "sw_breakpoint_from_kind". */ static const gdb_byte * @@ -956,9 +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 = { - nto_supports_non_stop, - NULL, /* async */ - NULL, /* start_non_stop */ NULL, /* supports_multi_process */ NULL, /* supports_fork_events */ NULL, /* supports_vfork_events */ diff --git a/gdbserver/server.c b/gdbserver/server.c index ece75f01868..f427e7706fb 100644 --- a/gdbserver/server.c +++ b/gdbserver/server.c @@ -740,7 +740,7 @@ handle_general_set (char *own_buf) } req_str = req ? "non-stop" : "all-stop"; - if (start_non_stop (req) != 0) + if (the_target->pt->start_non_stop (req == 1) != 0) { fprintf (stderr, "Setting %s mode failed\n", req_str); write_enn (own_buf); @@ -1234,7 +1234,7 @@ handle_detach (char *own_buf) debug_printf ("Forcing non-stop mode\n"); non_stop = true; - start_non_stop (1); + the_target->pt->start_non_stop (true); } process->gdb_detached = 1; @@ -3885,7 +3885,7 @@ captured_main (int argc, char *argv[]) down without informing GDB. */ if (!non_stop) { - if (start_non_stop (1)) + if (the_target->pt->start_non_stop (true)) non_stop = 1; /* Detaching implicitly resumes all threads; diff --git a/gdbserver/target.c b/gdbserver/target.c index 94bb45fcace..33e31a748ef 100644 --- a/gdbserver/target.c +++ b/gdbserver/target.c @@ -264,20 +264,6 @@ target_supports_multi_process (void) (*the_target->supports_multi_process) () : 0); } -int -start_non_stop (int nonstop) -{ - if (the_target->start_non_stop == NULL) - { - if (nonstop) - return -1; - else - return 0; - } - - return (*the_target->start_non_stop) (nonstop); -} - void set_target_ops (process_stratum_target *target) { @@ -541,3 +527,24 @@ process_target::qxfer_siginfo (const char *annex, unsigned char *readbuf, { gdb_assert_not_reached ("target op qxfer_siginfo not supported"); } + +bool +process_target::supports_non_stop () +{ + return false; +} + +bool +process_target::async (bool enable) +{ + return false; +} + +int +process_target::start_non_stop (bool enable) +{ + if (enable) + return -1; + else + return 0; +} diff --git a/gdbserver/target.h b/gdbserver/target.h index bec147de089..88b4762a30c 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,16 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - int (*supports_non_stop) (void); - - /* Enables async target events. Returns the previous enable - state. */ - int (*async) (int enable); - - /* Switch to non-stop (1) or all-stop (0) mode. Return 0 on - success, -1 otherwise. */ - int (*start_non_stop) (int); - /* Returns true if the target supports multi-process debugging. */ int (*supports_multi_process) (void); @@ -485,6 +475,17 @@ public: virtual int qxfer_siginfo (const char *annex, unsigned char *readbuf, unsigned const char *writebuf, CORE_ADDR offset, int len); + + /* Return true if non-stop mode is supported. */ + virtual bool supports_non_stop (); + + /* Enables async target events. Returns the previous enable + state. */ + virtual bool async (bool enable); + + /* 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); }; extern process_stratum_target *the_target; @@ -537,10 +538,10 @@ int kill_inferior (process_info *proc); the_target->pt->join (pid) #define target_supports_non_stop() \ - (the_target->supports_non_stop ? (*the_target->supports_non_stop ) () : 0) + the_target->pt->supports_non_stop () #define target_async(enable) \ - (the_target->async ? (*the_target->async) (enable) : 0) + the_target->pt->async (enable) #define target_process_qsupported(features, count) \ do \ @@ -696,10 +697,6 @@ target_read_btrace_conf (struct btrace_target_info *tinfo, (the_target->supports_software_single_step ? \ (*the_target->supports_software_single_step) () : 0) -/* Start non-stop mode, returns 0 on success, -1 on failure. */ - -int start_non_stop (int nonstop); - ptid_t mywait (ptid_t ptid, struct target_waitstatus *ourstatus, int options, int connected_wait); diff --git a/gdbserver/win32-low.c b/gdbserver/win32-low.c index 45fd49458e7..15431047814 100644 --- a/gdbserver/win32-low.c +++ b/gdbserver/win32-low.c @@ -1842,9 +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_non_stop */ - NULL, /* async */ - NULL, /* start_non_stop */ NULL, /* supports_multi_process */ NULL, /* supports_fork_events */ NULL, /* supports_vfork_events */