stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8165276: Spec states to invoke the premain method in an agent class if it's public but implementation differs

Browse Source 
Reviewed-by: mchung, dholmes, alanb
This commit is contained in:
Serguei Spitsyn 2021-01-26 07:15:50 +00:00
parent 9ea93238fb
commit c538cd8b79
22 changed files with 293 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/java.instrument/share/classes/sun/instrument/InstrumentationImpl.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2020, 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
@ -27,6 +27,7 @@ package sun.instrument;
import java.lang.instrument.UnmodifiableModuleException; import java.lang.instrument.UnmodifiableModuleException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.lang.reflect.AccessibleObject; import java.lang.reflect.AccessibleObject;
import java.lang.instrument.ClassFileTransformer; import java.lang.instrument.ClassFileTransformer;
import java.lang.instrument.ClassDefinition; import java.lang.instrument.ClassDefinition;
@ -441,12 +442,6 @@ public class InstrumentationImpl implements Instrumentation {
// //
// 1) declared with a signature of (String, Instrumentation) // 1) declared with a signature of (String, Instrumentation)
// 2) declared with a signature of (String) // 2) declared with a signature of (String)
// 3) inherited with a signature of (String, Instrumentation)
// 4) inherited with a signature of (String)
//
// So the declared version of either 1-arg or 2-arg always takes
// primary precedence over an inherited version. After that, the
// 2-arg version takes precedence over the 1-arg version.
// //
// If no method is found then we throw the NoSuchMethodException // If no method is found then we throw the NoSuchMethodException
// from the first attempt so that the exception text indicates // from the first attempt so that the exception text indicates
@ -470,33 +465,6 @@ public class InstrumentationImpl implements Instrumentation {
try { try {
m = javaAgentClass.getDeclaredMethod(methodname, m = javaAgentClass.getDeclaredMethod(methodname,
new Class<?>[] { String.class }); new Class<?>[] { String.class });
} catch (NoSuchMethodException x) {
// ignore this exception because we'll try
// two arg inheritance next
}
}
if (m == null) {
// now try the inherited 2-arg method
try {
m = javaAgentClass.getMethod( methodname,
new Class<?>[] {
String.class,
java.lang.instrument.Instrumentation.class
}
);
twoArgAgent = true;
} catch (NoSuchMethodException x) {
// ignore this exception because we'll try
// one arg inheritance next
}
}
if (m == null) {
// finally try the inherited 1-arg method
try {
m = javaAgentClass.getMethod(methodname,
new Class<?>[] { String.class });
} catch (NoSuchMethodException x) { } catch (NoSuchMethodException x) {
// none of the methods exists so we throw the // none of the methods exists so we throw the
// first NoSuchMethodException as per 5.0 // first NoSuchMethodException as per 5.0
@ -504,11 +472,18 @@ public class InstrumentationImpl implements Instrumentation {
} }
} }
// the premain method should not be required to be public, // reject non-public premain or agentmain method
// make it accessible so we can call it if (!Modifier.isPublic(m.getModifiers())) {
// Note: The spec says the following: String msg = "method " + classname + "." + methodname + " must be declared public";
// The agent class must implement a public static premain method... throw new IllegalAccessException(msg);
setAccessible(m, true); }
if (!Modifier.isPublic(javaAgentClass.getModifiers()) &&
!javaAgentClass.getModule().isNamed()) {
// If the java agent class is in an unnamed module, the java agent class can be non-public.
// Suppress access check upon the invocation of the premain/agentmain method.
setAccessible(m, true);
}
// invoke the 1 or 2-arg method // invoke the 1 or 2-arg method
if (twoArgAgent) { if (twoArgAgent) {

45
test/jdk/java/lang/instrument/PremainClass/NoPremainAgentTest.java → test/jdk/java/lang/instrument/NegativeAgentRunner.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2020, 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
@ -21,38 +21,25 @@
* questions. * questions.
*/ */
import jdk.test.lib.process.OutputAnalyzer; package jdk.java.lang.instrument;
import java.lang.RuntimeException;
import jdk.test.lib.process.ProcessTools; import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.Utils; import jdk.test.lib.process.OutputAnalyzer;
/* public class NegativeAgentRunner {
* @test
* @bug 6289149
* @summary test when the agent's class is missing the premain() function.
* @library /test/lib
* @modules java.management
* java.instrument
* @run build DummyMain
* @run shell ../MakeJAR3.sh NoPremainAgent
* @run main/othervm -XX:-CreateCoredumpOnCrash NoPremainAgentTest
*/
public class NoPremainAgentTest {
// Use a javaagent without the premain() function.
// Verify that we get the correct exception.
public static void main(String[] a) throws Exception {
String testArgs = String.format(
"-javaagent:NoPremainAgent.jar -classpath %s DummyMain",
System.getProperty("test.classes", "."));
public static void main(String argv[]) throws Exception {
if (argv.length != 2) {
throw new RuntimeException("Agent and exception class names are expected in arguments");
}
String agentClassName = argv[0];
String excepClassName = argv[1];
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder( ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
Utils.addTestJavaOpts(testArgs.split("\\s+"))); "-javaagent:" + agentClassName + ".jar",
System.out.println("testjvm.cmd:" + Utils.getCommandLine(pb)); agentClassName);
OutputAnalyzer output = new OutputAnalyzer(pb.start());
OutputAnalyzer output = ProcessTools.executeProcess(pb); output.shouldContain(excepClassName);
System.out.println("testjvm.stdout:" + output.getStdout());
System.out.println("testjvm.stderr:" + output.getStderr());
output.stderrShouldContain("java.lang.NoSuchMethodException");
if (0 == output.getExitValue()) { if (0 == output.getExitValue()) {
throw new RuntimeException("Expected error but got exit value 0"); throw new RuntimeException("Expected error but got exit value 0");
} }

11
test/jdk/java/lang/instrument/PremainClass/InheritAgent0001.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2020, 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
@ -23,17 +23,20 @@
/** /**
* @test * @test
* @bug 6289149 * @bug 6289149 8165276
* @summary test config (0,0,0,1): declared 1-arg in agent class * @summary test config (0,0,0,1): declared 1-arg in agent class
* @author Daniel D. Daugherty, Sun Microsystems * @author Daniel D. Daugherty, Sun Microsystems
* *
* @run shell ../MakeJAR3.sh InheritAgent0001 * @library /test/lib
* @build jdk.java.lang.instrument.PremainClass.InheritAgent0001
* @run driver jdk.test.lib.util.JavaAgentBuilder
* InheritAgent0001 InheritAgent0001.jar
* @run main/othervm -javaagent:InheritAgent0001.jar DummyMain * @run main/othervm -javaagent:InheritAgent0001.jar DummyMain
*/ */
import java.lang.instrument.*; import java.lang.instrument.*;
class InheritAgent0001 extends InheritAgent0001Super { public class InheritAgent0001 extends InheritAgent0001Super {
// //
// This agent has a single argument premain() method which // This agent has a single argument premain() method which

11
test/jdk/java/lang/instrument/PremainClass/InheritAgent0010.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2020, 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
@ -23,17 +23,20 @@
/** /**
* @test * @test
* @bug 6289149 * @bug 6289149 8165276
* @summary test config (0,0,1,0): declared 2-arg in agent class * @summary test config (0,0,1,0): declared 2-arg in agent class
* @author Daniel D. Daugherty, Sun Microsystems * @author Daniel D. Daugherty, Sun Microsystems
* *
* @run shell ../MakeJAR3.sh InheritAgent0010 * @library /test/lib
* @build jdk.java.lang.instrument.PremainClass.InheritAgent0010
* @run driver jdk.test.lib.util.JavaAgentBuilder
* InheritAgent0010 InheritAgent0010.jar
* @run main/othervm -javaagent:InheritAgent0010.jar DummyMain * @run main/othervm -javaagent:InheritAgent0010.jar DummyMain
*/ */
import java.lang.instrument.*; import java.lang.instrument.*;
class InheritAgent0010 extends InheritAgent0010Super { public class InheritAgent0010 extends InheritAgent0010Super {
// This agent does NOT have a single argument premain() method. // This agent does NOT have a single argument premain() method.

11
test/jdk/java/lang/instrument/PremainClass/InheritAgent0011.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2020, 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
@ -23,17 +23,20 @@
/** /**
* @test * @test
* @bug 6289149 * @bug 6289149 8165276
* @summary test config (0,0,1,1): declared 2-arg and declared 1-arg in agent class * @summary test config (0,0,1,1): declared 2-arg and declared 1-arg in agent class
* @author Daniel D. Daugherty, Sun Microsystems * @author Daniel D. Daugherty, Sun Microsystems
* *
* @run shell ../MakeJAR3.sh InheritAgent0011 * @library /test/lib
* @build jdk.java.lang.instrument.PremainClass.InheritAgent0011
* @run driver jdk.test.lib.util.JavaAgentBuilder
* InheritAgent0011 InheritAgent0011.jar
* @run main/othervm -javaagent:InheritAgent0011.jar DummyMain * @run main/othervm -javaagent:InheritAgent0011.jar DummyMain
*/ */
import java.lang.instrument.*; import java.lang.instrument.*;
class InheritAgent0011 extends InheritAgent0011Super { public class InheritAgent0011 extends InheritAgent0011Super {
// //
// This agent has a single argument premain() method which // This agent has a single argument premain() method which

36
test/jdk/java/lang/instrument/PremainClass/InheritAgent0100.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2020, 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
@ -21,34 +21,32 @@
* questions. * questions.
*/ */
/** /*
* @test * @test
* @bug 6289149 * @bug 6289149 8165276
* @summary test config (0,1,0,0): inherited 1-arg in agent class * @summary test config (0,1,0,0): 1-arg premain method in superclass of agent class must be rejected
* @author Daniel D. Daugherty, Sun Microsystems * @library /test/lib
* * @library /test
* @run shell ../MakeJAR3.sh InheritAgent0100 * @modules java.instrument
* @run main/othervm -javaagent:InheritAgent0100.jar DummyMain * @build jdk.java.lang.instrument.PremainClass.InheritAgent0100
* @run driver jdk.test.lib.util.JavaAgentBuilder
* InheritAgent0100 InheritAgent0100.jar
* @run main/othervm jdk.java.lang.instrument.NegativeAgentRunner InheritAgent0100 NoSuchMethodException
*/ */
import java.lang.instrument.*; public class InheritAgent0100 extends InheritAgent0100Super {
class InheritAgent0100 extends InheritAgent0100Super { // This agent does NOT have a single argument premain() method.
// This agent does NOT have a double argument premain() method.
// This agent does NOT have a single argument premain() method.
// This agent does NOT have a double argument premain() method.
} }
class InheritAgent0100Super { class InheritAgent0100Super {
// This agent class has a single argument premain() method which should NOT be called.
//
// This agent has a single argument premain() method which
// is the one that should be called.
//
public static void premain (String agentArgs) { public static void premain (String agentArgs) {
System.out.println("Hello from Single-Arg InheritAgent0100Super!"); System.out.println("Hello from Single-Arg InheritAgent0100Super!");
throw new Error("ERROR: THIS AGENT SHOULD NOT HAVE BEEN CALLED.");
} }
// This agent does NOT have a double argument premain() method. // This agent class does NOT have a double argument premain() method.
} }

13
test/jdk/java/lang/instrument/PremainClass/InheritAgent0101.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2020, 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
@ -23,18 +23,21 @@
/** /**
* @test * @test
* @bug 6289149 * @bug 6289149 8165276
* @summary test config (0,1,0,1): inherited 1-arg and declared 1-arg in agent class * @summary test config (0,1,0,1): 1-arg in superclass and declared 1-arg in agent class
* @author Daniel D. Daugherty, Sun Microsystems * @author Daniel D. Daugherty, Sun Microsystems
* *
* @key intermittent * @key intermittent
* @run shell ../MakeJAR3.sh InheritAgent0101 * @library /test/lib
* @build jdk.java.lang.instrument.PremainClass.InheritAgent0101
* @run driver jdk.test.lib.util.JavaAgentBuilder
* InheritAgent0101 InheritAgent0101.jar
* @run main/othervm -javaagent:InheritAgent0101.jar DummyMain * @run main/othervm -javaagent:InheritAgent0101.jar DummyMain
*/ */
import java.lang.instrument.*; import java.lang.instrument.*;
class InheritAgent0101 extends InheritAgent0101Super { public class InheritAgent0101 extends InheritAgent0101Super {
// //
// This agent has a single argument premain() method which // This agent has a single argument premain() method which

13
test/jdk/java/lang/instrument/PremainClass/InheritAgent0110.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2020, 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
@ -23,17 +23,20 @@
/** /**
* @test * @test
* @bug 6289149 * @bug 6289149 8165276
* @summary test config (0,1,1,0): inherited 1-arg and declared 2-arg in agent class * @summary test config (0,1,1,0): 1-arg in superclass and declared 2-arg in agent class
* @author Daniel D. Daugherty, Sun Microsystems * @author Daniel D. Daugherty, Sun Microsystems
* *
* @run shell ../MakeJAR3.sh InheritAgent0110 * @library /test/lib
* @build jdk.java.lang.instrument.PremainClass.InheritAgent0110
* @run driver jdk.test.lib.util.JavaAgentBuilder
* InheritAgent0110 InheritAgent0110.jar
* @run main/othervm -javaagent:InheritAgent0110.jar DummyMain * @run main/othervm -javaagent:InheritAgent0110.jar DummyMain
*/ */
import java.lang.instrument.*; import java.lang.instrument.*;
class InheritAgent0110 extends InheritAgent0110Super { public class InheritAgent0110 extends InheritAgent0110Super {
// This agent does NOT have a one argument premain() method. // This agent does NOT have a one argument premain() method.

13
test/jdk/java/lang/instrument/PremainClass/InheritAgent0111.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2020, 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
@ -23,17 +23,20 @@
/** /**
* @test * @test
* @bug 6289149 * @bug 6289149 8165276
* @summary test config (0,1,1,1): inherited 1-arg, declared 2-arg and declared 1-arg in agent class * @summary test config (0,1,1,1): 1-arg in superclass, declared 2-arg and 1-arg in agent class
* @author Daniel D. Daugherty, Sun Microsystems * @author Daniel D. Daugherty, Sun Microsystems
* *
* @run shell ../MakeJAR3.sh InheritAgent0111 * @library /test/lib
* @build jdk.java.lang.instrument.PremainClass.InheritAgent0111
* @run driver jdk.test.lib.util.JavaAgentBuilder
* InheritAgent0111 InheritAgent0111.jar
* @run main/othervm -javaagent:InheritAgent0111.jar DummyMain * @run main/othervm -javaagent:InheritAgent0111.jar DummyMain
*/ */
import java.lang.instrument.*; import java.lang.instrument.*;
class InheritAgent0111 extends InheritAgent0111Super { public class InheritAgent0111 extends InheritAgent0111Super {
// //
// This agent has a single argument premain() method which // This agent has a single argument premain() method which

30
test/jdk/java/lang/instrument/PremainClass/InheritAgent1000.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2020, 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
@ -21,19 +21,23 @@
* questions. * questions.
*/ */
/** /*
* @test * @test
* @bug 6289149 * @bug 6289149 8165276
* @summary test config (1,0,0,0): inherited 2-arg in agent class * @summary test config (1,0,0,0): 2-arg premain method in superclass of agent class must be rejected
* @author Daniel D. Daugherty, Sun Microsystems
* *
* @run shell ../MakeJAR3.sh InheritAgent1000 * @library /test/lib
* @run main/othervm -javaagent:InheritAgent1000.jar DummyMain * @library /test
* @modules java.instrument
* @build jdk.java.lang.instrument.PremainClass.InheritAgent1000
* @run driver jdk.test.lib.util.JavaAgentBuilder
* InheritAgent1000 InheritAgent1000.jar
* @run main/othervm jdk.java.lang.instrument.NegativeAgentRunner InheritAgent1000 NoSuchMethodException
*/ */
import java.lang.instrument.*; import java.lang.instrument.Instrumentation;
class InheritAgent1000 extends InheritAgent1000Super { public class InheritAgent1000 extends InheritAgent1000Super {
// This agent does NOT have a single argument premain() method. // This agent does NOT have a single argument premain() method.
@ -42,13 +46,11 @@ class InheritAgent1000 extends InheritAgent1000Super {
class InheritAgent1000Super { class InheritAgent1000Super {
// This agent does NOT have a single argument premain() method. // This agent class does NOT have a single argument premain() method.
// // This agent class has a double argument premain() method which should NOT be called.
// This agent has a double argument premain() method which
// is the one that should be called.
//
public static void premain (String agentArgs, Instrumentation instArg) { public static void premain (String agentArgs, Instrumentation instArg) {
System.out.println("Hello from Double-Arg InheritAgent1000Super!"); System.out.println("Hello from Double-Arg InheritAgent1000Super!");
throw new Error("ERROR: THIS AGENT SHOULD NOT HAVE BEEN CALLED.");
} }
} }

13
test/jdk/java/lang/instrument/PremainClass/InheritAgent1001.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2020, 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
@ -23,17 +23,20 @@
/** /**
* @test * @test
* @bug 6289149 * @bug 6289149 8165276
* @summary test config (1,0,0,1): inherited 2-arg, and declared 1-arg in agent class * @summary test config (1,0,0,1): 2-arg in superclass, and declared 1-arg in agent class
* @author Daniel D. Daugherty, Sun Microsystems * @author Daniel D. Daugherty, Sun Microsystems
* *
* @run shell ../MakeJAR3.sh InheritAgent1001 * @library /test/lib
* @build jdk.java.lang.instrument.PremainClass.InheritAgent1001
* @run driver jdk.test.lib.util.JavaAgentBuilder
* InheritAgent1001 InheritAgent1001.jar
* @run main/othervm -javaagent:InheritAgent1001.jar DummyMain * @run main/othervm -javaagent:InheritAgent1001.jar DummyMain
*/ */
import java.lang.instrument.*; import java.lang.instrument.*;
class InheritAgent1001 extends InheritAgent1001Super { public class InheritAgent1001 extends InheritAgent1001Super {
// //
// This agent has a single argument premain() method which // This agent has a single argument premain() method which

13
test/jdk/java/lang/instrument/PremainClass/InheritAgent1010.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2020, 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
@ -23,17 +23,20 @@
/** /**
* @test * @test
* @bug 6289149 * @bug 6289149 8165276
* @summary test config (1,0,1,0): inherited 2-arg, and declared 2-arg in agent class * @summary test config (1,0,1,0): 2-arg in superclass, and declared 2-arg in agent class
* @author Daniel D. Daugherty, Sun Microsystems * @author Daniel D. Daugherty, Sun Microsystems
* *
* @run shell ../MakeJAR3.sh InheritAgent1010 * @library /test/lib
* @build jdk.java.lang.instrument.PremainClass.InheritAgent1010
* @run driver jdk.test.lib.util.JavaAgentBuilder
* InheritAgent1010 InheritAgent1010.jar
* @run main/othervm -javaagent:InheritAgent1010.jar DummyMain * @run main/othervm -javaagent:InheritAgent1010.jar DummyMain
*/ */
import java.lang.instrument.*; import java.lang.instrument.*;
class InheritAgent1010 extends InheritAgent1010Super { public class InheritAgent1010 extends InheritAgent1010Super {
// This agent does NOT have a single argument premain() method. // This agent does NOT have a single argument premain() method.

13
test/jdk/java/lang/instrument/PremainClass/InheritAgent1011.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2020, 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
@ -23,17 +23,20 @@
/** /**
* @test * @test
* @bug 6289149 * @bug 6289149 8165276
* @summary test config (1,0,1,1): inherited 2-arg, declared 2-arg and declared 1-arg in agent class * @summary test config (1,0,1,1): 2-arg in superclass, declared 2-arg and declared 1-arg in agent class
* @author Daniel D. Daugherty, Sun Microsystems * @author Daniel D. Daugherty, Sun Microsystems
* *
* @run shell ../MakeJAR3.sh InheritAgent1011 * @library /test/lib
* @build jdk.java.lang.instrument.PremainClass.InheritAgent1011
* @run driver jdk.test.lib.util.JavaAgentBuilder
* InheritAgent1011 InheritAgent1011.jar
* @run main/othervm -javaagent:InheritAgent1011.jar DummyMain * @run main/othervm -javaagent:InheritAgent1011.jar DummyMain
*/ */
import java.lang.instrument.*; import java.lang.instrument.*;
class InheritAgent1011 extends InheritAgent1011Super { public class InheritAgent1011 extends InheritAgent1011Super {
// //
// This agent has a single argument premain() method which // This agent has a single argument premain() method which

34
test/jdk/java/lang/instrument/PremainClass/InheritAgent1100.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2020, 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
@ -21,19 +21,23 @@
* questions. * questions.
*/ */
/** /*
* @test * @test
* @bug 6289149 * @bug 6289149 8165276
* @summary test config (1,1,0,0): inherited 2-arg and inherited 1-arg in agent class * @summary test config (1,1,0,0): 2-arg and 1-arg premain methods in superclass of agent class must be rejected
* @author Daniel D. Daugherty, Sun Microsystems
* *
* @run shell ../MakeJAR3.sh InheritAgent1100 * @library /test/lib
* @run main/othervm -javaagent:InheritAgent1100.jar DummyMain * @library /test
* @modules java.instrument
* @build jdk.java.lang.instrument.PremainClass.InheritAgent1100
* @run driver jdk.test.lib.util.JavaAgentBuilder
* InheritAgent1100 InheritAgent1100.jar
* @run main/othervm jdk.java.lang.instrument.NegativeAgentRunner InheritAgent1100 NoSuchMethodException
*/ */
import java.lang.instrument.*; import java.lang.instrument.Instrumentation;
class InheritAgent1100 extends InheritAgent1100Super { public class InheritAgent1100 extends InheritAgent1100Super {
// This agent does NOT have a single argument premain() method. // This agent does NOT have a single argument premain() method.
@ -41,21 +45,15 @@ class InheritAgent1100 extends InheritAgent1100Super {
} }
class InheritAgent1100Super { class InheritAgent1100Super {
// This agent class has a single argument premain() method which should NOT be called.
//
// This agent has a single argument premain() method which
// is NOT the one that should be called.
//
public static void premain (String agentArgs) { public static void premain (String agentArgs) {
System.out.println("Hello from Single-Arg InheritAgent1100Super!"); System.out.println("Hello from Single-Arg InheritAgent1100Super!");
throw new Error("ERROR: THIS AGENT SHOULD NOT HAVE BEEN CALLED."); throw new Error("ERROR: THIS AGENT SHOULD NOT HAVE BEEN CALLED.");
} }
// // This agent class has a double argument premain() method which should NOT be called.
// This agent has a double argument premain() method which
// is the one that should be called.
//
public static void premain (String agentArgs, Instrumentation instArg) { public static void premain (String agentArgs, Instrumentation instArg) {
System.out.println("Hello from Double-Arg InheritAgent1100Super!"); System.out.println("Hello from Double-Arg InheritAgent1100Super!");
throw new Error("ERROR: THIS AGENT SHOULD NOT HAVE BEEN CALLED.");
} }
} }

13
test/jdk/java/lang/instrument/PremainClass/InheritAgent1101.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2020, 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
@ -23,17 +23,20 @@
/** /**
* @test * @test
* @bug 6289149 * @bug 6289149 8165276
* @summary test config (1,1,0,1): inherited 2-arg, inherited 1-arg, and declared 1-arg in agent class * @summary test config (1,1,0,1): 2-arg and 1-arg in superclass, and declared 1-arg in agent class
* @author Daniel D. Daugherty, Sun Microsystems * @author Daniel D. Daugherty, Sun Microsystems
* *
* @run shell ../MakeJAR3.sh InheritAgent1101 * @library /test/lib
* @build jdk.java.lang.instrument.PremainClass.InheritAgent1101
* @run driver jdk.test.lib.util.JavaAgentBuilder
* InheritAgent1101 InheritAgent1101.jar
* @run main/othervm -javaagent:InheritAgent1101.jar DummyMain * @run main/othervm -javaagent:InheritAgent1101.jar DummyMain
*/ */
import java.lang.instrument.*; import java.lang.instrument.*;
class InheritAgent1101 extends InheritAgent1101Super { public class InheritAgent1101 extends InheritAgent1101Super {
// //
// This agent has a single argument premain() method which // This agent has a single argument premain() method which

13
test/jdk/java/lang/instrument/PremainClass/InheritAgent1110.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2020, 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
@ -23,17 +23,20 @@
/** /**
* @test * @test
* @bug 6289149 * @bug 6289149 8165276
* @summary test config (1,1,1,0): inherited 2-arg, inherited 1-arg, and declared 2-arg in agent class * @summary test config (1,1,1,0): 2-arg and 1-arg in superclass, and declared 2-arg in agent class
* @author Daniel D. Daugherty, Sun Microsystems * @author Daniel D. Daugherty, Sun Microsystems
* *
* @run shell ../MakeJAR3.sh InheritAgent1110 * @library /test/lib
* @build jdk.java.lang.instrument.PremainClass.InheritAgent1110
* @run driver jdk.test.lib.util.JavaAgentBuilder
* InheritAgent1110 InheritAgent1110.jar
* @run main/othervm -javaagent:InheritAgent1110.jar DummyMain * @run main/othervm -javaagent:InheritAgent1110.jar DummyMain
*/ */
import java.lang.instrument.*; import java.lang.instrument.*;
class InheritAgent1110 extends InheritAgent1110Super { public class InheritAgent1110 extends InheritAgent1110Super {
// This agent does NOT have a single argument premain() method. // This agent does NOT have a single argument premain() method.

13
test/jdk/java/lang/instrument/PremainClass/InheritAgent1111.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2020, 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
@ -23,17 +23,20 @@
/** /**
* @test * @test
* @bug 6289149 * @bug 6289149 8165276
* @summary test config (1,1,1,1): inherited 2-arg, inherited 1-arg, declared 2-arg and declared 1-arg in agent class * @summary test config (1,1,1,1): 2-arg and 1-arg in superclass, declared 2-arg and 1-arg in agent class
* @author Daniel D. Daugherty, Sun Microsystems * @author Daniel D. Daugherty, Sun Microsystems
* *
* @run shell ../MakeJAR3.sh InheritAgent1111 * @library /test/lib
* @build jdk.java.lang.instrument.PremainClass.InheritAgent1111
* @run driver jdk.test.lib.util.JavaAgentBuilder
* InheritAgent1111 InheritAgent1111.jar
* @run main/othervm -javaagent:InheritAgent1111.jar DummyMain * @run main/othervm -javaagent:InheritAgent1111.jar DummyMain
*/ */
import java.lang.instrument.*; import java.lang.instrument.*;
class InheritAgent1111 extends InheritAgent1111Super { public class InheritAgent1111 extends InheritAgent1111Super {
// //
// This agent has a single argument premain() method which // This agent has a single argument premain() method which

17
test/jdk/java/lang/instrument/PremainClass/NoPremainAgent.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2020, 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
@ -21,9 +21,20 @@
* questions. * questions.
*/ */
import java.lang.instrument.*; /*
* @test
* @bug 6289149
* @summary test when the agent's class is missing the premain() function.
* @library /test/lib
* @library /test
* @modules java.instrument
* @build jdk.java.lang.instrument.PremainClass.NoPremainAgent
* @run driver jdk.test.lib.util.JavaAgentBuilder
* NoPremainAgent NoPremainAgent.jar
* @run main/othervm -XX:-CreateCoredumpOnCrash jdk.java.lang.instrument.NegativeAgentRunner NoPremainAgent NoSuchMethodException
*/
class NoPremainAgent { public class NoPremainAgent {
// This agent is missing the premain() function. // This agent is missing the premain() function.
} }

45
test/jdk/java/lang/instrument/PremainClass/NonPublicAgent.java Normal file
View File

@ -0,0 +1,45 @@
/*
* Copyright (c) 2020, 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 8165276
* @summary Test that public premain method from non-public agent is NOT rejected to load
* @library /test/lib
* @modules java.instrument
* @build jdk.java.lang.instrument.PremainClass.NonPublicAgent
* @run driver jdk.test.lib.util.JavaAgentBuilder
* NonPublicAgent NonPublicAgent.jar
* @run main/othervm -javaagent:NonPublicAgent.jar DummyMain
*/
import java.lang.instrument.Instrumentation;
// This class is intentionally non-public to ensure its premain method is NOT rejected.
class NonPublicAgent {
// This premain method has to be resolved even if its class is not public
public static void premain(String agentArgs, Instrumentation inst) {
System.out.println("premain: NonPublicAgent was loaded");
}
}

46
test/jdk/java/lang/instrument/PremainClass/NonPublicPremainAgent.java Normal file
View File

@ -0,0 +1,46 @@
/*
* Copyright (c) 2020, 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 8165276
* @summary Test that agent with non-public premain method is rejected to load
* @library /test/lib
* @library /test
* @modules java.instrument
* @build jdk.java.lang.instrument.PremainClass.NonPublicPremainAgent
* @run driver jdk.test.lib.util.JavaAgentBuilder
* NonPublicPremainAgent NonPublicPremainAgent.jar
* @run main/othervm jdk.java.lang.instrument.NegativeAgentRunner NonPublicPremainAgent IllegalAccessException
*/
import java.lang.RuntimeException;
import java.lang.instrument.Instrumentation;
public class NonPublicPremainAgent {
// This premain method is intentionally non-public to ensure it is rejected.
static void premain(String agentArgs, Instrumentation inst) {
throw new RuntimeException("premain: NonPublicPremainAgent was not expected to be loaded");
}
}

19
test/jdk/java/lang/instrument/PremainClass/ZeroArgPremainAgent.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2020, 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
@ -21,12 +21,25 @@
* questions. * questions.
*/ */
import java.lang.instrument.*; /*
* @test
* @bug 6289149
* @summary test when the agent's class has a zero arg premain() function.
* @library /test/lib
* @library /test
*
* @modules java.instrument
* @build jdk.java.lang.instrument.PremainClass.ZeroArgPremainAgent
* @run driver jdk.test.lib.util.JavaAgentBuilder
* ZeroArgPremainAgent ZeroArgPremainAgent.jar
* @run main/othervm -XX:-CreateCoredumpOnCrash jdk.java.lang.instrument.NegativeAgentRunner ZeroArgPremainAgent NoSuchMethodException
*/
class ZeroArgPremainAgent { public class ZeroArgPremainAgent {
// This agent has a zero arg premain() function. // This agent has a zero arg premain() function.
public static void premain () { public static void premain () {
System.out.println("Hello from ZeroArgInheritAgent!"); System.out.println("Hello from ZeroArgInheritAgent!");
throw new Error("ERROR: THIS AGENT SHOULD NOT HAVE BEEN CALLED.");
} }
} }

60
test/jdk/java/lang/instrument/PremainClass/ZeroArgPremainAgentTest.java
View File

@ -1,60 +0,0 @@
/*
* Copyright (c) 2013, 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.
*/
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.Utils;
/*
* @test
* @bug 6289149
* @summary test when the agent's class has a zero arg premain() function.
* @library /test/lib
* @modules java.management
* java.instrument
* @run build DummyMain
* @run shell ../MakeJAR3.sh ZeroArgPremainAgent
* @run main/othervm -XX:-CreateCoredumpOnCrash ZeroArgPremainAgentTest
*/
public class ZeroArgPremainAgentTest {
// Use a javaagent with a zero argument premain() function.
// Verify that we get the correct exception.
public static void main(String[] a) throws Exception {
String testArgs = String.format(
"-javaagent:ZeroArgPremainAgent.jar -classpath %s DummyMain",
System.getProperty("test.classes", "."));
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
Utils.addTestJavaOpts(testArgs.split("\\s+")));
System.out.println("testjvm.cmd:" + Utils.getCommandLine(pb));
OutputAnalyzer output = ProcessTools.executeProcess(pb);
System.out.println("testjvm.stdout:" + output.getStdout());
System.out.println("testjvm.stderr:" + output.getStderr());
output.stderrShouldContain("java.lang.NoSuchMethodException");
if (0 == output.getExitValue()) {
throw new RuntimeException("Expected error but got exit value 0");
}
}
}