truffle: src/share/vm/prims/jvm.cpp comparison

comparison src/share/vm/prims/jvm.cpp @ 14518:d8041d695d19

Merged with jdk9/dev/hotspot changeset 3812c088b945

author	twisti
date	Tue, 11 Mar 2014 18:45:59 -0700
parents	096c224171c4 016b6a289fc4
children	b51e29501f30 4ca6dc0799b6

comparison

equal deleted inserted replaced

-:f97c5ec83832
+:d8041d695d19
 /*
-* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 # include "jvm_solaris.h"
 #endif
 #ifdef TARGET_OS_FAMILY_windows
 # include "jvm_windows.h"
 #endif
+#ifdef TARGET_OS_FAMILY_aix
+# include "jvm_aix.h"
+#endif
 #ifdef TARGET_OS_FAMILY_bsd
 # include "jvm_bsd.h"
 #endif
 #include <errno.h>
-#ifndef USDT2
-HS_DTRACE_PROBE_DECL1(hotspot, thread__sleep__begin, long long);
-HS_DTRACE_PROBE_DECL1(hotspot, thread__sleep__end, int);
-HS_DTRACE_PROBE_DECL0(hotspot, thread__yield);
-#endif /* !USDT2 */
 /*
 NOTE about use of any ctor or function call that can trigger a safepoint/GC:
 such ctors and calls MUST NOT come between an oop declaration/init and its
 usage because if objects are move this may cause various memory stomps, bus
 JVMWrapper("JVM_MonitorWait");
 Handle obj(THREAD, JNIHandles::resolve_non_null(handle));
 JavaThreadInObjectWaitState jtiows(thread, ms != 0);
 if (JvmtiExport::should_post_monitor_wait()) {
 JvmtiExport::post_monitor_wait((JavaThread *)THREAD, (oop)obj(), ms);
+// The current thread already owns the monitor and it has not yet
+// been added to the wait queue so the current thread cannot be
+// made the successor. This means that the JVMTI_EVENT_MONITOR_WAIT
+// event handler cannot accidentally consume an unpark() meant for
+// the ParkEvent associated with this ObjectMonitor.
 }
 ObjectSynchronizer::wait(obj, ms, CHECK);
 JVM_END
 }
 if (HAS_PENDING_EXCEPTION) {
 pending_exception = Handle(THREAD, PENDING_EXCEPTION);
 CLEAR_PENDING_EXCEPTION;
+// JVMTI has already reported the pending exception
+// JVMTI internal flag reset is needed in order to report PrivilegedActionException
+if (THREAD->is_Java_thread()) {
+JvmtiExport::clear_detected_exception((JavaThread*) THREAD);
+}
 if ( pending_exception->is_a(SystemDictionary::Exception_klass()) &&
 !pending_exception->is_a(SystemDictionary::RuntimeException_klass())) {
 // Throw a java.security.PrivilegedActionException(Exception e) exception
 JavaCallArguments args(pending_exception);
 THROW_ARG_0(vmSymbols::java_security_PrivilegedActionException(),
 // No one should hold a reference to the 'native_thread'.
 delete native_thread;
 if (JvmtiExport::should_post_resource_exhausted()) {
 JvmtiExport::post_resource_exhausted(
 JVMTI_RESOURCE_EXHAUSTED_OOM_ERROR | JVMTI_RESOURCE_EXHAUSTED_THREADS,
-"unable to create new native thread");
+os::native_thread_creation_failed_msg());
 }
 THROW_MSG(vmSymbols::java_lang_OutOfMemoryError(),
-"unable to create new native thread");
+os::native_thread_creation_failed_msg());
 }
 Thread::start(native_thread);
 JVM_END
 JVM_ENTRY(void, JVM_Yield(JNIEnv *env, jclass threadClass))
 JVMWrapper("JVM_Yield");
 if (os::dont_yield()) return;
-#ifndef USDT2
-HS_DTRACE_PROBE0(hotspot, thread__yield);
-#else /* USDT2 */
 HOTSPOT_THREAD_YIELD();
