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

8252627: Make it safe for JFR thread to read threadObj #59

Closed
wants to merge 1 commit into from

Conversation

fisk
Copy link
Contributor

@fisk fisk commented Sep 7, 2020

Migrating this review from the mailing list to a PR so I can integrate it. Already reviewed really.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8252627: Make it safe for JFR thread to read threadObj

Reviewers

  • dholmes - Reviewer ⚠️ Added manually
  • mgronlun - Reviewer ⚠️ Added manually

Download

$ git fetch https://git.openjdk.java.net/jdk pull/59/head:pull/59
$ git checkout pull/59

@fisk
Copy link
Contributor Author

fisk commented Sep 7, 2020

/reviewer add dholmes

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 7, 2020

👋 Welcome back eosterlund! 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
Copy link

openjdk bot commented Sep 7, 2020

@fisk
Reviewer dholmes successfully added.

@fisk
Copy link
Contributor Author

fisk commented Sep 7, 2020

/reviewer add mgronlun

@openjdk
Copy link

openjdk bot commented Sep 7, 2020

@fisk
Reviewer mgronlun successfully added.

@openjdk
Copy link

openjdk bot commented Sep 7, 2020

@fisk 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 (add|remove) "label" command.

@openjdk openjdk bot added the hotspot hotspot-dev@openjdk.org label Sep 7, 2020
@fisk fisk changed the title 8252627_jfr_thread_oop 8252627: Make it safe for JFR thread to read threadObj Sep 7, 2020
@openjdk
Copy link

openjdk bot commented Sep 7, 2020

@fisk This change now passes all automated pre-integration checks. When the change also fulfills all project specific requirements, type /integrate in a new comment to proceed. After integration, the commit message will be:

8252627: Make it safe for JFR thread to read threadObj

Reviewed-by: dholmes, mgronlun
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /issue command.

Since the source branch of this PR was last updated there has been 1 commit pushed to the master branch:

  • e29c3f6: 8252661: Change SafepointMechanism terminology to talk less about "blocking"

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid automatic rebasing, please merge master into your branch, and then specify the current head hash when integrating, like this: /integrate e29c3f61235b325d5397f0844badc377ddae7922.

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

@openjdk openjdk bot added ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 7, 2020
@mlbridge
Copy link

mlbridge bot commented Sep 7, 2020

Webrevs

@fisk
Copy link
Contributor Author

fisk commented Sep 7, 2020

/integrate

@openjdk openjdk bot closed this Sep 7, 2020
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 7, 2020
@openjdk
Copy link

openjdk bot commented Sep 7, 2020

@fisk Since your change was applied there has been 1 commit pushed to the master branch:

  • e29c3f6: 8252661: Change SafepointMechanism terminology to talk less about "blocking"

Your commit was automatically rebased without conflicts.

Pushed as commit e0d5b5f.

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

cushon pushed a commit to cushon/jdk that referenced this pull request Apr 2, 2021
caojoshua pushed a commit to caojoshua/jdk that referenced this pull request Jul 26, 2023
This patch scans arguments for intrinsics though they are inlined.
the reason is that some intrinsics have side-effect in memory. eg.
Unsafe.compareAndSetReference.

Co-authored-by: Xin Liu <xxinliu@amazon.com>
dansmithcode pushed a commit to dansmithcode/jdk that referenced this pull request Aug 31, 2024
* Update LICENSE file

* The experimental version is aimed to refactor the tool

* verificationType mistakenly added to source code is renamed to type

* Adapted mvn bindings to at8

* Added tests to represent bad stream handling in jdec and correctone in jdis

* Made jdec to write output to proper toolOutput instead of bad logOutput

* 7903208: [Jasm] Add support for generics (the Signature attribute)

* 7902888: Excess entries in BootstrapMethods with the same bsm, bsmKind, bsmArgs

* Replaced hardcoded String[] args, by varargs String... where reasonable

