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

JDK-8327468: Do not restart close if errno is EINTR [macOS/linux] #18164

Closed
wants to merge 2 commits into from

Conversation

MBaesken
Copy link
Member

@MBaesken MBaesken commented Mar 8, 2024

There are a number of places remaining in the linux/macOS native JDK codebase where we use the RESTARTABLE macro with close, but this is unwanted on Linux/macOS.


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-8327468: Do not restart close if errno is EINTR [macOS/linux] (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18164

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 8, 2024

👋 Welcome back mbaesken! 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 Mar 8, 2024
@openjdk
Copy link

openjdk bot commented Mar 8, 2024

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

  • serviceability

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 serviceability serviceability-dev@openjdk.org label Mar 8, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 8, 2024

Webrevs

@MBaesken
Copy link
Member Author

MBaesken commented Mar 11, 2024

Looks like the return code of close is mostly (98-99 % ?) ignored in the JDK codebase. So probably we should follow for now the usual approach in this PR too.
Btw. there are some places in the codebase where the return code of close is checked/handled e.g.

if (res < 0 && !(*env)->ExceptionOccurred(env))

or

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.

This seems fine to me, but please ensure someone from serviceability also approves it.

Thanks.

@openjdk
Copy link

openjdk bot commented Mar 12, 2024

@MBaesken 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:

8327468: Do not restart close if errno is EINTR [macOS/linux]

Reviewed-by: dholmes, sspitsyn

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 80 new commits pushed to the master branch:

  • 1ad3ebc: 8185862: AWT Assertion Failure in ::GetDIBits(hBMDC, hBM, 0, 1, 0, gpBitmapInfo, 0) 'awt_Win32GraphicsDevice.cpp', at line 185
  • 7f6b7eb: 8327242: Document supported CLDR versions in the javadoc
  • 8f9899b: 8325164: Named groups and signature schemes unavailable with SunPKCS11 in FIPS mode
  • eb45d5b: 8327999: Remove copy of unused registers for cpu features check in x86_64 AVX2 Poly1305 implementation
  • 5cae7d2: 8321299: runtime/logging/ClassLoadUnloadTest.java doesn't reliably trigger class unloading
  • 35b00e6: 8327824: Type annotation placed on incorrect array nesting levels
  • be344e4: 8327475: Add analysis code for JDK-8327169
  • 0db6231: 8314508: Improve how relativized pointers are printed by frame::describe
  • 0353245: 8325874: Improve checkbox-based interface in summary pages
  • 4d64467: 8328079: JDK-8326583 broke ccache compilation
  • ... and 70 more: https://git.openjdk.org/jdk/compare/bdd1aebea379b63ae405827074530ef8e8a7c239...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 Mar 12, 2024
@MBaesken
Copy link
Member Author

This seems fine to me, but please ensure someone from serviceability also approves it.

Hi David, thanks for the review !
Someone from Serviceability Group interested to comment/review ?

Copy link
Contributor

@sspitsyn sspitsyn left a comment

Choose a reason for hiding this comment

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

This looks okay to me.

@MBaesken
Copy link
Member Author

Thanks for the reviews !

/integrate

@openjdk
Copy link

openjdk bot commented Mar 14, 2024

Going to push as commit 481c866.
Since your change was applied there have been 92 commits pushed to the master branch:

  • 44aef38: 8327045: Consolidate -fvisibility=hidden as a basic flag for all compilation
  • fcf746d: 8328106: COMPARE_BUILD improvements
  • fadc4b1: 8327423: C2 remove_main_post_loops: check if main-loop belongs to pre-loop, not just assert
  • cff0747: 8326204: yield statements doesn't allow cast expressions with more than 1 type arguments
  • 6f2676d: 8328064: Remove obsolete comments in constantPool and metadataFactory
  • 7502dc9: 8328030: Convert javax/swing/text/GlyphView/4984669/bug4984669.java applet test to main
  • 357c912: 8325897: Parallel: Remove PSYoungGen::is_maximal_no_gc
  • 98e4b75: 8327755: Convert javax/swing/JScrollBar/8039464/Test8039464.java applet to main
  • 628e770: 8327754: Convert javax/swing/JPopupMenu/7160604/bug7160604.java applet to main
  • 092a734: 8327753: Convert javax/swing/JOptionPane/8024926/bug8024926.java applet to main
  • ... and 82 more: https://git.openjdk.org/jdk/compare/bdd1aebea379b63ae405827074530ef8e8a7c239...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 14, 2024

@MBaesken Pushed as commit 481c866.

💡 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
integrated Pull request has been integrated serviceability serviceability-dev@openjdk.org
Development

Successfully merging this pull request may close these issues.

4 participants