aboutsummaryrefslogtreecommitdiff
path: root/gdb/auto-load.h
diff options
context:
space:
mode:
authorMichael Weghorn <m.weghorn@posteo.de>2021-04-27 10:02:42 -0400
committerSimon Marchi <simon.marchi@polymtl.ca>2021-04-27 11:22:32 -0400
commit2c473def12b08100e6b56261f01112db7f6aeab5 (patch)
tree5e2e9f80c07f26ac3f3de8cf509a2fd5db9d8478 /gdb/auto-load.h
parent9a6e099f43a13efb0ee274002de689c2cb1b7e23 (diff)
downloadgdb-2c473def12b08100e6b56261f01112db7f6aeab5.zip
gdb-2c473def12b08100e6b56261f01112db7f6aeab5.tar.gz
gdb-2c473def12b08100e6b56261f01112db7f6aeab5.tar.bz2
gdb: do autoload before notifying Python side in new_objfile event
Without any explicit dependencies specified, the observers attached to the 'gdb::observers::new_objfile' observable are always notified in the order in which they have been attached. The new_objfile observer callback to auto-load scripts is attached in '_initialize_auto_load'. The new_objfile observer callback that propagates the new_objfile event to the Python side is attached in 'gdbpy_initialize_inferior', which is called via '_initialize_python'. With '_initialize_python' happening before '_initialize_auto_load', the consequence was that the new_objfile event was emitted on the Python side before autoloaded scripts had been executed when a new objfile was loaded. As a result, trying to access the objfile's pretty printers (defined in the autoloaded script) from a handler for the Python-side 'new_objfile' event would fail. Those would only be initialized later on (when the 'auto_load_new_objfile' callback was called). To make sure that the objfile passed to the Python event handler is properly initialized (including its 'pretty_printers' member), make sure that the 'auto_load_new_objfile' observer is notified before the 'python_new_objfile' one that propagates the event to the Python side. To do this, make use of the mechanism to explicitly specify dependencies between observers (introduced in a preparatory commit). Add a corresponding testcase that involves a test library with an autoloaded Python script and a handler for the Python 'new_objfile' event. (The real world use case where I came across this issue was in an attempt to extend handling for GDB pretty printers for dynamically loaded objfiles in the Qt Creator IDE, s. [1] and [2] for more background.) [1] https://bugreports.qt.io/browse/QTCREATORBUG-25339 [2] https://codereview.qt-project.org/c/qt-creator/qt-creator/+/333857/1 Tested on x86_64-linux (Debian testing). gdb/ChangeLog: * gdb/auto-load.c (_initialize_auto_load): 'Specify token when attaching the 'auto_load_new_objfile' observer, so other observers can specify it as a dependency. * gdb/auto-load.h (struct token): Declare 'auto_load_new_objfile_observer_token' as token to be used for the 'auto_load_new_objfile' observer. * gdb/python/py-inferior.c (gdbpy_initialize_inferior): Make 'python_new_objfile' observer depend on 'auto_load_new_objfile' observer, so it gets notified after the latter. gdb/testsuite/ChangeLog: * gdb.python/libpy-autoloaded-pretty-printers-in-newobjfile-event.so-gdb.py: New test. * gdb.python/py-autoloaded-pretty-printers-in-newobjfile-event-lib.cc: New test. * gdb.python/py-autoloaded-pretty-printers-in-newobjfile-event-lib.h: New test. * gdb.python/py-autoloaded-pretty-printers-in-newobjfile-event-main.cc: New test. * gdb.python/py-autoloaded-pretty-printers-in-newobjfile-event.exp: New test. * gdb.python/py-autoloaded-pretty-printers-in-newobjfile-event.py: New test. Change-Id: I8275b3f4c3bec32e56dd7892f9a59d89544edf89
Diffstat (limited to 'gdb/auto-load.h')
-rw-r--r--gdb/auto-load.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/gdb/auto-load.h b/gdb/auto-load.h
index f726126..4372ec4 100644
--- a/gdb/auto-load.h
+++ b/gdb/auto-load.h
@@ -25,6 +25,10 @@ struct program_space;
struct auto_load_pspace_info;
struct extension_language_defn;
+namespace gdb::observers {
+struct token;
+}
+
/* Value of the 'set debug auto-load' configuration variable. */
extern bool debug_auto_load;
@@ -40,6 +44,10 @@ extern bool auto_load_local_gdbinit;
extern char *auto_load_local_gdbinit_pathname;
extern bool auto_load_local_gdbinit_loaded;
+/* Token used for the auto_load_new_objfile observer, so other observers can
+ specify it as a dependency. */
+extern gdb::observers::token auto_load_new_objfile_observer_token;
+
extern struct auto_load_pspace_info *
get_auto_load_pspace_data_for_loading (struct program_space *pspace);
extern void auto_load_objfile_script (struct objfile *objfile,