archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 23:04:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8059677: Thread.getName() instantiates Strings

Browse source 
Reviewed-by: coleenp, dholmes, sla
This commit is contained in:
Aleksey Shipilev 2014-11-13 01:57:09 +03:00
parent 0bad624124
commit f8712e7800
6 changed files with 17 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/OopUtilities.java
View file

@ -219,7 +219,7 @@ public class OopUtilities implements /* imports */ JVMTIThreadState {
if (threadNameField == null) { if (threadNameField == null) {
SystemDictionary sysDict = VM.getVM().getSystemDictionary(); SystemDictionary sysDict = VM.getVM().getSystemDictionary();
InstanceKlass k = sysDict.getThreadKlass(); InstanceKlass k = sysDict.getThreadKlass();
threadNameField = (OopField) k.findField("name", "[C"); threadNameField = (OopField) k.findField("name", "Ljava/lang/String;");
threadGroupField = (OopField) k.findField("group", "Ljava/lang/ThreadGroup;"); threadGroupField = (OopField) k.findField("group", "Ljava/lang/ThreadGroup;");
threadEETopField = (LongField) k.findField("eetop", "J"); threadEETopField = (LongField) k.findField("eetop", "J");
threadTIDField = (LongField) k.findField("tid", "J"); threadTIDField = (LongField) k.findField("tid", "J");
@ -258,7 +258,7 @@ public class OopUtilities implements /* imports */ JVMTIThreadState {
public static String threadOopGetName(Oop threadOop) { public static String threadOopGetName(Oop threadOop) {
initThreadFields(); initThreadFields();
return charArrayToString((TypeArray) threadNameField.getValue(threadOop)); return stringOopToString(threadNameField.getValue(threadOop));
} }
/** May return null if, e.g., thread was not started */ /** May return null if, e.g., thread was not started */

11
hotspot/src/share/vm/classfile/javaClasses.cpp
View file

@ -944,7 +944,7 @@ void java_lang_Thread::compute_offsets() {
assert(_group_offset == 0, "offsets should be initialized only once"); assert(_group_offset == 0, "offsets should be initialized only once");
Klass* k = SystemDictionary::Thread_klass(); Klass* k = SystemDictionary::Thread_klass();
compute_offset(_name_offset, k, vmSymbols::name_name(), vmSymbols::char_array_signature()); compute_offset(_name_offset, k, vmSymbols::name_name(), vmSymbols::string_signature());
compute_offset(_group_offset, k, vmSymbols::group_name(), vmSymbols::threadgroup_signature()); compute_offset(_group_offset, k, vmSymbols::group_name(), vmSymbols::threadgroup_signature());
compute_offset(_contextClassLoader_offset, k, vmSymbols::contextClassLoader_name(), vmSymbols::classloader_signature()); compute_offset(_contextClassLoader_offset, k, vmSymbols::contextClassLoader_name(), vmSymbols::classloader_signature());
compute_offset(_inheritedAccessControlContext_offset, k, vmSymbols::inheritedAccessControlContext_name(), vmSymbols::accesscontrolcontext_signature()); compute_offset(_inheritedAccessControlContext_offset, k, vmSymbols::inheritedAccessControlContext_name(), vmSymbols::accesscontrolcontext_signature());
@ -974,15 +974,12 @@ void java_lang_Thread::set_thread(oop java_thread, JavaThread* thread) {
} }
typeArrayOop java_lang_Thread::name(oop java_thread) { oop java_lang_Thread::name(oop java_thread) {
oop name = java_thread->obj_field(_name_offset); return java_thread->obj_field(_name_offset);
assert(name == NULL || (name->is_typeArray() && TypeArrayKlass::cast(name->klass())->element_type() == T_CHAR), "just checking");
return typeArrayOop(name);
} }
void java_lang_Thread::set_name(oop java_thread, typeArrayOop name) { void java_lang_Thread::set_name(oop java_thread, oop name) {
assert(java_thread->obj_field(_name_offset) == NULL, "name should be NULL");
java_thread->obj_field_put(_name_offset, name); java_thread->obj_field_put(_name_offset, name);
} }

4
hotspot/src/share/vm/classfile/javaClasses.hpp
View file

@ -345,8 +345,8 @@ class java_lang_Thread : AllStatic {
// Set JavaThread for instance // Set JavaThread for instance
static void set_thread(oop java_thread, JavaThread* thread); static void set_thread(oop java_thread, JavaThread* thread);
// Name // Name
static typeArrayOop name(oop java_thread); static oop name(oop java_thread);
static void set_name(oop java_thread, typeArrayOop name); static void set_name(oop java_thread, oop name);
// Priority // Priority
static ThreadPriority priority(oop java_thread); static ThreadPriority priority(oop java_thread);
static void set_priority(oop java_thread, ThreadPriority priority); static void set_priority(oop java_thread, ThreadPriority priority);

6
hotspot/src/share/vm/prims/jvmtiEnv.cpp
View file

@ -942,7 +942,7 @@ JvmtiEnv::GetThreadInfo(jthread thread, jvmtiThreadInfo* info_ptr) {
return JVMTI_ERROR_INVALID_THREAD; return JVMTI_ERROR_INVALID_THREAD;
Handle thread_obj(current_thread, thread_oop); Handle thread_obj(current_thread, thread_oop);
typeArrayHandle name; Handle name;
ThreadPriority priority; ThreadPriority priority;
Handle thread_group; Handle thread_group;
Handle context_class_loader; Handle context_class_loader;
@ -950,7 +950,7 @@ JvmtiEnv::GetThreadInfo(jthread thread, jvmtiThreadInfo* info_ptr) {
{ MutexLocker mu(Threads_lock); { MutexLocker mu(Threads_lock);
name = typeArrayHandle(current_thread, java_lang_Thread::name(thread_obj())); name = Handle(current_thread, java_lang_Thread::name(thread_obj()));
priority = java_lang_Thread::priority(thread_obj()); priority = java_lang_Thread::priority(thread_obj());
thread_group = Handle(current_thread, java_lang_Thread::threadGroup(thread_obj())); thread_group = Handle(current_thread, java_lang_Thread::threadGroup(thread_obj()));
is_daemon = java_lang_Thread::is_daemon(thread_obj()); is_daemon = java_lang_Thread::is_daemon(thread_obj());
@ -961,7 +961,7 @@ JvmtiEnv::GetThreadInfo(jthread thread, jvmtiThreadInfo* info_ptr) {
{ const char *n; { const char *n;
if (name() != NULL) { if (name() != NULL) {
n = UNICODE::as_utf8((jchar*) name->base(T_CHAR), name->length()); n = java_lang_String::as_utf8_string(name());
} else { } else {
n = UNICODE::as_utf8(NULL, 0); n = UNICODE::as_utf8(NULL, 0);
} }

6
hotspot/src/share/vm/prims/jvmtiTrace.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -266,11 +266,11 @@ const char *JvmtiTrace::safe_get_thread_name(Thread *thread) {
if (threadObj == NULL) { if (threadObj == NULL) {
return "NULL"; return "NULL";
} }
typeArrayOop name = java_lang_Thread::name(threadObj); oop name = java_lang_Thread::name(threadObj);
if (name == NULL) { if (name == NULL) {
return "<NOT FILLED IN>"; return "<NOT FILLED IN>";
} }
return UNICODE::as_utf8((jchar*) name->base(T_CHAR), name->length()); return java_lang_String::as_utf8_string(name);
} }

8
hotspot/src/share/vm/runtime/thread.cpp
View file

@ -2872,14 +2872,12 @@ const char* JavaThread::get_thread_name_string(char* buf, int buflen) const {
const char* name_str; const char* name_str;
oop thread_obj = threadObj(); oop thread_obj = threadObj();
if (thread_obj != NULL) { if (thread_obj != NULL) {
typeArrayOop name = java_lang_Thread::name(thread_obj); oop name = java_lang_Thread::name(thread_obj);
if (name != NULL) { if (name != NULL) {
if (buf == NULL) { if (buf == NULL) {
name_str = UNICODE::as_utf8((jchar*) name->base(T_CHAR), name_str = java_lang_String::as_utf8_string(name);
name->length());
} else { } else {
name_str = UNICODE::as_utf8((jchar*) name->base(T_CHAR), name_str = java_lang_String::as_utf8_string(name, buf, buflen);
name->length(), buf, buflen);
} }
} else if (is_attaching_via_jni()) { // workaround for 6412693 - see 6404306 } else if (is_attaching_via_jni()) { // workaround for 6412693 - see 6404306
name_str = "<no-name - thread is attaching>"; name_str = "<no-name - thread is attaching>";