From: Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
To: gdb-patches@sourceware.org
Subject: [PATCH v3 2/9] gdb/jit: link to jit_objfile_data directly from the objfile struct
Date: Wed, 15 Jul 2020 10:16:30 +0200 [thread overview]
Message-ID: <93d9645d292b89cabe572cbe43c622a514cc06e1.1594799616.git.tankut.baris.aktemur@intel.com> (raw)
In-Reply-To: <cover.1594799616.git.tankut.baris.aktemur@intel.com>
In-Reply-To: <cover.1594799616.git.tankut.baris.aktemur@intel.com>
From: Simon Marchi <simon.marchi@polymtl.ca>
Remove the use of objfile_data to associate a jit_objfile_data with an
objfile. Instead, directly link to a jit_objfile_data from an objfile
struct. The goal is to eliminate unnecessary abstraction.
The free_objfile_data function naturally becomes the destructor of
jit_objfile_data. However, free_objfile_data accesses the objfile to
which the data is attached, which the destructor of jit_objfile_data
doesn't have access to. To work around this, add a backlink to the
owning objfile in jit_objfile_data. This is however temporary, it goes
away in a subsequent patch.
gdb/ChangeLog:
2020-MM-DD Simon Marchi <simon.marchi@polymtl.ca>
* objfiles.h (struct jit_objfile_data): Migrate to here from
jit.c; also add a constructor, destructor, and an objfile* field.
(struct objfile) <jit_data>: New field.
* jit.c (jit_objfile_data): Remove.
(struct jit_objfile_data): Migrate from here to objfiles.h.
(jit_objfile_data::~jit_objfile_data): New destructor
implementation with code moved from free_objfile_data.
(free_objfile_data): Delete.
(get_jit_objfile_data): Update to use the jit_data field of objfile.
(jit_find_objf_with_entry_addr): Ditto.
(jit_inferior_exit_hook): Ditto.
(_initialize_jit): Remove the call to
register_objfile_data_with_cleanup.
---
gdb/jit.c | 89 +++++++++++++-------------------------------------
gdb/objfiles.h | 31 ++++++++++++++++++
2 files changed, 54 insertions(+), 66 deletions(-)
diff --git a/gdb/jit.c b/gdb/jit.c
index 41ed81ab4b0..af0c9299708 100644
--- a/gdb/jit.c
+++ b/gdb/jit.c
@@ -45,8 +45,6 @@
static std::string jit_reader_dir;
-static const struct objfile_data *jit_objfile_data;
-
static const char *const jit_break_name = "__jit_debug_register_code";
static const char *const jit_descriptor_name = "__jit_debug_descriptor";
@@ -265,24 +263,25 @@ struct jit_program_space_data
static program_space_key<jit_program_space_data> jit_program_space_key;
-/* Per-objfile structure recording the addresses in the program space.
- This object serves two purposes: for ordinary objfiles, it may
- cache some symbols related to the JIT interface; and for
- JIT-created objfiles, it holds some information about the
- jit_code_entry. */
+/* Destructor for jit_objfile_data. */
-struct jit_objfile_data
+jit_objfile_data::~jit_objfile_data ()
{
- /* Symbol for __jit_debug_register_code. */
- struct minimal_symbol *register_code;
-
- /* Symbol for __jit_debug_descriptor. */
- struct minimal_symbol *descriptor;
+ /* Free the data allocated in the jit_program_space_data slot. */
+ if (this->register_code != NULL)
+ {
+ struct jit_program_space_data *ps_data;
- /* Address of struct jit_code_entry in this objfile. This is only
- non-zero for objfiles that represent code created by the JIT. */
- CORE_ADDR addr;
-};
+ ps_data = jit_program_space_key.get (this->objfile->pspace);
+ if (ps_data != NULL && ps_data->objfile == this->objfile)
+ {
+ ps_data->objfile = NULL;
+ if (ps_data->jit_breakpoint != NULL)
+ delete_breakpoint (ps_data->jit_breakpoint);
+ ps_data->cached_code_address = 0;
+ }
+ }
+}
/* Fetch the jit_objfile_data associated with OBJF. If no data exists
yet, make a new structure and attach it. */
@@ -290,16 +289,10 @@ struct jit_objfile_data
static struct jit_objfile_data *
get_jit_objfile_data (struct objfile *objf)
{
- struct jit_objfile_data *objf_data;
-
- objf_data = (struct jit_objfile_data *) objfile_data (objf, jit_objfile_data);
- if (objf_data == NULL)
- {
- objf_data = XCNEW (struct jit_objfile_data);
- set_objfile_data (objf, jit_objfile_data, objf_data);
- }
+ if (objf->jit_data == nullptr)
+ objf->jit_data.reset (new jit_objfile_data (objf));
- return objf_data;
+ return objf->jit_data.get ();
}
/* Remember OBJFILE has been created for struct jit_code_entry located
@@ -914,14 +907,9 @@ static struct objfile *
jit_find_objf_with_entry_addr (CORE_ADDR entry_addr)
{
for (objfile *objf : current_program_space->objfiles ())
- {
- struct jit_objfile_data *objf_data;
+ if (objf->jit_data != nullptr && objf->jit_data->addr == entry_addr)
+ return objf;
- objf_data
- = (struct jit_objfile_data *) objfile_data (objf, jit_objfile_data);
- if (objf_data != NULL && objf_data->addr == entry_addr)
- return objf;
- }
return NULL;
}
@@ -1324,13 +1312,8 @@ static void
jit_inferior_exit_hook (struct inferior *inf)
{
for (objfile *objf : current_program_space->objfiles_safe ())
- {
- struct jit_objfile_data *objf_data
- = (struct jit_objfile_data *) objfile_data (objf, jit_objfile_data);
-
- if (objf_data != NULL && objf_data->addr != 0)
- objf->unlink ();
- }
+ if (objf->jit_data != nullptr && objf->jit_data->addr != 0)
+ objf->unlink ();
}
void
@@ -1371,30 +1354,6 @@ jit_event_handler (gdbarch *gdbarch, objfile *jiter)
}
}
-/* Called to free the data allocated to the jit_program_space_data slot. */
-
-static void
-free_objfile_data (struct objfile *objfile, void *data)
-{
- struct jit_objfile_data *objf_data = (struct jit_objfile_data *) data;
-
- if (objf_data->register_code != NULL)
- {
- struct jit_program_space_data *ps_data;
-
- ps_data = jit_program_space_key.get (objfile->pspace);
- if (ps_data != NULL && ps_data->objfile == objfile)
- {
- ps_data->objfile = NULL;
- if (ps_data->jit_breakpoint != NULL)
- delete_breakpoint (ps_data->jit_breakpoint);
- ps_data->cached_code_address = 0;
- }
- }
-
- xfree (data);
-}
-
/* Initialize the jit_gdbarch_data slot with an instance of struct
jit_gdbarch_data_type */
@@ -1427,8 +1386,6 @@ _initialize_jit ()
gdb::observers::inferior_exit.attach (jit_inferior_exit_hook);
gdb::observers::breakpoint_deleted.attach (jit_breakpoint_deleted);
- jit_objfile_data =
- register_objfile_data_with_cleanup (NULL, free_objfile_data);
jit_gdbarch_data = gdbarch_data_register_pre_init (jit_gdbarch_data_init);
if (is_dl_available ())
{
diff --git a/gdb/objfiles.h b/gdb/objfiles.h
index 56ff52119dc..6bb4dd0a1d6 100644
--- a/gdb/objfiles.h
+++ b/gdb/objfiles.h
@@ -407,6 +407,34 @@ class separate_debug_range
struct objfile *m_objfile;
};
+/* Per-objfile structure recording the addresses in the program space.
+ This object serves two purposes: for ordinary objfiles, it may
+ cache some symbols related to the JIT interface; and for
+ JIT-created objfiles, it holds some information about the
+ jit_code_entry. */
+
+struct jit_objfile_data
+{
+ jit_objfile_data (struct objfile *objfile)
+ : objfile (objfile)
+ {}
+
+ ~jit_objfile_data ();
+
+ /* Back-link to the objfile. */
+ struct objfile *objfile;
+
+ /* Symbol for __jit_debug_register_code. */
+ minimal_symbol *register_code = nullptr;
+
+ /* Symbol for __jit_debug_descriptor. */
+ minimal_symbol *descriptor = nullptr;
+
+ /* Address of struct jit_code_entry in this objfile. This is only
+ non-zero for objfiles that represent code created by the JIT. */
+ CORE_ADDR addr = 0;
+};
+
/* Master structure for keeping track of each file from which
gdb reads symbols. There are several ways these get allocated: 1.
The main symbol file, symfile_objfile, set by the symbol-file command,
@@ -697,6 +725,9 @@ struct objfile
store these here rather than in struct block. Static links must be
allocated on the objfile's obstack. */
htab_up static_links;
+
+ /* JIT-related data for this objfile. */
+ std::unique_ptr<jit_objfile_data> jit_data = nullptr;
};
/* A deleter for objfile. */
--
2.17.1
next prev parent reply other threads:[~2020-07-15 8:17 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-15 8:16 [PATCH v3 0/9] Handling multiple JITers Tankut Baris Aktemur
2020-07-15 8:16 ` [PATCH v3 1/9] gdb/jit: pass the jiter objfile as an argument to jit_event_handler Tankut Baris Aktemur
2020-07-15 13:48 ` Simon Marchi
2020-07-21 16:24 ` Aktemur, Tankut Baris
2020-07-15 8:16 ` Tankut Baris Aktemur [this message]
2020-07-15 14:16 ` [PATCH v3 2/9] gdb/jit: link to jit_objfile_data directly from the objfile struct Simon Marchi
2020-07-21 16:25 ` Aktemur, Tankut Baris
2020-07-21 17:42 ` Simon Marchi
2020-07-15 8:16 ` [PATCH v3 3/9] gdb/jit: split jit_objfile_data in two Tankut Baris Aktemur
2020-07-15 14:19 ` Simon Marchi
2020-07-21 16:24 ` Aktemur, Tankut Baris
2020-07-15 8:16 ` [PATCH v3 4/9] gdb/jit: apply some simplifications and assertions Tankut Baris Aktemur
2020-07-15 8:16 ` [PATCH v3 5/9] gdb/jit: move cached_code_address and jit_breakpoint to jiter_objfile_data Tankut Baris Aktemur
2020-07-15 8:16 ` [PATCH v3 6/9] gdb/jit: enable tracking multiple JITer objfiles Tankut Baris Aktemur
2020-07-15 8:16 ` [PATCH v3 7/9] gdb/jit: remove jiter_objfile_data -> objfile back-link Tankut Baris Aktemur
2020-07-15 8:16 ` [PATCH v3 8/9] gdb/jit: apply minor cleanup and modernization Tankut Baris Aktemur
2020-07-15 8:16 ` [PATCH v3 9/9] gdb/jit: skip jit symbol lookup if already detected the symbols don't exist Tankut Baris Aktemur
2020-07-19 15:44 ` [PATCH v3 0/9] Handling multiple JITers Simon Marchi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=93d9645d292b89cabe572cbe43c622a514cc06e1.1594799616.git.tankut.baris.aktemur@intel.com \
--to=tankut.baris.aktemur@intel.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).