jdk8-mips64-public/hotspot: comparison src/share/vm/runtime/thread.cpp

-:c7a3e57fdf4a
+:b985cbb00e68
 #include "code/scopeDesc.hpp"
 #include "compiler/compileBroker.hpp"
 #include "interpreter/interpreter.hpp"
 #include "interpreter/linkResolver.hpp"
 #include "interpreter/oopMapCache.hpp"
+#include "jfr/jfrEvents.hpp"
+#include "jfr/support/jfrThreadId.hpp"
 #include "jvmtifiles/jvmtiEnv.hpp"
 #include "memory/gcLocker.inline.hpp"
 #include "memory/metaspaceShared.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/universe.inline.hpp"
 #include "runtime/vm_operations.hpp"
 #include "services/attachListener.hpp"
 #include "services/management.hpp"
 #include "services/memTracker.hpp"
 #include "services/threadService.hpp"
-#include "trace/tracing.hpp"
-#include "trace/traceMacros.hpp"
 #include "utilities/defaultStream.hpp"
 #include "utilities/dtrace.hpp"
 #include "utilities/events.hpp"
 #include "utilities/preserveException.hpp"
 #include "utilities/macros.hpp"
 #include "opto/idealGraphPrinter.hpp"
 #endif
 #if INCLUDE_RTM_OPT
 #include "runtime/rtmLocking.hpp"
 #endif
+#if INCLUDE_JFR
+#include "jfr/jfr.hpp"
+#endif
 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
 #ifdef DTRACE_ENABLED
 Thread::~Thread() {
 // Reclaim the objectmonitors from the omFreeList of the moribund thread.
 ObjectSynchronizer::omFlush (this) ;
-EVENT_THREAD_DESTRUCT(this);
+JFR_ONLY(Jfr::on_thread_destruct(this);)
 // stack_base can be NULL if the thread is never started or exited before
 // record_stack_base_and_size called. Although, we would like to ensure
 // that all started threads do call record_stack_base_and_size(), there is
 // not proper way to enforce that.
 JvmtiExport::post_thread_start(this);
 }
 EventThreadStart event;
 if (event.should_commit()) {
-event.set_javalangthread(java_lang_Thread::thread_id(this->threadObj()));
+event.set_thread(JFR_THREAD_ID(this));
 event.commit();
 }
 // We call another function to do the rest so we are sure that the stack addresses used
 // from there will be lower than the stack base just computed
 // Called before the java thread exit since we want to read info
 // from java_lang_Thread object
 EventThreadEnd event;
 if (event.should_commit()) {
-event.set_javalangthread(java_lang_Thread::thread_id(this->threadObj()));
+event.set_thread(JFR_THREAD_ID(this));
 event.commit();
 }
 // Call after last event on thread
-EVENT_THREAD_EXIT(this);
+JFR_ONLY(Jfr::on_thread_exit(this);)
 // Call Thread.exit(). We try 3 times in case we got another Thread.stop during
 // the execution of the method. If that is not enough, then we don't really care. Thread.stop
 // is deprecated anyhow.
 if (!is_Compiler_thread()) {
 }
 if (check_asyncs) {
 check_and_handle_async_exceptions();
 }
+JFR_ONLY(SUSPEND_THREAD_CONDITIONAL(this);)
 }
 void JavaThread::send_thread_stop(oop java_throwable)  {
 assert(Thread::current()->is_VM_thread(), "should be in the vm thread");
 assert(Threads_lock->is_locked(), "Threads_lock should be locked by safepoint code");
 f.deoptimize(thread);
 } else {
 fatal("missed deoptimization!");
 }
 }
+JFR_ONLY(SUSPEND_THREAD_CONDITIONAL(thread);)
 }
 // Slow path when the native==>VM/Java barriers detect a safepoint is in
 // progress or when _suspend_flags is non-zero.
 // Current thread needs to self-suspend if there is a suspend request and/or
 // Terminator_lock, but we can't do that without violating the lock rank
 // checking in some cases.
 if (wt != NULL)
 tc->do_thread(wt);
+#if INCLUDE_JFR
+Thread* sampler_thread = Jfr::sampler_thread();
+if (sampler_thread != NULL) {
+tc->do_thread(sampler_thread);
+}
+#endif
 // If CompilerThreads ever become non-JavaThreads, add them here
 }
 jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
 if (status != JNI_OK) {
 delete main_thread;
 *canTryAgain = false; // don't let caller call JNI_CreateJavaVM again
 return status;
 }
+JFR_ONLY(Jfr::on_vm_init();)
 // Should be done after the heap is fully created
 main_thread->cache_global_variables();
 HandleMark hm;
 // This should also be taken out as soon as 4211383 gets fixed.
 reset_vm_info_property(CHECK_0);
 quicken_jni_functions();
-// Must be run after init_ft which initializes ft_enabled
-if (TRACE_INITIALIZE() != JNI_OK) {
-vm_exit_during_initialization("Failed to initialize tracing backend");
-}
 // Set flag that basic initialization has completed. Used by exceptions and various
 // debug stuff, that does not work until all basic classes have been initialized.
 set_init_completed();
 Metaspace::post_initialize();
 }
 // Notify JVMTI agents that VM initialization is complete - nop if no agents.
 JvmtiExport::post_vm_initialized();
-if (TRACE_START() != JNI_OK) {
+JFR_ONLY(Jfr::on_vm_start();)
-vm_exit_during_initialization("Failed to start tracing backend.");
-}
 if (CleanChunkPoolAsync) {
 Chunk::start_chunk_pool_cleaner_task();
 }

Mercurial > jdk8-mips64-public > hotspot / file comparison

comparison: src/share/vm/runtime/thread.cpp

src/share/vm/runtime/thread.cpp