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

-:c7a3e57fdf4a
+:b985cbb00e68
 *
 */
 #include "precompiled.hpp"
 #include "classfile/vmSymbols.hpp"
+#include "jfr/jfrEvents.hpp"
+#include "jfr/support/jfrThreadId.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/markOop.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/interfaceSupport.hpp"
 #include "runtime/orderAccess.inline.hpp"
 #include "runtime/osThread.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "runtime/thread.inline.hpp"
 #include "services/threadService.hpp"
-#include "trace/tracing.hpp"
-#include "trace/traceMacros.hpp"
 #include "utilities/dtrace.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/preserveException.hpp"
 #ifdef TARGET_OS_FAMILY_linux
 # include "os_linux.inline.hpp"
 #ifdef TARGET_OS_FAMILY_windows
 # include "os_windows.inline.hpp"
 #endif
 #ifdef TARGET_OS_FAMILY_bsd
 # include "os_bsd.inline.hpp"
+#endif
+#if INCLUDE_JFR
+#include "jfr/support/jfrFlush.hpp"
 #endif
 #if defined(__GNUC__) && !defined(IA64) && !defined(PPC64)
 // Need to inhibit inlining for older versions of GCC to avoid build-time failures
 #define ATTR __attribute__((noinline))
 // Prevent deflation at STW-time.  See deflate_idle_monitors() and is_busy().
 // Ensure the object-monitor relationship remains stable while there's contention.
 Atomic::inc_ptr(&_count);
+JFR_ONLY(JfrConditionalFlushWithStacktrace<EventJavaMonitorEnter> flush(jt);)
 EventJavaMonitorEnter event;
+if (event.should_commit()) {
+event.set_monitorClass(((oop)this->object())->klass());
+event.set_address((uintptr_t)(this->object_addr()));
+}
 { // Change java thread status to indicate blocked on monitor enter.
 JavaThreadBlockedOnMonitorEnterState jtbmes(jt, this);
 Self->set_current_pending_monitor(this);
 // event handler consumed an unpark() issued by the thread that
 // just exited the monitor.
 }
 if (event.should_commit()) {
-event.set_klass(((oop)this->object())->klass());
+event.set_previousOwner((uintptr_t)_previous_owner_tid);
-event.set_previousOwner((TYPE_JAVALANGTHREAD)_previous_owner_tid);
-event.set_address((TYPE_ADDRESS)(uintptr_t)(this->object_addr()));
 event.commit();
 }
 if (ObjectMonitor::_sync_ContendedLockAttempts != NULL) {
 ObjectMonitor::_sync_ContendedLockAttempts->inc() ;
 // a MEMBAR or other serializing instruction before fetching EntryList|cxq.
 if ((SyncFlags & 4) == 0) {
 _Responsible = NULL ;
 }
-#if INCLUDE_TRACE
+#if INCLUDE_JFR
 // get the owner's thread id for the MonitorEnter event
 // if it is enabled and the thread isn't suspended
-if (not_suspended && Tracing::is_event_enabled(TraceJavaMonitorEnterEvent)) {
+if (not_suspended && EventJavaMonitorEnter::is_enabled()) {
-_previous_owner_tid = SharedRuntime::get_java_tid(Self);
+_previous_owner_tid = JFR_THREAD_ID(Self);
 }
 #endif
 for (;;) {
 assert (THREAD == _owner, "invariant") ;
 for (v = *adr ; Atomic::cmpxchg (v + dx, adr, v) != v; v = *adr) ;
 return v ;
 }
 // helper method for posting a monitor wait event
-void ObjectMonitor::post_monitor_wait_event(EventJavaMonitorWait* event,
+static void post_monitor_wait_event(EventJavaMonitorWait* event,
-jlong notifier_tid,
+ObjectMonitor* monitor,
-jlong timeout,
+jlong notifier_tid,
-bool timedout) {
+jlong timeout,
-event->set_klass(((oop)this->object())->klass());
+bool timedout) {
-event->set_timeout((TYPE_ULONG)timeout);
+assert(monitor != NULL, "invariant");
-event->set_address((TYPE_ADDRESS)(uintptr_t)(this->object_addr()));
+event->set_monitorClass(((oop)monitor->object())->klass());
-event->set_notifier((TYPE_OSTHREAD)notifier_tid);
+event->set_timeout(timeout);
-event->set_timedOut((TYPE_BOOLEAN)timedout);
+event->set_address((uintptr_t)monitor->object_addr());
+event->set_notifier((u8)notifier_tid);
+event->set_timedOut(timedout);
 event->commit();
 }
 // -----------------------------------------------------------------------------
 // Wait/Notify/NotifyAll
 // JVMTI_EVENT_MONITOR_WAITED event handler cannot accidentally
 // consume an unpark() meant for the ParkEvent associated with
 // this ObjectMonitor.
 }
 if (event.should_commit()) {
-post_monitor_wait_event(&event, 0, millis, false);
+post_monitor_wait_event(&event, this, 0, millis, false);
 }
 TEVENT (Wait - Throw IEX) ;
 THROW(vmSymbols::java_lang_InterruptedException());
 return ;
 }
 node._event->unpark();
 }
 }
 if (event.should_commit()) {
-post_monitor_wait_event(&event, node._notifier_tid, millis, ret == OS_TIMEOUT);
+post_monitor_wait_event(&event, this, node._notifier_tid, millis, ret == OS_TIMEOUT);
 }
 OrderAccess::fence() ;
 assert (Self->_Stalled != 0, "invariant") ;
 if (Policy != 4) {
 iterator->TState = ObjectWaiter::TS_ENTER ;
 }
 iterator->_notified = 1 ;
 Thread * Self = THREAD;
-iterator->_notifier_tid = Self->osthread()->thread_id();
+iterator->_notifier_tid = JFR_THREAD_ID(Self);
 ObjectWaiter * List = _EntryList ;
 if (List != NULL) {
 assert (List->_prev == NULL, "invariant") ;
 assert (List->TState == ObjectWaiter::TS_ENTER, "invariant") ;
 guarantee (iterator->TState == ObjectWaiter::TS_WAIT, "invariant") ;
 guarantee (iterator->_notified == 0, "invariant") ;
 iterator->_notified = 1 ;
 Thread * Self = THREAD;
-iterator->_notifier_tid = Self->osthread()->thread_id();
+iterator->_notifier_tid = JFR_THREAD_ID(Self);
 if (Policy != 4) {
 iterator->TState = ObjectWaiter::TS_ENTER ;
 }
 ObjectWaiter * List = _EntryList ;

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

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

src/share/vm/runtime/objectMonitor.cpp