This repository has been archived by the owner. It is now read-only.
Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
8222000: JFR: Process start event
Reviewed-by: mgronlun, rriggs
- Loading branch information
Showing
with
207 additions
and 7 deletions.
- +16 −2 src/java.base/share/classes/java/lang/ProcessBuilder.java
- +36 −0 src/java.base/share/classes/jdk/internal/event/ProcessStartEvent.java
- +48 −0 src/jdk.jfr/share/classes/jdk/jfr/events/ProcessStartEvent.java
- +6 −3 src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/JDKEvents.java
- +5 −0 src/jdk.jfr/share/conf/jfr/default.jfc
- +5 −0 src/jdk.jfr/share/conf/jfr/profile.jfc
- +3 −1 test/jdk/jdk/jfr/event/metadata/TestDefaultConfigurations.java
- +85 −0 test/jdk/jdk/jfr/event/os/TestProcessStart.java
- +2 −1 test/jdk/jdk/jfr/event/runtime/TestActiveSettingEvent.java
- +1 −0 test/lib/jdk/test/lib/jfr/EventNames.java
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
@@ -0,0 +1,36 @@ | ||
/* | ||
* 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. Oracle designates this | ||
* particular file as subject to the "Classpath" exception as provided | ||
* by Oracle in the LICENSE file that accompanied this code. | ||
* | ||
* 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. | ||
*/ | ||
|
||
package jdk.internal.event; | ||
|
||
/** | ||
* Event for the start of an OS procsss | ||
*/ | ||
|
||
public final class ProcessStartEvent extends Event { | ||
public long pid; | ||
public String directory; | ||
public String command; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
@@ -0,0 +1,48 @@ | ||
/* | ||
* 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. Oracle designates this | ||
* particular file as subject to the "Classpath" exception as provided | ||
* by Oracle in the LICENSE file that accompanied this code. | ||
* | ||
* 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. | ||
*/ | ||
|
||
package jdk.jfr.events; | ||
|
||
import jdk.jfr.Category; | ||
import jdk.jfr.Description; | ||
import jdk.jfr.Label; | ||
import jdk.jfr.Name; | ||
import jdk.jfr.internal.MirrorEvent; | ||
|
||
@Category({"Operating System"}) | ||
@Label("Process Start") | ||
@Name("jdk.ProcessStart") | ||
@Description("Operating system process started") | ||
@MirrorEvent(className = "jdk.internal.event.ProcessStartEvent") | ||
public final class ProcessStartEvent extends AbstractJDKEvent { | ||
@Label("Process Id") | ||
public long pid; | ||
|
||
@Label("Directory") | ||
public String directory; | ||
|
||
@Label("Command") | ||
public String command; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
@@ -0,0 +1,85 @@ | ||
/* | ||
* 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. Oracle designates this | ||
* particular file as subject to the "Classpath" exception as provided | ||
* by Oracle in the LICENSE file that accompanied this code. | ||
* | ||
* 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. | ||
*/ | ||
|
||
package jdk.jfr.event.os; | ||
|
||
import java.io.File; | ||
import java.util.ArrayList; | ||
import java.util.List; | ||
import java.util.StringJoiner; | ||
|
||
import jdk.jfr.EventType; | ||
import jdk.jfr.FlightRecorder; | ||
import jdk.jfr.Recording; | ||
import jdk.jfr.consumer.RecordedEvent; | ||
import jdk.test.lib.Platform; | ||
import jdk.test.lib.jfr.EventNames; | ||
import jdk.test.lib.jfr.Events; | ||
import jdk.test.lib.process.ProcessTools; | ||
|
||
/** | ||
* @test | ||
* @key jfr | ||
* @requires vm.hasJFR | ||
* @library /test/lib | ||
* @run main/othervm jdk.jfr.event.os.TestProcessStart | ||
*/ | ||
public class TestProcessStart { | ||
private final static String EVENT_NAME = EventNames.ProcessStart; | ||
|
||
public static void main(String[] args) throws Throwable { | ||
|
||
try (Recording recording = new Recording()) { | ||
recording.enable(EVENT_NAME); | ||
recording.start(); | ||
List<String> commandList = new ArrayList<>(); | ||
if (Platform.isWindows()) { | ||
commandList.add("dir"); | ||
} else { | ||
commandList.add("ls"); | ||
} | ||
commandList.add("*.jfr"); | ||
ProcessBuilder pb = new ProcessBuilder(commandList); | ||
pb.directory(new File(".").getAbsoluteFile()); | ||
Process p = pb.start(); | ||
StringJoiner command = new StringJoiner(" "); | ||
for (String cmd : commandList) { | ||
command.add(cmd); | ||
} | ||
System.out.println(p.pid()); | ||
System.out.println(pb.directory()); | ||
System.out.println(commandList); | ||
recording.stop(); | ||
List<RecordedEvent> events = Events.fromRecording(recording); | ||
Events.hasEvents(events); | ||
for (RecordedEvent event : events) { | ||
System.out.println(event); | ||
Events.assertField(event, "pid").equal(p.pid()); | ||
Events.assertField(event, "directory").equal(pb.directory().toString()); | ||
Events.assertField(event, "command").equal(command.toString()); | ||
} | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters