From patchwork Tue Feb 11 09:02:02 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: 37932 Received: (qmail 122967 invoked by alias); 11 Feb 2020 09:04:01 -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 120187 invoked by uid 89); 11 Feb 2020 09:03:43 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-24.5 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= X-HELO: mga14.intel.com Received: from mga14.intel.com (HELO mga14.intel.com) (192.55.52.115) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 11 Feb 2020 09:03:33 +0000 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Feb 2020 01:03:28 -0800 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga001.jf.intel.com with ESMTP; 11 Feb 2020 01:03:26 -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 01B93Qh6002307; Tue, 11 Feb 2020 09:03:26 GMT Received: from ulvlx001.iul.intel.com (localhost [127.0.0.1]) by ulvlx001.iul.intel.com with ESMTP id 01B93QMM010695; Tue, 11 Feb 2020 10:03:26 +0100 Received: (from taktemur@localhost) by ulvlx001.iul.intel.com with LOCAL id 01B93PHF010691; Tue, 11 Feb 2020 10:03:26 +0100 From: Tankut Baris Aktemur To: gdb-patches@sourceware.org Subject: [PATCH 50/58] gdbserver: turn target op 'pid_to_exec_file' into a method Date: Tue, 11 Feb 2020 10:02:02 +0100 Message-Id: <4666cb79e0fd5761eabfc4184fc4339e723b3220.1581410935.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 pid_to_exec_file op a method of process_target. * target.h (struct process_stratum_target): Remove the target op. (class process_target): Add the target op. Also add 'supports_pid_to_exec_file'. * target.c (process_target::pid_to_exec_file): Define. (process_target::supports_pid_to_exec_file): Define. Update the derived structs and callers below. * server.c (handle_qxfer_exec_file): Update. (handle_query): Update. * linux-low.c (linux_target_ops): Update. (linux_process_target::supports_pid_to_exec_file): Define. (linux_process_target::pid_to_exec_file): Define. * 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 | 13 ++++++++++++- gdbserver/linux-low.h | 4 ++++ gdbserver/lynx-low.c | 1 - gdbserver/nto-low.c | 1 - gdbserver/server.c | 6 +++--- gdbserver/target.c | 12 ++++++++++++ gdbserver/target.h | 19 +++++++++++-------- gdbserver/win32-low.c | 1 - 8 files changed, 42 insertions(+), 15 deletions(-) diff --git a/gdbserver/linux-low.c b/gdbserver/linux-low.c index 0d814bd7325..476ad1c5eaa 100644 --- a/gdbserver/linux-low.c +++ b/gdbserver/linux-low.c @@ -6430,6 +6430,18 @@ linux_process_target::supports_range_stepping () return (*the_low_target.supports_range_stepping) (); } +bool +linux_process_target::supports_pid_to_exec_file () +{ + return true; +} + +char * +linux_process_target::pid_to_exec_file (int pid) +{ + return linux_proc_pid_to_exec_file (pid); +} + #if defined PT_GETDSBT || defined PTRACE_GETFDPIC struct target_loadseg { @@ -7460,7 +7472,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { - linux_proc_pid_to_exec_file, linux_mntns_open_cloexec, linux_mntns_unlink, linux_mntns_readlink, diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index f0618758941..cb11c199033 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -451,6 +451,10 @@ public: #endif bool supports_range_stepping () override; + + bool supports_pid_to_exec_file () override; + + char *pid_to_exec_file (int pid) 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 066134d11d6..132087ce7ea 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, /* pid_to_exec_file */ NULL, /* multifs_open */ NULL, /* multifs_unlink */ NULL, /* multifs_readlink */ diff --git a/gdbserver/nto-low.c b/gdbserver/nto-low.c index 142edf71d77..8927293d75d 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, /* pid_to_exec_file */ NULL, /* multifs_open */ NULL, /* multifs_unlink */ NULL, /* multifs_readlink */ diff --git a/gdbserver/server.c b/gdbserver/server.c index 61346e3ce5b..00456d8d7ed 100644 --- a/gdbserver/server.c +++ b/gdbserver/server.c @@ -1462,7 +1462,7 @@ handle_qxfer_exec_file (const char *annex, ULONGEST pid; int total_len; - if (the_target->pid_to_exec_file == NULL || writebuf != NULL) + if (!the_target->pt->supports_pid_to_exec_file () || writebuf != NULL) return -2; if (annex[0] == '\0') @@ -1482,7 +1482,7 @@ handle_qxfer_exec_file (const char *annex, if (pid <= 0) return -1; - file = (*the_target->pid_to_exec_file) (pid); + file = the_target->pt->pid_to_exec_file (pid); if (file == NULL) return -1; @@ -2452,7 +2452,7 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p) if (target_supports_stopped_by_hw_breakpoint ()) strcat (own_buf, ";hwbreak+"); - if (the_target->pid_to_exec_file != NULL) + if (the_target->pt->supports_pid_to_exec_file ()) strcat (own_buf, ";qXfer:exec-file:read+"); strcat (own_buf, ";vContSupported+"); diff --git a/gdbserver/target.c b/gdbserver/target.c index 2c35fe5459b..b1c318f59b8 100644 --- a/gdbserver/target.c +++ b/gdbserver/target.c @@ -759,3 +759,15 @@ process_target::supports_range_stepping () { return false; } + +bool +process_target::supports_pid_to_exec_file () +{ + return false; +} + +char * +process_target::pid_to_exec_file (int pid) +{ + gdb_assert_not_reached ("target op pid_to_exec_file not supported"); +} diff --git a/gdbserver/target.h b/gdbserver/target.h index c0c38331426..6de6c3cdaec 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,14 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* Return the full absolute name of the executable file that was - run to create the process PID. If the executable file cannot - be determined, NULL is returned. Otherwise, a pointer to a - character string containing the pathname is returned. This - string should be copied into a buffer by the client if the string - will not be immediately used, or if it must persist. */ - char *(*pid_to_exec_file) (int pid); - /* Multiple-filesystem-aware open. Like open(2), but operating in the filesystem as it appears to process PID. Systems where all processes share a common filesystem should set this to NULL. @@ -498,6 +490,17 @@ public: /* Return true if target supports range stepping. */ virtual bool supports_range_stepping (); + + /* Return true if the pid_to_exec_file op is supported. */ + virtual bool supports_pid_to_exec_file (); + + /* Return the full absolute name of the executable file that was + run to create the process PID. If the executable file cannot + be determined, NULL is returned. Otherwise, a pointer to a + character string containing the pathname is returned. This + string should be copied into a buffer by the client if the string + will not be immediately used, or if it must persist. */ + virtual char *pid_to_exec_file (int pid); }; extern process_stratum_target *the_target; diff --git a/gdbserver/win32-low.c b/gdbserver/win32-low.c index 55dbc3a3386..d5e15202ae1 100644 --- a/gdbserver/win32-low.c +++ b/gdbserver/win32-low.c @@ -1848,7 +1848,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, /* pid_to_exec_file */ NULL, /* multifs_open */ NULL, /* multifs_unlink */ NULL, /* multifs_readlink */