jdk-sandbox: comparison hotspot/src/share/vm/services/management.cpp

equal deleted inserted replaced

-:fa1e0d1c960f
+:41332d860d6a
 CHECK_NULL);
 return (instanceOop) element();
 }
-// Helper functions
-static JavaThread* find_java_thread_from_id(jlong thread_id) {
-assert(Threads_lock->owned_by_self(), "Must hold Threads_lock");
-JavaThread* java_thread = NULL;
-// Sequential search for now.  Need to do better optimization later.
-for (JavaThread* thread = Threads::first(); thread != NULL; thread = thread->next()) {
-oop tobj = thread->threadObj();
-if (!thread->is_exiting() &&
-tobj != NULL &&
-thread_id == java_lang_Thread::thread_id(tobj)) {
-java_thread = thread;
-break;
-}
-}
-return java_thread;
-}
 static GCMemoryManager* get_gc_memory_manager_from_jobject(jobject mgr, TRAPS) {
 if (mgr == NULL) {
 THROW_(vmSymbols::java_lang_NullPointerException(), NULL);
 }
 assert(pool_obj->is_instance(), "Should be an instanceOop");
 instanceHandle ph(THREAD, (instanceOop) pool_obj);
 return MemoryService::get_memory_pool(ph);
 }
+#endif // INCLUDE_MANAGEMENT
 static void validate_thread_id_array(typeArrayHandle ids_ah, TRAPS) {
 int num_threads = ids_ah->length();
 // Validate input thread IDs
 THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
 "Invalid thread ID entry");
 }
 }
 }
