From 06424eac62da949519c0c641fbc3e8372a9c7f0b Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 29 May 2018 13:51:58 -0600 Subject: [PATCH] Remove resume_section_map_updates_cleanup This removes resume_section_map_updates_cleanup, replacing it with a scoped_restore. Tested by the buildbot. gdb/ChangeLog 2018-06-18 Tom Tromey * objfiles.h (inhibit_section_map_updates): Update. (resume_section_map_updates, resume_section_map_updates_cleanup): Remove. * solib-svr4.c (svr4_handle_solib_event): Update. * objfiles.c (inhibit_section_map_updates): Return scoped_restore_tmpl. (resume_section_map_updates, resume_section_map_updates_cleanup): Remove. --- gdb/ChangeLog | 11 ++++++ gdb/objfiles.c | 21 ++-------- gdb/objfiles.h | 19 ++++----- gdb/solib-svr4.c | 117 ++++++++++++++++++++++++++++--------------------------- 4 files changed, 80 insertions(+), 88 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8b09a72..553bc8a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,16 @@ 2018-06-18 Tom Tromey + * objfiles.h (inhibit_section_map_updates): Update. + (resume_section_map_updates, resume_section_map_updates_cleanup): + Remove. + * solib-svr4.c (svr4_handle_solib_event): Update. + * objfiles.c (inhibit_section_map_updates): Return + scoped_restore_tmpl. + (resume_section_map_updates, resume_section_map_updates_cleanup): + Remove. + +2018-06-18 Tom Tromey + * valprint.h (read_string): Update. * valprint.c (read_string): Change type of "buffer". (val_print_string): Update. diff --git a/gdb/objfiles.c b/gdb/objfiles.c index 0432ce6..95c39cf 100644 --- a/gdb/objfiles.c +++ b/gdb/objfiles.c @@ -1455,26 +1455,11 @@ objfiles_changed (void) /* See comments in objfiles.h. */ -void +scoped_restore_tmpl inhibit_section_map_updates (struct program_space *pspace) { - get_objfile_pspace_data (pspace)->inhibit_updates = 1; -} - -/* See comments in objfiles.h. */ - -void -resume_section_map_updates (struct program_space *pspace) -{ - get_objfile_pspace_data (pspace)->inhibit_updates = 0; -} - -/* See comments in objfiles.h. */ - -void -resume_section_map_updates_cleanup (void *arg) -{ - resume_section_map_updates ((struct program_space *) arg); + return scoped_restore_tmpl + (&get_objfile_pspace_data (pspace)->inhibit_updates, 1); } /* Return 1 if ADDR maps into one of the sections of OBJFILE and 0 diff --git a/gdb/objfiles.h b/gdb/objfiles.h index 28e66ec..7a9087b 100644 --- a/gdb/objfiles.h +++ b/gdb/objfiles.h @@ -551,18 +551,13 @@ DECLARE_REGISTRY(objfile); /* In normal use, the section map will be rebuilt by find_pc_section if objfiles have been added, removed or relocated since it was last called. Calling inhibit_section_map_updates will inhibit this - behavior until resume_section_map_updates is called. If you call - inhibit_section_map_updates you must ensure that every call to - find_pc_section in the inhibited region relates to a section that - is already in the section map and has not since been removed or - relocated. */ -extern void inhibit_section_map_updates (struct program_space *pspace); - -/* Resume automatically rebuilding the section map as required. */ -extern void resume_section_map_updates (struct program_space *pspace); - -/* Version of the above suitable for use as a cleanup. */ -extern void resume_section_map_updates_cleanup (void *arg); + behavior until the returned scoped_restore object is destroyed. If + you call inhibit_section_map_updates you must ensure that every + call to find_pc_section in the inhibited region relates to a + section that is already in the section map and has not since been + removed or relocated. */ +extern scoped_restore_tmpl inhibit_section_map_updates + (struct program_space *pspace); extern void default_iterate_over_objfiles_in_search_order (struct gdbarch *gdbarch, diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c index d012f08..6f48c68 100644 --- a/gdb/solib-svr4.c +++ b/gdb/solib-svr4.c @@ -1858,7 +1858,7 @@ svr4_handle_solib_event (void) struct svr4_info *info = get_svr4_info (); struct probe_and_action *pa; enum probe_action action; - struct cleanup *old_chain, *usm_chain; + struct cleanup *old_chain; struct value *val = NULL; CORE_ADDR pc, debug_base, lm = 0; struct frame_info *frame = get_current_frame (); @@ -1902,72 +1902,73 @@ svr4_handle_solib_event (void) so we can guarantee that the dynamic linker's sections are in the section map. We can therefore inhibit section map updates across these calls to evaluate_argument and save a lot of time. */ - inhibit_section_map_updates (current_program_space); - usm_chain = make_cleanup (resume_section_map_updates_cleanup, - current_program_space); + { + scoped_restore inhibit_updates + = inhibit_section_map_updates (current_program_space); - TRY - { - val = pa->prob->evaluate_argument (1, frame); - } - CATCH (ex, RETURN_MASK_ERROR) - { - exception_print (gdb_stderr, ex); - val = NULL; - } - END_CATCH + TRY + { + val = pa->prob->evaluate_argument (1, frame); + } + CATCH (ex, RETURN_MASK_ERROR) + { + exception_print (gdb_stderr, ex); + val = NULL; + } + END_CATCH - if (val == NULL) - { - do_cleanups (old_chain); - return; - } + if (val == NULL) + { + do_cleanups (old_chain); + return; + } - debug_base = value_as_address (val); - if (debug_base == 0) - { - do_cleanups (old_chain); - return; - } + debug_base = value_as_address (val); + if (debug_base == 0) + { + do_cleanups (old_chain); + return; + } - /* Always locate the debug struct, in case it moved. */ - info->debug_base = 0; - if (locate_base (info) == 0) - { - do_cleanups (old_chain); - return; - } + /* Always locate the debug struct, in case it moved. */ + info->debug_base = 0; + if (locate_base (info) == 0) + { + do_cleanups (old_chain); + return; + } - /* GDB does not currently support libraries loaded via dlmopen - into namespaces other than the initial one. We must ignore - any namespace other than the initial namespace here until - support for this is added to GDB. */ - if (debug_base != info->debug_base) - action = DO_NOTHING; + /* GDB does not currently support libraries loaded via dlmopen + into namespaces other than the initial one. We must ignore + any namespace other than the initial namespace here until + support for this is added to GDB. */ + if (debug_base != info->debug_base) + action = DO_NOTHING; - if (action == UPDATE_OR_RELOAD) - { - TRY - { - val = pa->prob->evaluate_argument (2, frame); - } - CATCH (ex, RETURN_MASK_ERROR) - { - exception_print (gdb_stderr, ex); - do_cleanups (old_chain); - return; - } - END_CATCH + if (action == UPDATE_OR_RELOAD) + { + TRY + { + val = pa->prob->evaluate_argument (2, frame); + } + CATCH (ex, RETURN_MASK_ERROR) + { + exception_print (gdb_stderr, ex); + do_cleanups (old_chain); + return; + } + END_CATCH - if (val != NULL) - lm = value_as_address (val); + if (val != NULL) + lm = value_as_address (val); - if (lm == 0) - action = FULL_RELOAD; - } + if (lm == 0) + action = FULL_RELOAD; + } - /* Resume section map updates. */ - do_cleanups (usm_chain); + /* Resume section map updates. Closing the scope is + sufficient. */ + } if (action == UPDATE_OR_RELOAD) { -- 2.7.4