mirror of
https://github.com/openjdk/jdk.git
synced 2026-02-03 23:18:28 +00:00
8049695: nsk/jdb/options/connect/connect003 fails with "Launched jdb could not attach to debuggee during 300000 milliseconds"
Reviewed-by: dholmes, sspitsyn, cjplummer
This commit is contained in:
parent
cd9bd4ecc7
commit
4fd65fbdaf
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1999, 2018, 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
|
||||
@ -404,25 +404,25 @@ static int
|
||||
createStream(char *name, Stream *stream)
|
||||
{
|
||||
jint error;
|
||||
char prefix[MAX_IPC_PREFIX];
|
||||
char objectName[MAX_IPC_NAME];
|
||||
|
||||
sprintf(prefix, "%s.mutex", name);
|
||||
error = createWithGeneratedName(prefix, stream->shared->mutexName,
|
||||
sprintf(objectName, "%s.mutex", name);
|
||||
error = createWithGeneratedName(objectName, stream->shared->mutexName,
|
||||
createMutex, &stream->mutex);
|
||||
if (error != SYS_OK) {
|
||||
return error;
|
||||
}
|
||||
|
||||
sprintf(prefix, "%s.hasData", name);
|
||||
error = createWithGeneratedName(prefix, stream->shared->hasDataEventName,
|
||||
sprintf(objectName, "%s.hasData", name);
|
||||
error = createWithGeneratedName(objectName, stream->shared->hasDataEventName,
|
||||
createEvent, &stream->hasData);
|
||||
if (error != SYS_OK) {
|
||||
(void)closeStream(stream, JNI_FALSE);
|
||||
return error;
|
||||
}
|
||||
|
||||
sprintf(prefix, "%s.hasSpace", name);
|
||||
error = createWithGeneratedName(prefix, stream->shared->hasSpaceEventName,
|
||||
sprintf(objectName, "%s.hasSpace", name);
|
||||
error = createWithGeneratedName(objectName, stream->shared->hasSpaceEventName,
|
||||
createEvent, &stream->hasSpace);
|
||||
if (error != SYS_OK) {
|
||||
(void)closeStream(stream, JNI_FALSE);
|
||||
@ -598,7 +598,7 @@ createConnection(SharedMemoryTransport *transport, jlong otherPID,
|
||||
SharedMemoryConnection **connectionPtr)
|
||||
{
|
||||
jint error;
|
||||
char streamPrefix[MAX_IPC_NAME];
|
||||
char streamName[MAX_IPC_NAME];
|
||||
|
||||
SharedMemoryConnection *connection = allocConnection();
|
||||
if (connection == NULL) {
|
||||
@ -619,17 +619,17 @@ createConnection(SharedMemoryTransport *transport, jlong otherPID,
|
||||
connection->incoming.shared = &connection->shared->toServer;
|
||||
connection->outgoing.shared = &connection->shared->toClient;
|
||||
|
||||
strcpy(streamPrefix, connection->name);
|
||||
strcat(streamPrefix, ".ctos");
|
||||
error = createStream(streamPrefix, &connection->incoming);
|
||||
strcpy(streamName, connection->name);
|
||||
strcat(streamName, ".ctos");
|
||||
error = createStream(streamName, &connection->incoming);
|
||||
if (error != SYS_OK) {
|
||||
closeConnection(connection);
|
||||
return error;
|
||||
}
|
||||
|
||||
strcpy(streamPrefix, connection->name);
|
||||
strcat(streamPrefix, ".stoc");
|
||||
error = createStream(streamPrefix, &connection->outgoing);
|
||||
strcpy(streamName, connection->name);
|
||||
strcat(streamName, ".stoc");
|
||||
error = createStream(streamName, &connection->outgoing);
|
||||
if (error != SYS_OK) {
|
||||
closeConnection(connection);
|
||||
return error;
|
||||
@ -746,9 +746,7 @@ createTransport(const char *address, SharedMemoryTransport **transportPtr)
|
||||
{
|
||||
SharedMemoryTransport *transport;
|
||||
jint error;
|
||||
char prefix[MAX_IPC_PREFIX];
|
||||
|
||||
|
||||
char objectName[MAX_IPC_NAME];
|
||||
|
||||
transport = allocTransport();
|
||||
if (transport == NULL) {
|
||||
@ -784,24 +782,24 @@ createTransport(const char *address, SharedMemoryTransport **transportPtr)
|
||||
memset(transport->shared, 0, sizeof(SharedListener));
|
||||
transport->shared->acceptingPID = sysProcessGetID();
|
||||
|
||||
sprintf(prefix, "%s.mutex", transport->name);
|
||||
error = createWithGeneratedName(prefix, transport->shared->mutexName,
|
||||
sprintf(objectName, "%s.mutex", transport->name);
|
||||
error = createWithGeneratedName(objectName, transport->shared->mutexName,
|
||||
createMutex, &transport->mutex);
|
||||
if (error != SYS_OK) {
|
||||
closeTransport(transport);
|
||||
return error;
|
||||
}
|
||||
|
||||
sprintf(prefix, "%s.accept", transport->name);
|
||||
error = createWithGeneratedName(prefix, transport->shared->acceptEventName,
|
||||
sprintf(objectName, "%s.accept", transport->name);
|
||||
error = createWithGeneratedName(objectName, transport->shared->acceptEventName,
|
||||
createEvent, &transport->acceptEvent);
|
||||
if (error != SYS_OK) {
|
||||
closeTransport(transport);
|
||||
return error;
|
||||
}
|
||||
|
||||
sprintf(prefix, "%s.attach", transport->name);
|
||||
error = createWithGeneratedName(prefix, transport->shared->attachEventName,
|
||||
sprintf(objectName, "%s.attach", transport->name);
|
||||
error = createWithGeneratedName(objectName, transport->shared->attachEventName,
|
||||
createEvent, &transport->attachEvent);
|
||||
if (error != SYS_OK) {
|
||||
closeTransport(transport);
|
||||
|
||||
124
test/hotspot/jtreg/serviceability/attach/ShMemLongName.java
Normal file
124
test/hotspot/jtreg/serviceability/attach/ShMemLongName.java
Normal file
@ -0,0 +1,124 @@
|
||||
/*
|
||||
* Copyright (c) 2018, 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 8049695
|
||||
* @summary Ensure shmem transport works with long names
|
||||
* @requires os.family == "windows"
|
||||
* @library /test/lib
|
||||
* @run main/othervm ShMemLongName
|
||||
*/
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStreamReader;
|
||||
import java.io.InputStream;
|
||||
import java.util.Collections;
|
||||
import java.util.Map;
|
||||
|
||||
import com.sun.jdi.Bootstrap;
|
||||
import com.sun.jdi.VirtualMachine;
|
||||
import com.sun.jdi.connect.AttachingConnector;
|
||||
import com.sun.jdi.connect.Connector;
|
||||
import jdk.test.lib.process.ProcessTools;
|
||||
|
||||
|
||||
public class ShMemLongName {
|
||||
|
||||
private static final int maxShMemLength = 49;
|
||||
|
||||
private static final String transport = "dt_shmem";
|
||||
|
||||
public static void main(String[] args) throws Exception {
|
||||
// test with the maximum supported shmem name length
|
||||
String shmemName = ("ShMemLongName" + ProcessHandle.current().pid()
|
||||
+ String.join("", Collections.nCopies(maxShMemLength, "x"))
|
||||
).substring(0, maxShMemLength);
|
||||
Process target = getTarget(shmemName).start();
|
||||
try {
|
||||
waitForReady(target);
|
||||
|
||||
log("attaching to the VM...");
|
||||
AttachingConnector ac = Bootstrap.virtualMachineManager().attachingConnectors()
|
||||
.stream()
|
||||
.filter(c -> transport.equals(c.transport().name()))
|
||||
.findFirst()
|
||||
.orElseThrow(() -> new RuntimeException("Failed to find transport " + transport));
|
||||
Map<String, Connector.Argument> acArgs = ac.defaultArguments();
|
||||
acArgs.get("name").setValue(shmemName);
|
||||
|
||||
VirtualMachine vm = ac.attach(acArgs);
|
||||
|
||||
log("attached. test(1) PASSED.");
|
||||
|
||||
vm.dispose();
|
||||
} finally {
|
||||
target.destroy();
|
||||
target.waitFor();
|
||||
}
|
||||
|
||||
// extra test: ensure using of too-long name fails gracefully
|
||||
// (shmemName + "X") is expected to be "too long".
|
||||
ProcessTools.executeProcess(getTarget(shmemName + "X"))
|
||||
.shouldContain("address strings longer than")
|
||||
.shouldHaveExitValue(2);
|
||||
log("test(2) PASSED.");
|
||||
}
|
||||
|
||||
private static void log(String s) {
|
||||
System.out.println(s);
|
||||
System.out.flush();
|
||||
}
|
||||
|
||||
// creates target process builder for the specified shmem transport name
|
||||
private static ProcessBuilder getTarget(String shmemName) throws IOException {
|
||||
log("starting target with shmem name: '" + shmemName + "'...");
|
||||
return ProcessTools.createJavaProcessBuilder(
|
||||
"-Xdebug",
|
||||
"-Xrunjdwp:transport=" + transport + ",server=y,suspend=n,address=" + shmemName,
|
||||
"ShMemLongName$Target");
|
||||
}
|
||||
|
||||
private static void waitForReady(Process target) throws Exception {
|
||||
InputStream os = target.getInputStream();
|
||||
try (BufferedReader reader = new BufferedReader(new InputStreamReader(os))) {
|
||||
String line;
|
||||
while ((line = reader.readLine()) != null) {
|
||||
if (line.equals(Target.readyString)) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static class Target {
|
||||
public static final String readyString = "Ready";
|
||||
public static void main(String[] args) throws Exception {
|
||||
log(readyString);
|
||||
while (true) {
|
||||
Thread.sleep(1000);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user