-#endif /* USDT2 */
 // When ConvertYieldToSleep is off (default), this matches the classic VM use of yield.
 // Critical for similar threading behaviour
 if (ConvertYieldToSleep) {
 os::sleep(thread, MinSleepInterval, false);
 } else {
 // Save current thread state and restore it at the end of this block.
 // And set new thread state to SLEEPING.
 JavaThreadSleepState jtss(thread);
-#ifndef USDT2
+HOTSPOT_THREAD_SLEEP_BEGIN(millis);
-HS_DTRACE_PROBE1(hotspot, thread__sleep__begin, millis);
-#else /* USDT2 */
-HOTSPOT_THREAD_SLEEP_BEGIN(
-millis);
-#endif /* USDT2 */
 EventThreadSleep event;
 if (millis == 0) {
 // When ConvertSleepToYield is on, this matches the classic VM implementation of
 if (!HAS_PENDING_EXCEPTION) {
 if (event.should_commit()) {
 event.set_time(millis);
 event.commit();
 }
-#ifndef USDT2
+HOTSPOT_THREAD_SLEEP_END(1);
-HS_DTRACE_PROBE1(hotspot, thread__sleep__end,1);
-#else /* USDT2 */
-HOTSPOT_THREAD_SLEEP_END(
-1);
-#endif /* USDT2 */
 // TODO-FIXME: THROW_MSG returns which means we will not call set_state()
 // to properly restore the thread state.  That's likely wrong.
 THROW_MSG(vmSymbols::java_lang_InterruptedException(), "sleep interrupted");
 }
 }
 }
 if (event.should_commit()) {
 event.set_time(millis);
 event.commit();
 }
-#ifndef USDT2
+HOTSPOT_THREAD_SLEEP_END(0);
-HS_DTRACE_PROBE1(hotspot, thread__sleep__end,0);
-#else /* USDT2 */
-HOTSPOT_THREAD_SLEEP_END(
-0);
-#endif /* USDT2 */
 JVM_END
 JVM_ENTRY(jobject, JVM_CurrentThread(JNIEnv* env, jclass threadClass))
 JVMWrapper("JVM_CurrentThread");
 oop jthread = thread->threadObj();
 }
 return (jclass) JNIHandles::make_local(env, klass_handle->java_mirror());
 }
-// Internal SQE debugging support ///////////////////////////////////////////////////////////
-#ifndef PRODUCT
-extern "C" {
-JNIEXPORT jboolean JNICALL JVM_AccessVMBooleanFlag(const char* name, jboolean* value, jboolean is_get);
-JNIEXPORT jboolean JNICALL JVM_AccessVMIntFlag(const char* name, jint* value, jboolean is_get);
-JNIEXPORT void JNICALL JVM_VMBreakPoint(JNIEnv *env, jobject obj);
-}
-JVM_LEAF(jboolean, JVM_AccessVMBooleanFlag(const char* name, jboolean* value, jboolean is_get))
-JVMWrapper("JVM_AccessBoolVMFlag");
-return is_get ? CommandLineFlags::boolAt((char*) name, (bool*) value) : CommandLineFlags::boolAtPut((char*) name, (bool*) value, Flag::INTERNAL);
-JVM_END
-JVM_LEAF(jboolean, JVM_AccessVMIntFlag(const char* name, jint* value, jboolean is_get))
-JVMWrapper("JVM_AccessVMIntFlag");
-intx v;
-jboolean result = is_get ? CommandLineFlags::intxAt((char*) name, &v) : CommandLineFlags::intxAtPut((char*) name, &v, Flag::INTERNAL);
-*value = (jint)v;
-return result;
-JVM_END
-JVM_ENTRY(void, JVM_VMBreakPoint(JNIEnv *env, jobject obj))
-JVMWrapper("JVM_VMBreakPoint");
-oop the_obj = JNIHandles::resolve(obj);
-BREAKPOINT;
-JVM_END
-#endif
 // Method ///////////////////////////////////////////////////////////////////////////////////////////
 JVM_ENTRY(jobject, JVM_InvokeMethod(JNIEnv *env, jobject method, jobject obj, jobjectArray args0))
 JVMWrapper("JVM_InvokeMethod");
 Handle method_handle;

Mercurial > hg > truffle

comparison src/share/vm/prims/jvm.cpp @ 14518:d8041d695d19