From 9be259865c640210969765f8d2803b36a9df3487 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Fri, 18 Jun 2021 12:00:38 -0400 Subject: gdb: introduce iterator_range, remove next_adapter I was always a bit confused by next_adapter, because it kind of mixes the element type and the iterator type. In reality, it is not much more than a class that wraps two iterators (begin and end). However, it assumes that: - you can construct the begin iterator by passing a pointer to the first element of the iterable - you can default-construct iterator to make the end iterator I think that by generalizing it a little bit, we can re-use it at more places. Rename it to "iterator_range". I think it describes a bit better: it's a range made by wrapping a begin and end iterator. Move it to its own file, since it's not related to next_iterator anymore. iterator_range has two constructors. The variadic one, where arguments are forwarded to construct the underlying begin iterator. The end iterator is constructed through default construction. This is a generalization of what we have today. There is another constructor which receives already constructed begin and end iterators, useful if the end iterator can't be obtained by default-construction. Or, if you wanted to make a range that does not end at the end of the container, you could pass any iterator as the "end". This generalization allows removing some "range" classes, like all_inferiors_range. These classes existed only to pass some arguments when constructing the begin iterator. With iterator_range, those same arguments are passed to the iterator_range constructed and then forwarded to the constructed begin iterator. There is a small functional difference in how iterator_range works compared to next_adapter. next_adapter stored the pointer it received as argument and constructeur an iterator in the `begin` method. iterator_range constructs the begin iterator and stores it as a member. Its `begin` method returns a copy of that iterator. With just iterator_range, uses of next_adapter would be replaced with: using foo_iterator = next_iterator; using foo_range = iterator_range; However, I added a `next_range` wrapper as a direct replacement for next_adapter. IMO, next_range is a slightly better name than next_adapter. The rest of the changes are applications of this new class. gdbsupport/ChangeLog: * next-iterator.h (class next_adapter): Remove. * iterator-range.h: New. gdb/ChangeLog: * breakpoint.h (bp_locations_range): Remove. (bp_location_range): New. (struct breakpoint) : Adjust type. (breakpoint_range): Use iterator_range. (tracepoint_range): Use iterator_range. * breakpoint.c (breakpoint::locations): Adjust return type. * gdb_bfd.h (gdb_bfd_section_range): Use iterator_range. * gdbthread.h (all_threads_safe): Pass argument to all_threads_safe_range. * inferior-iter.h (all_inferiors_range): Use iterator_range. (all_inferiors_safe_range): Use iterator_range. (all_non_exited_inferiors_range): Use iterator_range. * inferior.h (all_inferiors, all_non_exited_inferiors): Pass inferior_list as argument. * objfiles.h (struct objfile) : Remove. : Return compunit_symtab_range. * progspace.h (unwrapping_objfile_iterator) : Take parameter by value. (unwrapping_objfile_range): Use iterator_range. (struct program_space) : Define with "using". : Adjust. : Define with "using". : Adjust. : Return so_list_range, define here. * progspace.c (program_space::solibs): Remove. * psymtab.h (class psymtab_storage) : New. : Use iterator_range. * solist.h (so_list_range): New. * symtab.h (compunit_symtab_range): New. (symtab_range): New. (compunit_filetabs): Change to a function. * thread-iter.h (inf_threads_range, inf_non_exited_threads_range, safe_inf_threads_range, all_threads_safe_range): Use iterator_range. * top.h (ui_range): New. (all_uis): Use ui_range. Change-Id: Ib7a9d2a3547f45f01aa1c6b24536ba159db9b854 --- gdb/inferior-iter.h | 69 +++++++---------------------------------------------- 1 file changed, 9 insertions(+), 60 deletions(-) (limited to 'gdb/inferior-iter.h') diff --git a/gdb/inferior-iter.h b/gdb/inferior-iter.h index 2ae0a09..f999150 100644 --- a/gdb/inferior-iter.h +++ b/gdb/inferior-iter.h @@ -90,6 +90,11 @@ private: inferior *m_inf; }; +/* A range adapter that makes it possible to iterate over all + inferiors with range-for. */ + +using all_inferiors_range = iterator_range; + /* Filter for filtered_iterator. Filters out exited inferiors. */ struct exited_inferior_filter @@ -106,21 +111,10 @@ using all_non_exited_inferiors_iterator = filtered_iterator; /* A range adapter that makes it possible to iterate over all - inferiors with range-for. */ -struct all_inferiors_range -{ - all_inferiors_range (process_stratum_target *proc_target = nullptr) - : m_filter_target (proc_target) - {} + non-exited inferiors with range-for. */ - all_inferiors_iterator begin () const - { return all_inferiors_iterator (m_filter_target, inferior_list); } - all_inferiors_iterator end () const - { return all_inferiors_iterator (); } - -private: - process_stratum_target *m_filter_target; -}; +using all_non_exited_inferiors_range + = iterator_range; /* Iterate over all inferiors, safely. */ @@ -131,51 +125,6 @@ using all_inferiors_safe_iterator inferiors with range-for "safely". I.e., it is safe to delete the currently-iterated inferior. */ -struct all_inferiors_safe_range -{ - explicit all_inferiors_safe_range (process_stratum_target *filter_target) - : m_filter_target (filter_target) - {} - - all_inferiors_safe_range () - : m_filter_target (nullptr) - {} - - all_inferiors_safe_iterator begin () const - { - return (all_inferiors_safe_iterator - (all_inferiors_iterator (m_filter_target, inferior_list))); - } - - all_inferiors_safe_iterator end () const - { return all_inferiors_safe_iterator (); } - -private: - /* The filter. */ - process_stratum_target *m_filter_target; -}; - -/* A range adapter that makes it possible to iterate over all - non-exited inferiors with range-for. */ - -struct all_non_exited_inferiors_range -{ - explicit all_non_exited_inferiors_range (process_stratum_target *filter_target) - : m_filter_target (filter_target) - {} - - all_non_exited_inferiors_range () - : m_filter_target (nullptr) - {} - - all_non_exited_inferiors_iterator begin () const - { return all_non_exited_inferiors_iterator (m_filter_target, inferior_list); } - all_non_exited_inferiors_iterator end () const - { return all_non_exited_inferiors_iterator (); } - -private: - /* The filter. */ - process_stratum_target *m_filter_target; -}; +using all_inferiors_safe_range = iterator_range; #endif /* !defined (INFERIOR_ITER_H) */ -- cgit v1.1