+#if INCLUDE_MANAGEMENT
 static void validate_thread_info_array(objArrayHandle infoArray_h, TRAPS) {
 // check if the element of infoArray is of type ThreadInfo class
 Klass* threadinfo_klass = Management::java_lang_management_ThreadInfo_klass(CHECK);
 Klass* element_klass = ObjArrayKlass::cast(infoArray_h->klass())->element_klass();
 if (prev != threshold) {
 LowMemoryDetector::recompute_enabled_for_collected_pools();
 LowMemoryDetector::detect_low_memory(pool);
 }
 return prev;
-JVM_END
-// Gets an array containing the amount of memory allocated on the Java
-// heap for a set of threads (in bytes).  Each element of the array is
-// the amount of memory allocated for the thread ID specified in the
-// corresponding entry in the given array of thread IDs; or -1 if the
-// thread does not exist or has terminated.
-JVM_ENTRY(void, jmm_GetThreadAllocatedMemory(JNIEnv *env, jlongArray ids,
-jlongArray sizeArray))
-// Check if threads is null
-if (ids == NULL || sizeArray == NULL) {
-THROW(vmSymbols::java_lang_NullPointerException());
-}
-ResourceMark rm(THREAD);
-typeArrayOop ta = typeArrayOop(JNIHandles::resolve_non_null(ids));
-typeArrayHandle ids_ah(THREAD, ta);
-typeArrayOop sa = typeArrayOop(JNIHandles::resolve_non_null(sizeArray));
-typeArrayHandle sizeArray_h(THREAD, sa);
-// validate the thread id array
-validate_thread_id_array(ids_ah, CHECK);
-// sizeArray must be of the same length as the given array of thread IDs
-int num_threads = ids_ah->length();
-if (num_threads != sizeArray_h->length()) {
-THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
-"The length of the given long array does not match the length of "
-"the given array of thread IDs");
-}
-MutexLockerEx ml(Threads_lock);
-for (int i = 0; i < num_threads; i++) {
-JavaThread* java_thread = find_java_thread_from_id(ids_ah->long_at(i));
-if (java_thread != NULL) {
-sizeArray_h->long_at_put(i, java_thread->cooked_allocated_bytes());
-}
-}
 JVM_END
 // Returns a java/lang/management/MemoryUsage object representing
 // the memory usage for the heap or non-heap memory.
 JVM_ENTRY(jobject, jmm_GetMemoryUsage(JNIEnv* env, jboolean heap))
 GrowableArray<instanceHandle>* thread_handle_array = new GrowableArray<instanceHandle>(num_threads);
 {
 MutexLockerEx ml(Threads_lock);
 for (int i = 0; i < num_threads; i++) {
 jlong tid = ids_ah->long_at(i);
-JavaThread* jt = find_java_thread_from_id(tid);
+JavaThread* jt = Threads::find_java_thread_from_java_tid(tid);
 oop thread_obj = (jt != NULL ? jt->threadObj() : (oop)NULL);
 instanceHandle threadObj_h(THREAD, (instanceOop) thread_obj);
 thread_handle_array->append(threadObj_h);
 }
 }
 // no stack trace dumped - do not need to stop the world
 {
 MutexLockerEx ml(Threads_lock);
 for (int i = 0; i < num_threads; i++) {
 jlong tid = ids_ah->long_at(i);
-JavaThread* jt = find_java_thread_from_id(tid);
+JavaThread* jt = Threads::find_java_thread_from_java_tid(tid);
 ThreadSnapshot* ts;
 if (jt == NULL) {
 // if the thread does not exist or now it is terminated,
 // create dummy snapshot
 ts = new ThreadSnapshot();
 ThreadService::reset_contention_time_stat(java_thread);
 }
 }
 } else {
 // reset contention statistics for a given thread
-JavaThread* java_thread = find_java_thread_from_id(tid);
+JavaThread* java_thread = Threads::find_java_thread_from_java_tid(tid);
 if (java_thread == NULL) {
 return false;
 }
 if (type == JMM_STAT_THREAD_CONTENTION_COUNT) {
 if (thread_id == 0) {
 // current thread
 return os::current_thread_cpu_time();
 } else {
 MutexLockerEx ml(Threads_lock);
-java_thread = find_java_thread_from_id(thread_id);
+java_thread = Threads::find_java_thread_from_java_tid(thread_id);
 if (java_thread != NULL) {
 return os::thread_cpu_time((Thread*) java_thread);
 }
 }
 return -1;
-JVM_END
-// Returns the CPU time consumed by a given thread (in nanoseconds).
-// If thread_id == 0, CPU time for the current thread is returned.
-// If user_sys_cpu_time = true, user level and system CPU time of
-// a given thread is returned; otherwise, only user level CPU time
-// is returned.
-JVM_ENTRY(jlong, jmm_GetThreadCpuTimeWithKind(JNIEnv *env, jlong thread_id, jboolean user_sys_cpu_time))
-if (!os::is_thread_cpu_time_supported()) {
-return -1;
-}
-if (thread_id < 0) {
-THROW_MSG_(vmSymbols::java_lang_IllegalArgumentException(),
-"Invalid thread ID", -1);
-}
-JavaThread* java_thread = NULL;
-if (thread_id == 0) {
-// current thread
-return os::current_thread_cpu_time(user_sys_cpu_time != 0);
-} else {
-MutexLockerEx ml(Threads_lock);
-java_thread = find_java_thread_from_id(thread_id);
-if (java_thread != NULL) {
-return os::thread_cpu_time((Thread*) java_thread, user_sys_cpu_time != 0);
-}
-}
-return -1;
-JVM_END
-// Gets an array containing the CPU times consumed by a set of threads
-// (in nanoseconds).  Each element of the array is the CPU time for the
-// thread ID specified in the corresponding entry in the given array
-// of thread IDs; or -1 if the thread does not exist or has terminated.
-// If user_sys_cpu_time = true, the sum of user level and system CPU time
-// for the given thread is returned; otherwise, only user level CPU time
-// is returned.
-JVM_ENTRY(void, jmm_GetThreadCpuTimesWithKind(JNIEnv *env, jlongArray ids,
-jlongArray timeArray,
-jboolean user_sys_cpu_time))
-// Check if threads is null
-if (ids == NULL || timeArray == NULL) {
-THROW(vmSymbols::java_lang_NullPointerException());
-}
-ResourceMark rm(THREAD);
-typeArrayOop ta = typeArrayOop(JNIHandles::resolve_non_null(ids));
-typeArrayHandle ids_ah(THREAD, ta);
-typeArrayOop tia = typeArrayOop(JNIHandles::resolve_non_null(timeArray));
-typeArrayHandle timeArray_h(THREAD, tia);
-// validate the thread id array
-validate_thread_id_array(ids_ah, CHECK);
-// timeArray must be of the same length as the given array of thread IDs
-int num_threads = ids_ah->length();
-if (num_threads != timeArray_h->length()) {
-THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
-"The length of the given long array does not match the length of "
-"the given array of thread IDs");
-}
-MutexLockerEx ml(Threads_lock);
-for (int i = 0; i < num_threads; i++) {
-JavaThread* java_thread = find_java_thread_from_id(ids_ah->long_at(i));
-if (java_thread != NULL) {
-timeArray_h->long_at_put(i, os::thread_cpu_time((Thread*)java_thread,
-user_sys_cpu_time != 0));
-}
-}
 JVM_END
 // Returns a String array of all VM global flag names
 JVM_ENTRY(jobjectArray, jmm_GetVMGlobalNames(JNIEnv *env))
 // last flag entry is always NULL, so subtract 1
 jlong Management::ticks_to_ms(jlong ticks) {
 assert(os::elapsed_frequency() > 0, "Must be non-zero");
 return (jlong)(((double)ticks / (double)os::elapsed_frequency())
 * (double)1000.0);
 }
+#endif // INCLUDE_MANAGEMENT
+// Gets an array containing the amount of memory allocated on the Java
+// heap for a set of threads (in bytes).  Each element of the array is
+// the amount of memory allocated for the thread ID specified in the
+// corresponding entry in the given array of thread IDs; or -1 if the
+// thread does not exist or has terminated.
+JVM_ENTRY(void, jmm_GetThreadAllocatedMemory(JNIEnv *env, jlongArray ids,
+jlongArray sizeArray))
+// Check if threads is null
+if (ids == NULL || sizeArray == NULL) {
+THROW(vmSymbols::java_lang_NullPointerException());
+}
+ResourceMark rm(THREAD);
+typeArrayOop ta = typeArrayOop(JNIHandles::resolve_non_null(ids));
+typeArrayHandle ids_ah(THREAD, ta);
+typeArrayOop sa = typeArrayOop(JNIHandles::resolve_non_null(sizeArray));
+typeArrayHandle sizeArray_h(THREAD, sa);
+// validate the thread id array
+validate_thread_id_array(ids_ah, CHECK);
+// sizeArray must be of the same length as the given array of thread IDs
+int num_threads = ids_ah->length();
+if (num_threads != sizeArray_h->length()) {
+THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
+"The length of the given long array does not match the length of "
+"the given array of thread IDs");
+}
+MutexLockerEx ml(Threads_lock);
+for (int i = 0; i < num_threads; i++) {
+JavaThread* java_thread = Threads::find_java_thread_from_java_tid(ids_ah->long_at(i));
+if (java_thread != NULL) {
+sizeArray_h->long_at_put(i, java_thread->cooked_allocated_bytes());
+}
+}
+JVM_END
+// Returns the CPU time consumed by a given thread (in nanoseconds).
+// If thread_id == 0, CPU time for the current thread is returned.
+// If user_sys_cpu_time = true, user level and system CPU time of
+// a given thread is returned; otherwise, only user level CPU time
+// is returned.
+JVM_ENTRY(jlong, jmm_GetThreadCpuTimeWithKind(JNIEnv *env, jlong thread_id, jboolean user_sys_cpu_time))
+if (!os::is_thread_cpu_time_supported()) {
+return -1;
+}
+if (thread_id < 0) {
+THROW_MSG_(vmSymbols::java_lang_IllegalArgumentException(),
+"Invalid thread ID", -1);
+}
+JavaThread* java_thread = NULL;
+if (thread_id == 0) {
+// current thread
+return os::current_thread_cpu_time(user_sys_cpu_time != 0);
+} else {
+MutexLockerEx ml(Threads_lock);
+java_thread = Threads::find_java_thread_from_java_tid(thread_id);
+if (java_thread != NULL) {
+return os::thread_cpu_time((Thread*) java_thread, user_sys_cpu_time != 0);
+}
+}
+return -1;
+JVM_END
+// Gets an array containing the CPU times consumed by a set of threads
+// (in nanoseconds).  Each element of the array is the CPU time for the
+// thread ID specified in the corresponding entry in the given array
+// of thread IDs; or -1 if the thread does not exist or has terminated.
+// If user_sys_cpu_time = true, the sum of user level and system CPU time
+// for the given thread is returned; otherwise, only user level CPU time
+// is returned.
+JVM_ENTRY(void, jmm_GetThreadCpuTimesWithKind(JNIEnv *env, jlongArray ids,
+jlongArray timeArray,
+jboolean user_sys_cpu_time))
+// Check if threads is null
+if (ids == NULL || timeArray == NULL) {
+THROW(vmSymbols::java_lang_NullPointerException());
+}
+ResourceMark rm(THREAD);
+typeArrayOop ta = typeArrayOop(JNIHandles::resolve_non_null(ids));
+typeArrayHandle ids_ah(THREAD, ta);
+typeArrayOop tia = typeArrayOop(JNIHandles::resolve_non_null(timeArray));
+typeArrayHandle timeArray_h(THREAD, tia);
+// validate the thread id array
+validate_thread_id_array(ids_ah, CHECK);
+// timeArray must be of the same length as the given array of thread IDs
+int num_threads = ids_ah->length();
+if (num_threads != timeArray_h->length()) {
+THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
+"The length of the given long array does not match the length of "
+"the given array of thread IDs");
+}
+MutexLockerEx ml(Threads_lock);
+for (int i = 0; i < num_threads; i++) {
+JavaThread* java_thread = Threads::find_java_thread_from_java_tid(ids_ah->long_at(i));
+if (java_thread != NULL) {
+timeArray_h->long_at_put(i, os::thread_cpu_time((Thread*)java_thread,
+user_sys_cpu_time != 0));
+}
+}
+JVM_END
+#if INCLUDE_MANAGEMENT
 const struct jmmInterface_1_ jmm_interface = {
 NULL,
 NULL,
 jmm_GetVersion,
 jmm_GetOptionalSupport,

changeset 26834	41332d860d6a
parent 25960	729cd80956ae
child 27466	36c9a91eb418