8271514: support JFR use of new ThreadsList::Iterator

src/hotspot/share/jfr/utilities/jfrThreadIterator.cpp

@@ -26,6 +26,7 @@
 #include "jfr/support/jfrThreadLocal.hpp"
 #include "jfr/utilities/jfrThreadIterator.hpp"
 #include "runtime/thread.inline.hpp"
+#include "runtime/threadSMR.inline.hpp"
 
 static bool thread_inclusion_predicate(Thread* t) {
   assert(t != NULL, "invariant");
@@ -40,14 +41,6 @@ static bool java_thread_inclusion_predicate(JavaThread* jt, bool live_only) {
   return thread_inclusion_predicate(jt);
 }
 
-static JavaThread* next_java_thread(JavaThreadIteratorWithHandle& iter, bool live_only) {
-  JavaThread* next = iter.next();
-  while (next != NULL && !java_thread_inclusion_predicate(next, live_only)) {
-    next = iter.next();
-  }
-  return next;
-}
-
 static NonJavaThread* next_non_java_thread(NonJavaThread::Iterator& iter) {
   while (!iter.end()) {
     NonJavaThread* next = iter.current();
@@ -60,15 +53,29 @@ static NonJavaThread* next_non_java_thread(NonJavaThread::Iterator& iter) {
   return NULL;
 }
 
-JfrJavaThreadIteratorAdapter::JfrJavaThreadIteratorAdapter(bool live_only /* true */) : _iter(),
-                                                                                        _next(next_java_thread(_iter, live_only)),
-                                                                                        _live_only(live_only) {}
+JfrJavaThreadIteratorAdapter::JfrJavaThreadIteratorAdapter(bool live_only /* true */) :
+  _tlist(),
+  _it(_tlist.begin()),
+  _end(_tlist.end()),
+  _live_only(live_only)
+{
+  skip_excluded();
+}
+
+bool JfrJavaThreadIteratorAdapter::has_next() const {
+  return _it != _end;
+}
+
+void JfrJavaThreadIteratorAdapter::skip_excluded() {
+  while (has_next() && !java_thread_inclusion_predicate(*_it, _live_only)) {
+    ++_it;
+  }
+}
 
 JavaThread* JfrJavaThreadIteratorAdapter::next() {
   assert(has_next(), "invariant");
-  Type* const temp = _next;
-  _next = next_java_thread(_iter, _live_only);
-  assert(temp != _next, "invariant");
+  Type* const temp = *_it++;
+  skip_excluded();
   return temp;
 }
 

src/hotspot/share/jfr/utilities/jfrThreadIterator.hpp

@@ -47,15 +47,17 @@ class JfrThreadIterator : public AP {
 
 class JfrJavaThreadIteratorAdapter {
  private:
-  JavaThreadIteratorWithHandle _iter;
-  JavaThread* _next;
+  ThreadsListHandle _tlist;
+  ThreadsListHandle::Iterator _it;
+  ThreadsListHandle::Iterator _end;
   bool _live_only;
+
+  void skip_excluded();
+
  public:
   typedef JavaThread Type;
   JfrJavaThreadIteratorAdapter(bool live_only = true);
-  bool has_next() const {
-    return _next != NULL;
-  }
+  bool has_next() const;
   Type* next();
 };
 

src/hotspot/share/runtime/thread.cpp

@@ -854,7 +854,7 @@ void JavaThread::collect_counters(jlong* array, int length) {
   for (int i = 0; i < length; i++) {
     array[i] = _jvmci_old_thread_counters[i];
   }
-  for (JavaThreadIteratorWithHandle jtiwh; JavaThread *tp = jtiwh.next(); ) {
+  for (JavaThread* tp : ThreadsListHandle()) {
     if (jvmci_counters_include(tp)) {
       for (int i = 0; i < length; i++) {
         array[i] += tp->_jvmci_counters[i];
@@ -915,7 +915,7 @@ class VM_JVMCIResizeCounters : public VM_Operation {
     }
 
     // Now resize each threads array
-    for (JavaThreadIteratorWithHandle jtiwh; JavaThread *tp = jtiwh.next(); ) {
+    for (JavaThread* tp : ThreadsListHandle()) {
       if (!tp->resize_counters(JVMCICounterSize, _new_size)) {
         _failed = true;
         break;

src/hotspot/share/runtime/threadSMR.hpp

@@ -328,6 +328,10 @@ class ThreadsListHandle : public StackObj {
     return _list_ptr.list();
   }
 
+  using Iterator = ThreadsList::Iterator;
+  inline Iterator begin();
+  inline Iterator end();
+
   template <class T>
   void threads_do(T *cl) const {
     return list()->threads_do(cl);

src/hotspot/share/runtime/threadSMR.inline.hpp

@@ -107,6 +107,9 @@ inline void ThreadsList::threads_do(T *cl) const {
   }
 }
 
+ThreadsListHandle::Iterator ThreadsListHandle::begin() { return list()->begin(); }
+ThreadsListHandle::Iterator ThreadsListHandle::end() { return list()->end(); }
+
 // These three inlines are private to ThreadsSMRSupport, but
 // they are called by public inline update_tlh_stats() below: