[00/12] Remove some ALL_* iteration macros
Commit Message
>>>>> "Pedro" == Pedro Alves <palves@redhat.com> writes:
>> There are still a few more such macros that could be converted. And,
>> I think inf_threads_iterator could be converted to use next_iterator.
>> I can do some of this if there's interest.
Pedro> If it's a natural fit, then I think it'd be nice. Is there a downside?
I don't think there is one.
What do you think of this?
Tom
commit f4cd9886913b5216ed6073af23d250401f006551
Author: Tom Tromey <tom@tromey.com>
Date: Thu Jan 10 10:50:43 2019 -0700
Replace inf_threads_iterator with next_iterator
This changes inf_threads_iterator and some range adapters in
thread-iter.h to use next_iterator and next_adapter instead.
gdb/ChangeLog
2019-01-10 Tom Tromey <tom@tromey.com>
* thread-iter.h (inf_threads_iterator): Use next_iterator.
(basic_inf_threads_range): Remove.
(inf_threads_range, inf_non_exited_threads_range)
(safe_inf_threads_range): Use next_adapter.
Comments
On 01/10/2019 06:06 PM, Tom Tromey wrote:
>>>>>> "Pedro" == Pedro Alves <palves@redhat.com> writes:
>
>>> There are still a few more such macros that could be converted. And,
>>> I think inf_threads_iterator could be converted to use next_iterator.
>>> I can do some of this if there's interest.
>
> Pedro> If it's a natural fit, then I think it'd be nice. Is there a downside?
>
> I don't think there is one.
> What do you think of this?
Looks good, thanks!
Pedro Alves
>>>>> "Pedro" == Pedro Alves <palves@redhat.com> writes:
>> I don't think there is one.
>> What do you think of this?
Pedro> Looks good, thanks!
I'm going to check it in.
Tom
@@ -1,3 +1,10 @@
+2019-01-10 Tom Tromey <tom@tromey.com>
+
+ * thread-iter.h (inf_threads_iterator): Use next_iterator.
+ (basic_inf_threads_range): Remove.
+ (inf_threads_range, inf_non_exited_threads_range)
+ (safe_inf_threads_range): Use next_adapter.
+
2019-01-10 Tom Tromey <tom@tromey.com>
* objfiles.h (objfile::reset_psymtabs): Update.
@@ -20,68 +20,13 @@
#define THREAD_ITER_H
#include "common/filtered-iterator.h"
+#include "common/next-iterator.h"
#include "common/safe-iterator.h"
/* A forward iterator that iterates over a given inferior's
threads. */
-class inf_threads_iterator
-{
-public:
- typedef inf_threads_iterator self_type;
- typedef struct thread_info *value_type;
- typedef struct thread_info *&reference;
- typedef struct thread_info **pointer;
- typedef std::forward_iterator_tag iterator_category;
- typedef int difference_type;
-
- /* Create an iterator pointing at HEAD. This takes a thread pointer
- instead of an inferior pointer to avoid circular dependencies
- between the thread and inferior header files. */
- explicit inf_threads_iterator (struct thread_info *head)
- : m_thr (head)
- {}
-
- /* Create a one-past-end iterator. */
- inf_threads_iterator ()
- : m_thr (nullptr)
- {}
-
- inf_threads_iterator& operator++ ()
- {
- m_thr = m_thr->next;
- return *this;
- }
-
- thread_info *operator* () const { return m_thr; }
-
- bool operator!= (const inf_threads_iterator &other) const
- { return m_thr != other.m_thr; }
-
-private:
- /* The currently-iterated thread. NULL if we reached the end of the
- list. */
- thread_info *m_thr;
-};
-
-/* A range adapter that makes it possible to iterate over an
- inferior's thread list with range-for. */
-template<typename Iterator>
-struct basic_inf_threads_range
-{
- friend struct inferior;
-private:
- explicit basic_inf_threads_range (struct thread_info *head)
- : m_head (head)
- {}
-
-public:
- Iterator begin () const { return Iterator (m_head); }
- Iterator end () const { return Iterator (); }
-
-private:
- thread_info *m_head;
-};
+using inf_threads_iterator = next_iterator<thread_info>;
/* A forward iterator that iterates over all threads of all
inferiors. */
@@ -223,19 +168,19 @@ using safe_inf_threads_iterator
of an inferior with range-for. */
using inf_threads_range
- = basic_inf_threads_range<inf_threads_iterator>;
+ = next_adapter<thread_info, inf_threads_iterator>;
/* A range adapter that makes it possible to iterate over all
non-exited threads of an inferior with range-for. */
using inf_non_exited_threads_range
- = basic_inf_threads_range<inf_non_exited_threads_iterator>;
+ = next_adapter<thread_info, inf_non_exited_threads_iterator>;
/* A range adapter that makes it possible to iterate over all threads
of an inferior with range-for, safely. */
using safe_inf_threads_range
- = basic_inf_threads_range<safe_inf_threads_iterator>;
+ = next_adapter<thread_info, safe_inf_threads_iterator>;
/* A range adapter that makes it possible to iterate over all threads
of all inferiors with range-for. */