-
-
Notifications
You must be signed in to change notification settings - Fork 1.5k
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
Allow for work stealing when only holding read locks #4012
Merged
Merged
Conversation
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 allows tasks with only read locks to be stolen by threads that are currently holding only read locks. The new compatibility check would also support write locks but `NodeTreeWalker` forces children of tasks with write locks to be executed on the same thread and thus no work is being stolen.
4 tasks
Actually, I think we can get rid of the special types for the global locks now. I'll add that to this PR before merging. |
leonard84
requested changes
Sep 19, 2024
...tform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/CompositeLock.java
Outdated
Show resolved
Hide resolved
...atform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ResourceLock.java
Outdated
Show resolved
Hide resolved
...atform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ResourceLock.java
Outdated
Show resolved
Hide resolved
...latform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/LockManager.java
Outdated
Show resolved
Hide resolved
...t/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorServiceTests.java
Outdated
Show resolved
Hide resolved
...t/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorServiceTests.java
Show resolved
Hide resolved
...rm-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ResourceLockTests.java
Outdated
Show resolved
Hide resolved
marcphilipp
force-pushed
the
marc/lock-compatibility-checking
branch
from
September 19, 2024 12:59
9edf0e0
to
1fb9268
Compare
leonard84
reviewed
Sep 19, 2024
...tform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/CompositeLock.java
Outdated
Show resolved
Hide resolved
...atform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ResourceLock.java
Show resolved
Hide resolved
...atform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ResourceLock.java
Show resolved
Hide resolved
...t/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorServiceTests.java
Outdated
Show resolved
Hide resolved
...t/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorServiceTests.java
Show resolved
Hide resolved
...t/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorServiceTests.java
Outdated
Show resolved
Hide resolved
...rm-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ResourceLockTests.java
Outdated
Show resolved
Hide resolved
leonard84
approved these changes
Sep 20, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The implementation looks good. Only some test suggestions and style bikeshedding left.
...atform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ResourceLock.java
Show resolved
Hide resolved
...t/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorServiceTests.java
Show resolved
Hide resolved
...rm-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ResourceLockTests.java
Outdated
Show resolved
Hide resolved
...rm-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ResourceLockTests.java
Outdated
Show resolved
Hide resolved
...rm-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ResourceLockTests.java
Outdated
Show resolved
Hide resolved
...rm-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ResourceLockTests.java
Outdated
Show resolved
Hide resolved
…rite lock Co-authored-by: Leonard Brünings <[email protected]>
Co-authored-by: Leonard Brünings <[email protected]>
marcphilipp
changed the title
Allow work stealing when more locks can be acquired without deadlock
Allow for work stealing when only holding read locks
Sep 20, 2024
marcphilipp
added a commit
that referenced
this pull request
Sep 21, 2024
This allows tasks with only read locks to be stolen by threads that are currently holding only read locks. --------- Co-authored-by: Leonard Brünings <[email protected]>
marcphilipp
added a commit
that referenced
this pull request
Sep 23, 2024
This allows tasks with only read locks to be stolen by threads that are currently holding only read locks. --------- Co-authored-by: Leonard Brünings <[email protected]> (cherry picked from commit ebbf134)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This allows tasks with only read locks to be stolen by threads that are
currently holding only read locks.