-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Implementation of ExecuteVMOperationEvent #4368
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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
68 changes: 68 additions & 0 deletions
68
substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrVMOperations.java
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| /* | ||
| * Copyright (c) 2022, 2022, Oracle and/or its affiliates. All rights reserved. | ||
| * Copyright (c) 2022, 2022, Red Hat Inc. 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 com.oracle.svm.core.jfr; | ||
|
|
||
| import org.graalvm.compiler.api.replacements.Fold; | ||
| import org.graalvm.nativeimage.ImageSingletons; | ||
| import org.graalvm.nativeimage.Platform; | ||
| import org.graalvm.nativeimage.Platforms; | ||
|
|
||
| import com.oracle.svm.core.annotate.Uninterruptible; | ||
|
|
||
| import java.util.Collection; | ||
|
|
||
| public class JfrVMOperations { | ||
| private Class<?>[] vmOperations; | ||
|
|
||
| @Platforms(Platform.HOSTED_ONLY.class) | ||
| public JfrVMOperations() { | ||
| vmOperations = new Class<?>[0]; | ||
| } | ||
|
|
||
| @Fold | ||
| public static JfrVMOperations singleton() { | ||
| return ImageSingletons.lookup(JfrVMOperations.class); | ||
| } | ||
|
|
||
| @Platforms(Platform.HOSTED_ONLY.class) | ||
| public void addVMOperations(Collection<Class<?>> vmOps) { | ||
| vmOperations = vmOps.toArray(new Class<?>[vmOps.size()]); | ||
| } | ||
|
|
||
| @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true) | ||
| public int getVMOperationId(Class<?> clazz) { | ||
| for (int id = 0; id < vmOperations.length; id++) { | ||
| if (vmOperations[id] == clazz) { | ||
| return id + 1; // id starts with 1 | ||
| } | ||
| } | ||
| return 0; | ||
| } | ||
|
|
||
| public Class<?>[] getVMOperations() { | ||
| return vmOperations; | ||
| } | ||
| } |
69 changes: 69 additions & 0 deletions
69
...m/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/ExecuteVMOperationEvent.java
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| /* | ||
| * Copyright (c) 2022, 2022, Oracle and/or its affiliates. All rights reserved. | ||
| * Copyright (c) 2022, 2022, Red Hat Inc. 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 com.oracle.svm.core.jfr.events; | ||
|
|
||
| import com.oracle.svm.core.annotate.Uninterruptible; | ||
| import com.oracle.svm.core.jfr.JfrEvent; | ||
| import com.oracle.svm.core.jfr.HasJfrSupport; | ||
| import com.oracle.svm.core.jfr.JfrNativeEventWriter; | ||
| import com.oracle.svm.core.jfr.JfrNativeEventWriterData; | ||
| import com.oracle.svm.core.jfr.JfrNativeEventWriterDataAccess; | ||
| import com.oracle.svm.core.jfr.JfrTicks; | ||
| import com.oracle.svm.core.jfr.JfrVMOperations; | ||
| import com.oracle.svm.core.jfr.SubstrateJVM; | ||
| import com.oracle.svm.core.thread.Safepoint; | ||
| import com.oracle.svm.core.thread.VMOperation; | ||
|
|
||
| import org.graalvm.nativeimage.IsolateThread; | ||
| import org.graalvm.nativeimage.StackValue; | ||
|
|
||
| public class ExecuteVMOperationEvent { | ||
| @Uninterruptible(reason = "Accesses a JFR buffer.") | ||
| public static void emit(VMOperation vmOperation, IsolateThread requestingThread, long startTicks) { | ||
| if (!HasJfrSupport.get()) { | ||
| return; | ||
| } | ||
|
|
||
| if (SubstrateJVM.isRecording() && SubstrateJVM.get().isEnabled(JfrEvent.ExecuteVMOperation)) { | ||
| int id = JfrVMOperations.singleton().getVMOperationId(vmOperation.getClass()); | ||
| assert id != 0; | ||
| JfrNativeEventWriterData data = StackValue.get(JfrNativeEventWriterData.class); | ||
| JfrNativeEventWriterDataAccess.initializeThreadLocalNativeBuffer(data); | ||
| JfrNativeEventWriter.beginEventWrite(data, false); | ||
| JfrNativeEventWriter.putLong(data, JfrEvent.ExecuteVMOperation.getId()); | ||
| JfrNativeEventWriter.putLong(data, startTicks); | ||
| JfrNativeEventWriter.putLong(data, JfrTicks.elapsedTicks() - startTicks); | ||
| JfrNativeEventWriter.putEventThread(data); | ||
| JfrNativeEventWriter.putLong(data, JfrVMOperations.singleton().getVMOperationId(vmOperation.getClass())); | ||
| JfrNativeEventWriter.putBoolean(data, vmOperation.getCausesSafepoint()); | ||
| JfrNativeEventWriter.putBoolean(data, true); // Blocking | ||
| JfrNativeEventWriter.putThread(data, requestingThread); | ||
| JfrNativeEventWriter.putLong(data, vmOperation.getCausesSafepoint() ? Safepoint.Master.singleton().getSafepointId().rawValue() : 0); | ||
| JfrNativeEventWriter.endEventWrite(data, false); | ||
| } | ||
| } | ||
| } |
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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
44 changes: 44 additions & 0 deletions
44
...svm.test/src/com/oracle/svm/test/jfr/utils/poolparsers/VMOperationConstantPoolParser.java
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| /* | ||
| * Copyright (c) 2022, 2022, Oracle and/or its affiliates. All rights reserved. | ||
| * Copyright (c) 2022, 2022, Red Hat Inc. 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 com.oracle.svm.test.jfr.utils.poolparsers; | ||
|
|
||
| import com.oracle.svm.test.jfr.utils.RecordingInput; | ||
| import org.junit.Assert; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| public class VMOperationConstantPoolParser extends ConstantPoolParser { | ||
|
|
||
| @Override | ||
| public void parse(RecordingInput input) throws IOException { | ||
| int numberOfVMOperationTypes = input.readInt(); | ||
| for (int i = 0; i < numberOfVMOperationTypes; i++) { | ||
| addFoundId(input.readInt()); // Id. | ||
| Assert.assertFalse("VMOperation type is empty!", input.readUTF().isEmpty()); | ||
| } | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.