Once the "tool" mandatory array memebr was removed from each tool's main
method, and considering calls from libraries, and form tests where the
argument is very often just one file, or more readable "a1", a2"...
without new String[]{} declaration, changed those String[] enforcing
headers to more benevolent String...

* Intentionally removed ACC_SUPER class modifier was causing hotswap to fail

When jasm's  disasm, modify, asm cycle output binary was used for class
hotswap, remote JDK was not accepting it with java.lang.UnsupportedOperationException:
class redefinition failed: attempted to change the class modifiers
beacuse of ommited supoer keyword (although it have already no real
reason)

This patch is returning the kwyword without conditions, when it was
included in original bytecode

* extended test to verify that super is not used always

if super is not in source code, then it is not in disambled code

* 7903248: jasm: FieldData.ConstantValue holds undefined reference to CP while writing fields to a class

* Added support for stdin in jdis

* stdin is now read also by jasm,jcod,jdec

more tests needed

* Removed jdis specific missleading provide method

* Tool output moved where it belongs to commons

* Removed duplicated declaration of ArrayList<ToolInput> fileList

* Changed requireNonNull message in getDataInputStream

* Added one more abstraction layer providing highly reusable byte[] based input

* Properly exiting after verson is printed

* Stream based inputs are now drained once needed, not during construction

* reworked stdin read to be initiated by -

As a side effect, files and stdin can be read together
remove dduplicated code in tests by getting class in compile time
added tests and adapted older to new behavior

* added tests if asmtools assmble itself into valid bytecode

Added two set of tests
jdec->jcoder->load
jdis->jasm->load
Both in two variants, with -g, and without

Both jdec->jcoder->load works fine
Both jdis->jasm->load now fails on three files from 278:
 /org/openjdk/asmtools/jasm/JasmEnvironment$InputFile.class, /org/openjdk/asmtools/jcoder/Jcoder.class, /org/openjdk/asmtools/jasm/Parser.class
Fail looks valid.

Unluckily, the issue where -g disassembled and back assembled
com.google.gson.Gson produce invalid bytecode was not hit

The class BruteForceHelper is reusable for any set of classes

* Naive fix for enforced dot.suffix

* repalce stdout by configurable object

This checkout is not buildable, but server as showcase for issue with
dual logging for compilers

* Replaced dualstream logger by wrapper

so it can  be later made fully customisable

* Enabled shared i18n properties via reused asmtools/i18n.props

* All four tools now use neww ToolOutput output

As a consequence, all four tools by by default prints to stdout, and
honours -d properly

* Fixed typo which casued behavior regression

found by unittests

* Refatoed tests so they can harbour resources in maven way

* Moved all logging to stderr. use -dls to return original behavior

The -dls switch  is oging to be removed once stderr is properl adapted

* Implemented library-like input and output

This commit is adding byte[]/String  input/output clasases for direct
library usage.
Added tests, advertising how simple is usage of those inputs/outputs

There are two hunks, which fixes issues ovberlooked in previous
refactorings:
 - traceln now correctly calls getOutputs
 - jdec now uses proper logger insted of accidental stderr

* Enabled -g for jcoder to be set from external code

* Temporary workaround around tests being order-sensitive

As -g is now making some disassmebld code not asemble-able back, and
order of tests is not deterministic, and Options are static, thus if -g
is now set in some test, it is not unset in other tests.

Real fix is to move Options out of static context to context of
environment as it is done for jcoder.

* Added github actions

Just for record for "act" for local testing. To run with podman based distros, several steps are ncessary. See nektos/act#303 ; especially
 * nektos/act#303 (comment)
 *  and nektos/act#303 (comment)
    *   the bind and socket
eg:
 systemctl enable --now --user podman.socket
 systemctl start --user podman.socket
 export DOCKER_HOST=unix://$XDG_RUNTIME_DIR/podman/podman.sock
 ../act/bin/act   --bind --container-daemon-socket $XDG_RUNTIME_DIR/podman/podman.sock

 To rerun the build on clean env, you have to stop and start the podman socket again

Without explicit 'mvn test' the tests are not running. Not sure why

