Skip to content
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

Fix 0.42 to have correct M1 content #74

Merged
merged 26 commits into from
Nov 22, 2023

Conversation

pshipton
Copy link
Member

@pshipton pshipton commented Nov 22, 2023

0.42 (and 0.43) were accidentally branched from an old commit, missing changes that should have been included. Subsequently a number of changes were double delivered. Re-sync to include missing commits.

Since most of the changes were double delivered, this is really only adding the following missing changes. It also adds the original commits for changes that were double delivered, so they won't show up as diffs in comparisons any more.

Clear vmthread from thread object at shutdown
Ensures time compensation is not less than checkpointRestoreTimeDelta
Backport "Classpath" exception for some riscv64 files from head stream

tajila and others added 26 commits October 24, 2023 13:05
Clear vmthread from thread object at shutdown
Ensure the time compensation in milliseconds is not less than the
checkpoint restore time delta.

Signed-off-by: Jason Feng <[email protected]>
Ensures time compensation is not less than checkpointRestoreTimeDelta
Add the exception to avoid warnings in builds while waiting for the
changes to show up from OpenJDK.

See https://bugs.openjdk.org/browse/JDK-8313312

Signed-off-by: Peter Shipton <[email protected]>
Backport "Classpath" exception for some riscv64 files from head stream
…errupt status

Reviewed-by: rpressler, dholmes, jpai
…d be replaced

Reviewed-by: aturbanov, shade, dfuchs
…ore thawing

Reviewed-by: pchilanomate, mgronlun, sspitsyn
…ED_WAITING virtual thread is timed parked

Reviewed-by: sspitsyn, rpressler
Backport Virtual Thread Changes from JDK-next
ParkALot launches a number of virtual threads and expects each thread
to park and unpark 500_000 times. The test takes a lot of time to
execute, leading to timeouts in Jenkins testing.

The number of park and unpark iterations is reduced to 5_000, which is
sufficient to verify functional behaviour. Further, the reduced
iterations allow the test to pass in a reasonable time in Jenkins
testing.

vm.debug is set to false for OpenJ9. So, the vm.debug=true variant is
left unmodified.

Related: eclipse-openj9/openj9#18444

Signed-off-by: Babneet Singh <[email protected]>
Reduce the number of park and unpark iterations in ParkALot
Neither of these is used anywhere:
  INCLUDE_CUSTOM_EXTENSION_SYMBOLS
  INCLUDE_CUSTOM_EXTENSION_LIB

Also remove redundant '-c' from CFLAGS.

Signed-off-by: Keith W. Campbell <[email protected]>
Remove definitions of unused make macros
Adjust ThreadListStackTracesTest for checkReentrantLock
to be ready when the virtual thread state is WAITING after
the reentrant lock parks the virtual thread. When the
virtual thread is mounted, the virtual thread state, which
is obtained from the carrier thread, can transition
between WAITING and RUNNABLE before the virtual thread is
parked on the lock.

Issue: eclipse-openj9/openj9#18089
Signed-off-by: Amarpreet Singh <[email protected]>
Adjust ThreadListStackTracesTest for checkReentrantLock
CRIU adds @NotCheckpointSafe for PrintStream.writeln(String)
Append cp to annotation data to fix redefinition inconsistencies
Add PrintStream.java to $(SUPPORT_OUTPUTDIR)/overlay
@pshipton
Copy link
Member Author

@tajila fyi

Copy link
Member

@JasonFengJ9 JasonFengJ9 left a comment

Choose a reason for hiding this comment

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

LGTM

@JasonFengJ9 JasonFengJ9 merged commit 0c32793 into ibmruntimes:v0.42.0-release Nov 22, 2023
1 of 2 checks passed
@pshipton
Copy link
Member Author

@babsingh fyi

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants