--- a/test/hotspot/gtest/jfr/test_threadCpuLoad.cpp Fri May 17 15:53:21 2019 +0200
+++ b/test/hotspot/gtest/jfr/test_threadCpuLoad.cpp Fri May 17 16:02:27 2019 +0200
@@ -36,11 +36,10 @@
#include "jfr/jfrEvents.hpp"
#include "jfr/support/jfrThreadId.hpp"
#include "jfr/support/jfrThreadLocal.hpp"
+#include "jfr/utilities/jfrThreadIterator.hpp"
#include "jfr/utilities/jfrTime.hpp"
#include "utilities/globalDefinitions.hpp"
#include "runtime/os.hpp"
-#include "runtime/thread.inline.hpp"
-#include "runtime/threadSMR.inline.hpp"
#include "unittest.hpp"
@@ -81,11 +80,18 @@
MockJavaThread() : ::JavaThread() {}
};
- class MockJavaThreadIteratorWithHandle
+ class MockJfrJavaThreadIterator
{
public:
MockJavaThread* next() { return NULL; }
- int length() { return 0; }
+ bool has_next() const { return false; }
+ };
+
+ class MockJfrJavaThreadIteratorAdapter
+ {
+ public:
+ MockJavaThread* next() { return NULL; }
+ bool has_next() const { return false; }
};
// Reincluding source files in the anonymous namespace unfortunately seems to
@@ -97,7 +103,8 @@
#define os MockOs
#define EventThreadCPULoad MockEventThreadCPULoad
#define JavaThread MockJavaThread
-#define JavaThreadIteratorWithHandle MockJavaThreadIteratorWithHandle
+#define JfrJavaThreadIterator MockJfrJavaThreadIterator
+#define JfrJavaThreadIteratorAdapter MockJfrJavaThreadIteratorAdapter
#include "jfr/periodic/jfrThreadCPULoadEvent.hpp"
#include "jfr/periodic/jfrThreadCPULoadEvent.cpp"
@@ -105,7 +112,8 @@
#undef os
#undef EventThreadCPULoad
#undef JavaThread
-#undef JavaThreadIteratorWithHandle
+#define JfrJavaThreadIterator MockJfrJavaThreadIterator
+#define JfrJavaThreadIteratorAdapter MockJfrJavaThreadIteratorAdapter
} // anonymous namespace