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

8289612: Change hotspot/jtreg tests to not use Thread.stop #9505

Closed
wants to merge 11 commits into from

Conversation

lmesnik
Copy link
Member

@lmesnik lmesnik commented Jul 15, 2022

The tests are updated to don't use Thread.stop(). Tests whose intention is to verify async exception updated to use jvmti StopThread.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8289612: Change hotspot/jtreg tests to not use Thread.stop

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/9505/head:pull/9505
$ git checkout pull/9505

Update a local copy of the PR:
$ git checkout pull/9505
$ git pull https://git.openjdk.org/jdk pull/9505/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9505

View PR using the GUI difftool:
$ git pr show -t 9505

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/9505.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 15, 2022

👋 Welcome back lmesnik! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr Pull request is ready for review label Jul 15, 2022
@openjdk
Copy link

openjdk bot commented Jul 15, 2022

@lmesnik The following label will be automatically applied to this pull request:

  • hotspot

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the hotspot hotspot-dev@openjdk.org label Jul 15, 2022
@mlbridge
Copy link

mlbridge bot commented Jul 15, 2022

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

Hi Leonid,

Can we avoid all the agent stuff by defining a JVMTI helper class in the test library:

public class JVMTI {
  private native void stopThread(Thread t, Throwable ex);
  public void stopThread(Thread t) {
    stopThread(t, new ThreadDeath());
  }
}

And in cpp file just use GetEnv to get JVMTIEnv and call stopThread?

Otherwise the conversions seem quite reasonable.

Thanks.

@AlanBateman
Copy link
Contributor

Thanks for doing this. I agree with David that AsyncExceptionOnMonitorEnter AsyncExceptionTest doesn't really need to be started with -agentlib. The can_signal_thread capability can be obtained in the alive phase so JNI code can obtain a JVMTI environment and add this capability.

Copy link
Member

@dcubed-ojdk dcubed-ojdk left a comment

Choose a reason for hiding this comment

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

Just a few comments/observations.

Copy link
Member Author

@lmesnik lmesnik left a comment

Choose a reason for hiding this comment

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

Fixed stopThread using and other comments (or replied to them).

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

Thanks for the library update -looks good!

A couple of minor typo "targets of opportunity" listed below.

One discussion still somewhat open.

Thanks.

@openjdk
Copy link

openjdk bot commented Jul 18, 2022

@lmesnik This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8289612: Change hotspot/jtreg tests to not use Thread.stop

Reviewed-by: dholmes, dcubed

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 26 new commits pushed to the master branch:

  • 6c8d0e6: 8282526: Default icon is not painted properly
  • e72742e: 8286172: Create an automated test for JDK-4516019
  • b9de0a7: 8284524: Create an automated test for JDK-4422362
  • 5ae4320: 8284767: Create an automated test for JDK-4422535
  • efed7a7: 8289908: Skip bounds check for cases when String is constructed from entirely used byte[]
  • b2010a7: 8287805: Shenandoah: consolidate evacuate-update-root closures
  • ea8b75c: 8290334: Update FreeType to 2.12.1
  • 6882f0e: 8290013: serviceability/jvmti/GetLocalVariable/GetLocalWithoutSuspendTest.java failed "assert(!in_vm) failed: Undersized StackShadowPages"
  • 92067e2: 8290137: riscv: small refactoring for add_memory_int32/64
  • 87340fd: 8288883: C2: assert(allow_address || t != T_ADDRESS) failed after JDK-8283091
  • ... and 16 more: https://git.openjdk.org/jdk/compare/757a742ac78a6ececcc4f9f542f8f7108968129d...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jul 18, 2022
Copy link
Member

@dcubed-ojdk dcubed-ojdk left a comment

Choose a reason for hiding this comment

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

Thumbs up. Did you decide that it was okay if the mallocWithGC2.java
test didn't wait for the cHeapEater thread to finish?

@lmesnik
Copy link
Member Author

lmesnik commented Jul 18, 2022

Yep, the goal of this thread is just to call malloc/free in the cycle. Doesn't need to wait for completion.

@lmesnik
Copy link
Member Author

lmesnik commented Jul 18, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Jul 18, 2022

Going to push as commit 5a96a5d.
Since your change was applied there have been 27 commits pushed to the master branch:

  • b65f7ec: 4887998: Use Integer.rotateLeft() and rotateRight() in crypto implementations
  • 6c8d0e6: 8282526: Default icon is not painted properly
  • e72742e: 8286172: Create an automated test for JDK-4516019
  • b9de0a7: 8284524: Create an automated test for JDK-4422362
  • 5ae4320: 8284767: Create an automated test for JDK-4422535
  • efed7a7: 8289908: Skip bounds check for cases when String is constructed from entirely used byte[]
  • b2010a7: 8287805: Shenandoah: consolidate evacuate-update-root closures
  • ea8b75c: 8290334: Update FreeType to 2.12.1
  • 6882f0e: 8290013: serviceability/jvmti/GetLocalVariable/GetLocalWithoutSuspendTest.java failed "assert(!in_vm) failed: Undersized StackShadowPages"
  • 92067e2: 8290137: riscv: small refactoring for add_memory_int32/64
  • ... and 17 more: https://git.openjdk.org/jdk/compare/757a742ac78a6ececcc4f9f542f8f7108968129d...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jul 18, 2022
@openjdk openjdk bot closed this Jul 18, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jul 18, 2022
@openjdk
Copy link

openjdk bot commented Jul 18, 2022

@lmesnik Pushed as commit 5a96a5d.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot hotspot-dev@openjdk.org integrated Pull request has been integrated
4 participants