Skip to content

Commit

Permalink
8323021: Shenandoah: Encountered reference count always attributed to…
Browse files Browse the repository at this point in the history
… first worker thread

Reviewed-by: kdnilsen, ysr, shade
  • Loading branch information
William Kemper authored and shipilev committed Jan 5, 2024
1 parent 3dc4bd8 commit f0e2e43
Showing 1 changed file with 1 addition and 1 deletion.
Expand Up @@ -362,7 +362,7 @@ bool ShenandoahReferenceProcessor::discover_reference(oop reference, ReferenceTy

log_trace(gc, ref)("Encountered Reference: " PTR_FORMAT " (%s)", p2i(reference), reference_type_name(type));
uint worker_id = WorkerThread::worker_id();
_ref_proc_thread_locals->inc_encountered(type);
_ref_proc_thread_locals[worker_id].inc_encountered(type);

if (UseCompressedOops) {
return discover<narrowOop>(reference, type, worker_id);
Expand Down

7 comments on commit f0e2e43

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@earthling-amzn
Copy link
Contributor

Choose a reason for hiding this comment

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

/backport jdk22u

@openjdk
Copy link

@openjdk openjdk bot commented on f0e2e43 Jan 5, 2024

Choose a reason for hiding this comment

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

@earthling-amzn the backport was successfully created on the branch backport-earthling-amzn-f0e2e431 in my personal fork of openjdk/jdk22u. To create a pull request with this backport targeting openjdk/jdk22u: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 f0e2e431 from the openjdk/jdk repository.

The commit being backported was authored by William Kemper on 5 Jan 2024 and was reviewed by Kelvin Nilsen, Y. Srinivas Ramakrishna and Aleksey Shipilev.

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/jdk22u:

$ git fetch https://github.com/openjdk-bots/jdk22u.git backport-earthling-amzn-f0e2e431:backport-earthling-amzn-f0e2e431
$ git checkout backport-earthling-amzn-f0e2e431
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk22u.git backport-earthling-amzn-f0e2e431

@earthling-amzn
Copy link
Contributor

Choose a reason for hiding this comment

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

/backport jdk21u-dev

@earthling-amzn
Copy link
Contributor

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 f0e2e43 Jan 5, 2024

Choose a reason for hiding this comment

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

@earthling-amzn the backport was successfully created on the branch backport-earthling-amzn-f0e2e431 in my personal fork of openjdk/jdk21u-dev. To create a pull request with this backport targeting openjdk/jdk21u-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 f0e2e431 from the openjdk/jdk repository.

The commit being backported was authored by William Kemper on 5 Jan 2024 and was reviewed by Kelvin Nilsen, Y. Srinivas Ramakrishna and Aleksey Shipilev.

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/jdk21u-dev:

$ git fetch https://github.com/openjdk-bots/jdk21u-dev.git backport-earthling-amzn-f0e2e431:backport-earthling-amzn-f0e2e431
$ git checkout backport-earthling-amzn-f0e2e431
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk21u-dev.git backport-earthling-amzn-f0e2e431

@openjdk
Copy link

@openjdk openjdk bot commented on f0e2e43 Jan 5, 2024

Choose a reason for hiding this comment

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

@earthling-amzn Could not automatically backport f0e2e431 to openjdk/jdk17u-dev due to conflicts in the following files:

  • src/hotspot/share/gc/shenandoah/shenandoahReferenceProcessor.cpp

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk17u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk17u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-earthling-amzn-f0e2e431

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git f0e2e4311b8cab160dc9e35f43e9ae5a145c5e23

# Backport the commit
$ git cherry-pick --no-commit f0e2e4311b8cab160dc9e35f43e9ae5a145c5e23
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport f0e2e4311b8cab160dc9e35f43e9ae5a145c5e23'

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

Please sign in to comment.