mirror of
https://github.com/openjdk/jdk.git
synced 2026-01-28 12:09:14 +00:00
8263640: hs_err improvement: handle class path longer than O_BUFLEN
Reviewed-by: iklam, minqi, dholmes
This commit is contained in:
parent
bb42d75161
commit
c1e2a29448
@ -1110,7 +1110,14 @@ void Arguments::print_on(outputStream* st) {
|
||||
st->print_cr("java_command: %s", java_command() ? java_command() : "<unknown>");
|
||||
if (_java_class_path != NULL) {
|
||||
char* path = _java_class_path->value();
|
||||
st->print_cr("java_class_path (initial): %s", strlen(path) == 0 ? "<not set>" : path );
|
||||
size_t len = strlen(path);
|
||||
st->print("java_class_path (initial): ");
|
||||
// Avoid using st->print_cr() because path length maybe longer than O_BUFLEN.
|
||||
if (len == 0) {
|
||||
st->print_raw_cr("<not set>");
|
||||
} else {
|
||||
st->print_raw_cr(path, len);
|
||||
}
|
||||
}
|
||||
st->print_cr("Launcher Type: %s", _sun_java_launcher);
|
||||
}
|
||||
|
||||
81
test/hotspot/jtreg/runtime/jcmd/JcmdCmdLine.java
Normal file
81
test/hotspot/jtreg/runtime/jcmd/JcmdCmdLine.java
Normal file
@ -0,0 +1,81 @@
|
||||
/*
|
||||
* Copyright (c) 2021, 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.
|
||||
*
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 8263640
|
||||
* @summary In case of a class path is longer than O_BUFLEN, the class path
|
||||
* should not be truncated in the output from jcmd VM.command_line.
|
||||
* @library /test/lib
|
||||
* @run driver JcmdCmdLine
|
||||
*/
|
||||
|
||||
import java.io.File;
|
||||
import java.util.List;
|
||||
import jdk.test.lib.apps.LingeredApp;
|
||||
import jdk.test.lib.dcmd.PidJcmdExecutor;
|
||||
import jdk.test.lib.process.OutputAnalyzer;
|
||||
|
||||
public class JcmdCmdLine {
|
||||
private static LingeredApp theApp = null;
|
||||
private static final int BUFFER_LEN = 2000;
|
||||
private static final String JCMD_OPT = "VM.command_line";
|
||||
private static final String CLASS_PATH_LINE = "java_class_path (initial):";
|
||||
private static final String TRUNCATE_WARNING = "outputStream::do_vsnprintf output truncated";
|
||||
public static void main(String[] args) throws Exception {
|
||||
try {
|
||||
theApp = new LingeredApp();
|
||||
theApp.setUseDefaultClasspath(false);
|
||||
String classPath = System.getProperty("test.class.path");
|
||||
while (classPath.length() < BUFFER_LEN) {
|
||||
classPath += File.pathSeparator + classPath;
|
||||
}
|
||||
LingeredApp.startAppExactJvmOpts(theApp, "-cp", classPath);
|
||||
long pid = theApp.getPid();
|
||||
|
||||
PidJcmdExecutor cmdExecutor = new PidJcmdExecutor(String.valueOf(pid));
|
||||
OutputAnalyzer output = cmdExecutor.execute(JCMD_OPT, true/*silent*/);
|
||||
output.shouldHaveExitValue(0);
|
||||
boolean seenClassPath = false;
|
||||
List<String> lines = output.asLines();
|
||||
for (int i = 0; i < lines.size(); i++) {
|
||||
String line = lines.get(i);
|
||||
if (line.startsWith(CLASS_PATH_LINE)) {
|
||||
seenClassPath = true;
|
||||
if (!line.endsWith(classPath)) {
|
||||
throw new RuntimeException("Incomplete java_class_path line.");
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!seenClassPath) {
|
||||
throw new RuntimeException("Missing java_class_path line.");
|
||||
}
|
||||
} finally {
|
||||
LingeredApp.stopApp(theApp);
|
||||
if (theApp.getOutput().getStderr().contains(TRUNCATE_WARNING)) {
|
||||
throw new RuntimeException("Unexpected truncation warning.");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user