/* Thread iterators and ranges for GDB, the GNU debugger.
- Copyright (C) 2018-2019 Free Software Foundation, Inc.
+ Copyright (C) 2018-2020 Free Software Foundation, Inc.
This file is part of GDB.
#ifndef THREAD_ITER_H
#define THREAD_ITER_H
-#include "common/filtered-iterator.h"
-#include "common/safe-iterator.h"
+#include "gdbsupport/filtered-iterator.h"
+#include "gdbsupport/next-iterator.h"
+#include "gdbsupport/safe-iterator.h"
+#include "thread-map.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. */
/* Create a one-past-end iterator. */
all_threads_iterator ()
- : m_thr (nullptr)
+ : m_inf (nullptr)
{}
- thread_info *operator* () const { return m_thr; }
+ thread_info *operator* () const;
all_threads_iterator &operator++ ()
{
}
bool operator== (const all_threads_iterator &other) const
- { return m_thr == other.m_thr; }
+ {
+ if (m_inf != other.m_inf)
+ return false;
+
+ /* Inferiors of both iterators are equal. */
+ if (m_inf == NULL) {
+ /* They are both ended iterators. */
+ return true;
+ } else {
+ /* Do they both point to the same thread? */
+ return m_thr_iter == other.m_thr_iter;
+ }
+ }
bool operator!= (const all_threads_iterator &other) const
- { return m_thr != other.m_thr; }
+ {
+ return !(*this == other);
+ }
private:
/* Advance to the next thread. */
void advance ();
private:
- /* The current inferior and thread. M_THR is NULL if we reached the
+ /* The current inferior and thread. M_INF is NULL if we reached the
end of the threads list of the last inferior. */
inferior *m_inf;
- thread_info *m_thr;
+ ptid_thread_map::const_iterator m_thr_iter;
};
/* Iterate over all threads that match a given PTID. */
/* Create a one-past-end iterator. */
all_matching_threads_iterator ()
: m_inf (nullptr),
- m_thr (nullptr),
m_filter_ptid (minus_one_ptid)
{}
- thread_info *operator* () const { return m_thr; }
+ thread_info *operator* () const;
all_matching_threads_iterator &operator++ ()
{
}
bool operator== (const all_matching_threads_iterator &other) const
- { return m_thr == other.m_thr; }
+ {
+ if (m_inf != other.m_inf)
+ return false;
+
+ /* Inferiors of both iterators are equal. */
+ if (m_inf == NULL) {
+ /* They are both ended iterators. */
+ return true;
+ } else {
+ /* Do they both point to the same thread? */
+ return m_thr_iter == other.m_thr_iter;
+ }
+ }
bool operator!= (const all_matching_threads_iterator &other) const
- { return m_thr != other.m_thr; }
+ {
+ return !(* this == other);
+ }
private:
/* Advance to next thread, skipping filtered threads. */
inferior *m_inf;
/* The current thread. */
- thread_info *m_thr;
+ ptid_thread_map::const_iterator m_thr_iter;
/* The filter. */
ptid_t m_filter_ptid;
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. */