--- a/hotspot/src/share/vm/runtime/thread.cpp Fri Jun 07 09:33:01 2013 -0700
+++ b/hotspot/src/share/vm/runtime/thread.cpp Mon Jun 10 11:30:51 2013 +0200
@@ -77,7 +77,8 @@
#include "services/management.hpp"
#include "services/memTracker.hpp"
#include "services/threadService.hpp"
-#include "trace/traceEventTypes.hpp"
+#include "trace/tracing.hpp"
+#include "trace/traceMacros.hpp"
#include "utilities/defaultStream.hpp"
#include "utilities/dtrace.hpp"
#include "utilities/events.hpp"
@@ -238,7 +239,6 @@
CHECK_UNHANDLED_OOPS_ONLY(_gc_locked_out_count = 0;)
_jvmti_env_iteration_count = 0;
set_allocated_bytes(0);
- set_trace_buffer(NULL);
_vm_operation_started_count = 0;
_vm_operation_completed_count = 0;
_current_pending_monitor = NULL;
@@ -1659,9 +1659,11 @@
JvmtiExport::post_thread_start(this);
}
- EVENT_BEGIN(TraceEventThreadStart, event);
- EVENT_COMMIT(event,
- EVENT_SET(event, javalangthread, java_lang_Thread::thread_id(this->threadObj())));
+ EventThreadStart event;
+ if (event.should_commit()) {
+ event.set_javalangthread(java_lang_Thread::thread_id(this->threadObj()));
+ 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
@@ -1791,9 +1793,11 @@
// Called before the java thread exit since we want to read info
// from java_lang_Thread object
- EVENT_BEGIN(TraceEventThreadEnd, event);
- EVENT_COMMIT(event,
- EVENT_SET(event, javalangthread, java_lang_Thread::thread_id(this->threadObj())));
+ EventThreadEnd event;
+ if (event.should_commit()) {
+ event.set_javalangthread(java_lang_Thread::thread_id(this->threadObj()));
+ event.commit();
+ }
// Call after last event on thread
EVENT_THREAD_EXIT(this);
@@ -3648,8 +3652,8 @@
// Notify JVMTI agents that VM initialization is complete - nop if no agents.
JvmtiExport::post_vm_initialized();
- if (!TRACE_START()) {
- vm_exit_during_initialization(Handle(THREAD, PENDING_EXCEPTION));
+ if (TRACE_START() != JNI_OK) {
+ vm_exit_during_initialization("Failed to start tracing backend.");
}
if (CleanChunkPoolAsync) {