archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-18 10:04:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8151442: jstack doesn't close quotation marks properly with threads' name greater than 1996 characters

Browse source 
Reviewed-by: dsamersoff, kevinw
This commit is contained in:
Cheleswer Sahu 2016-04-01 13:51:29 +05:30
parent 0c5e3bcbd6
commit 6f3cb076c4
2 changed files with 78 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -153,7 +153,6 @@ void universe_post_module_init(); // must happen after call_initPhase2
// Current thread is maintained as a thread-local variable // Current thread is maintained as a thread-local variable
THREAD_LOCAL_DECL Thread* Thread::_thr_current = NULL; THREAD_LOCAL_DECL Thread* Thread::_thr_current = NULL;
#endif #endif
// Class hierarchy // Class hierarchy
// - Thread // - Thread
// - VMThread // - VMThread
@ -2888,7 +2887,9 @@ void JavaThread::print_thread_state() const {
// Called by Threads::print() for VM_PrintThreads operation // Called by Threads::print() for VM_PrintThreads operation
void JavaThread::print_on(outputStream *st) const { void JavaThread::print_on(outputStream *st) const {
st->print("\"%s\" ", get_thread_name()); st->print_raw("\"");
st->print_raw(get_thread_name());
st->print_raw("\" ");
oop thread_oop = threadObj(); oop thread_oop = threadObj();
if (thread_oop != NULL) { if (thread_oop != NULL) {
st->print("#" INT64_FORMAT " ", java_lang_Thread::thread_id(thread_oop)); st->print("#" INT64_FORMAT " ", java_lang_Thread::thread_id(thread_oop));

75
hotspot/test/serviceability/tmtools/jstack/JstackThreadTest.java Normal file
View file

@ -0,0 +1,75 @@
/*
* Copyright (c) 2016, 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.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
import java.util.Arrays;
import jdk.test.lib.JDKToolLauncher;
import jdk.test.lib.OutputAnalyzer;
import jdk.test.lib.ProcessTools;
/*
* @test JstackThreadTest
* @bug 8151442
* @summary jstack doesn't close quotation marks properly with threads' name greater than 1996 characters
* @library /testlibrary
* @build jdk.test.lib.*
* @run main JstackThreadTest
*/
public class JstackThreadTest {
static class NamedThread extends Thread {
NamedThread(String name) {
setName(name);
}
@Override
public void run() {
try {
Thread.sleep(2000);
} catch(Exception e){
e.printStackTrace();
}
}
}
public static void main(String[] args) throws Exception {
StringBuilder sb = new StringBuilder();
/*create a string more than 1996 character */
for(int i = 0; i < 1998; i++){
sb.append("a");
}
testWithName(sb.toString());
}
private static void testWithName(String name) throws Exception {
// Start a thread with a long thread name
NamedThread thread = new NamedThread(name);
thread.start();
ProcessBuilder processBuilder = new ProcessBuilder();
JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jstack");
launcher.addToolArg("-l");
launcher.addToolArg(Long.toString(ProcessTools.getProcessId()));
processBuilder.command(launcher.getCommand());
System.out.println(Arrays.toString(processBuilder.command().toArray()).replace(",", ""));
OutputAnalyzer output = ProcessTools.executeProcess(processBuilder);
System.out.println(output.getOutput());
output.shouldContain("\""+ name + "\"");
}
}