* 7902888: Excess entries in BootstrapMethods with the same bsm, bsmKind, bsmArgs

* Fixed issue when jasm produced only one file from source with multiple ones

Added tests for this issue
Added test veryfying that the jcoder is not affected

* 7903401: jtreg fails if set of jdk tests process jasm,jdis files with defects

* 7903402: jdis: tool writes incorrect StackMapTable if the first same_frame has type 0 (openjdk#51)

* 7902888: Excess entries in BootstrapMethods with the same bsm, bsmKind, bsmArgs

* 7903401: jtreg fails if set of jdk tests process jasm,jdis files with defects

* 7903402: jdis: tool writes incorrect StackMapTable if the first same_frame has type 0

* 7902888: Excess entries in BootstrapMethods with the same bsm, bsmKind, bsmArgs

* Refactored new ToolInput/Outputs so they reside in own packages and not in original interfaces (openjdk#53)

* Refactored new ToolInput/Outputs so they reside in own packages and not in original interfaces

* Removed unused imports

* Added licence headers

* Added ajvadoc description to three main interfaces.

* Removed unnecessary guard condition before changging \ to / for fqn

* Replaced "\n" by System.lineSeparator()

* Used better names for highlighted abbrevations

* 7903405: compiler does not warn about instruction arguments that exceed allowed limits (openjdk#54)

* 7902888: Excess entries in BootstrapMethods with the same bsm, bsmKind, bsmArgs

* 7903401: jtreg fails if set of jdk tests process jasm,jdis files with defects

* 7903402: jdis: tool writes incorrect StackMapTable if the first same_frame has type 0

* 7902888: Excess entries in BootstrapMethods with the same bsm, bsmKind, bsmArgs

* 7903405: compiler does not warn about instruction arguments that exceed allowed limits

* 7903405: compiler does not warn about instruction arguments that exceed allowed limits

* Delete ToolOutput.java

* Fixed junit test for CODETOOLS-7903405 (openjdk#56)

* 7903458: Umbrella: Preparations for switching to Asmtools 8.0 (openjdk#57)

* 7903458: Umbrella: Preparations for switching to Asmtools 8.0

* Fix tabs

* 7903458: Umbrella: Preparations for switching to Asmtools 8.0 (Part II) (openjdk#58)

* 7903458: Umbrella: Preparations for switching to Asmtools 8.0

* Fix tabs

* 7903458: Umbrella: Preparations for switching to Asmtools 8.0

* 7903458: Umbrella: Preparations for switching to Asmtools 8.0

* CODETOOLS-7903506: Asmtools: jdis prints BootstrapMethod attribute if detailed output is off (openjdk#59)

* 7903458: Umbrella: Preparations for switching to Asmtools 8.0

* Fix tabs

* 7903458: Umbrella: Preparations for switching to Asmtools 8.0

* 7903458: Umbrella: Preparations for switching to Asmtools 8.0

* 7903506: Asmtools: jdis prints BootstrapMethod attribute if detailed output is off

* 7903509: jcoder, jasm: add option to override class file version in source file(s) (openjdk#60)

* 7903458: Umbrella: Preparations for switching to Asmtools 8.0

* Fix tabs

* 7903458: Umbrella: Preparations for switching to Asmtools 8.0

* 7903458: Umbrella: Preparations for switching to Asmtools 8.0

* 7903509: jcoder, jasm: add option to override class file version in source file(s)

* CODETOOLS-7903531: jdis: Suppress printing comments by adding an option (openjdk#61)

* 7903458: Umbrella: Preparations for switching to Asmtools 8.0

* Fix tabs

* 7903458: Umbrella: Preparations for switching to Asmtools 8.0

* 7903458: Umbrella: Preparations for switching to Asmtools 8.0

* 7903531: jdis: Suppress printing comments by adding an option

---------

Co-authored-by: Jiri Vanek <jvanek@redhat.com>
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
Development

Successfully merging this pull request may close these issues.

1 participant