Skip to content

Commit

Permalink
8287113: JFR: Periodic task thread uses period for method sampling ev…
Browse files Browse the repository at this point in the history 
…ents

Reviewed-by: jbachorik
  • Loading branch information
@egahlin
egahlin committed May 23, 2022
1 parent 940e94f commit 8122466
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ private void initializeJVMEventTypes() {
// annotations, such as Period and Threshold.
if (pEventType.hasPeriod()) {
pEventType.setEventHook(true);
if (!(Type.EVENT_NAME_PREFIX + "ExecutionSample").equals(type.getName())) {
if (!pEventType.isMethodSampling()) {
requestHooks.add(new RequestHook(pEventType));
}
}
Expand Down
4 changes: 4 additions & 0 deletions src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,4 +327,8 @@ public boolean isLargeSize() {
public void setLargeSize() {
largeSize = true;
}

public boolean isMethodSampling() {
return isMethodSampling;
}
}

7 comments on commit 8122466

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review

Issues

@jbachorik
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 8122466 May 25, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jbachorik the backport was successfully created on the branch jbachorik-backport-8122466f in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 8122466f from the openjdk/jdk repository.

The commit being backported was authored by Erik Gahlin on 23 May 2022 and was reviewed by Jaroslav Bachorik.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev jbachorik-backport-8122466f:jbachorik-backport-8122466f
$ git checkout jbachorik-backport-8122466f
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev jbachorik-backport-8122466f

@jbachorik
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport 11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 8122466 May 26, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jbachorik The target repository 11u-dev is not a valid target for backports.
List of valid target repositories: openjdk/jdk11u, openjdk/jdk11u-dev, openjdk/jdk12u, openjdk/jdk13u, openjdk/jdk13u-dev, openjdk/jdk14u, openjdk/jdk15u, openjdk/jdk15u-dev, openjdk/jdk16u, openjdk/jdk17u, openjdk/jdk17u-dev, openjdk/jdk18u, openjdk/jdk7u, openjdk/jdk8u, openjdk/jdk8u-dev, openjdk/shenandoah-jdk8u, openjdk/shenandoah-jdk8u-dev.
Supplying the organization/group prefix is optional.

@jbachorik
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 8122466 May 26, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jbachorik Could not automatically backport 8122466f to openjdk/jdk11u-dev due to conflicts in the following files:

  • src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java

To manually resolve these conflicts run the following commands in your personal fork of openjdk/jdk11u-dev:

$ git checkout -b jbachorik-backport-8122466f
$ git fetch --no-tags https://git.openjdk.java.net/jdk 8122466fbb8e3f3450131895551ec5b832845938
$ git cherry-pick --no-commit 8122466fbb8e3f3450131895551ec5b832845938
$ # Resolve conflicts
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 8122466fbb8e3f3450131895551ec5b832845938'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk11u-dev with the title Backport 8122466fbb8e3f3450131895551ec5b832845938.

Please sign in to comment.