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

8292562: (fc) Use copy_file_range in FileChannel::transferTo on Linux #9925

Closed
wants to merge 10 commits into from

Conversation

bplb
Copy link
Member

@bplb bplb commented Aug 18, 2022

Add copy_file_range(2) to the native Linux implementation of FileChannel::transferTo.


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-8292562: (fc) Use copy_file_range in FileChannel::transferTo on Linux

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9925

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 18, 2022

👋 Welcome back bpb! 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 Aug 18, 2022
@openjdk
Copy link

openjdk bot commented Aug 18, 2022

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

  • nio

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 nio nio-dev@openjdk.org label Aug 18, 2022
@mlbridge
Copy link

mlbridge bot commented Aug 18, 2022

@AlanBateman
Copy link
Contributor

Aside from the check if copy_file_range is supported then I think the change to the transferTo implementation in c3c36f1 looks good. At some point I would expect we will pass the append flag from the java code. Have you looked at transferFrom for the append case? I suspect it is masked by the check for EBADF and now may be the time to re-examine that (okay to be a separate PR but hopefully you see the issue there).

@openjdk
Copy link

openjdk bot commented Aug 23, 2022

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

8292562: (fc) Use copy_file_range in FileChannel::transferTo on Linux

Reviewed-by: alanb

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

  • 3844685: 8292697: ZGC: Hangs when almost out of metaspace memory
  • 2b80349: 8292669: IGV: Search not useable when in Overflow Toolbar
  • 4732abf: 8292910: Remove root to oop cast in HeapDumper
  • f694f8a: 8292083: Detected container memory limit may exceed physical machine memory
  • f91943c: 8292868: Explicitly pass a third temp register to MacroAssembler::store_heap_oop for aarch64
  • 6354a57: 8290711: assert(false) failed: infinite loop in PhaseIterGVN::optimize
  • 3e18773: 8292880: Improve debuggee logging for com/sun/jdi/ClassUnloadEventTest.java
  • 909e1ed: 8292919: Build failure due to UseJVMCICompiler was not declared when C2 is disabled after JDK-8292691
  • 55f5a83: 8282410: Remove SA ProcDebugger support
  • d83faea: 8292250: Create test for co-located JDI MethodEntry, Step, and Breakpoint events
  • ... and 106 more: https://git.openjdk.org/jdk/compare/494d3873b1d0f7e3ca0a063b44362e7242298dec...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 Aug 23, 2022
@bplb
Copy link
Member Author

bplb commented Aug 23, 2022

At some point I would expect we will pass the append flag from the java code.

Agreed.

Have you looked at transferFrom for the append case? I suspect it is masked by the check for EBADF

Yep, same problem.

and now may be the time to re-examine that (okay to be a separate PR but hopefully you see the issue there).

Might as well go ahead and fix this in another rev of this PR.

Copy link
Contributor

@AlanBateman AlanBateman left a comment

Choose a reason for hiding this comment

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

I think this one is done.

@bplb
Copy link
Member Author

bplb commented Aug 25, 2022

I think this one is done.

Well, maybe it is now: the new test failed on macOS and Windows which do not have the problem reported in JDK-4950302. Fixed in commit ec2ad5d.

@AlanBateman
Copy link
Contributor

I think this one is done.

Well, maybe it is now: the new test failed on macOS and Windows which do not have the problem reported in ...

A long standing issue is that FileChannel needs to specify how methods that take a position behave when a file is opened for append. This includes the transferXXX methods. It may be that transferFrom needs to be allowed to throw an exception when called on a FileChannel to a file opened for append. So maybe the simplest thing for now is to revert the test back to testing transferTo when the target is opened for append. That will be a simpler test to maintain.

@bplb
Copy link
Member Author

bplb commented Aug 25, 2022

[M]aybe the simplest thing for now is to revert the test back to testing transferTo when the target is opened for append.

So changed in 6351c8d and limited to run on Linux only.

Copy link
Contributor

@AlanBateman AlanBateman left a comment

Choose a reason for hiding this comment

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

The test no longer needs to build jdk.test.lib.Platform, otherwise the update looks okay.

@bplb
Copy link
Member Author

bplb commented Aug 26, 2022

The test no longer needs to build jdk.test.lib.Platform, otherwise the update looks okay.

Ack. I had to forget something. Fixed in 6182d3b.

@AlanBateman
Copy link
Contributor

The test no longer needs to build jdk.test.lib.Platform, otherwise the update looks okay.

Ack. I had to forget something. Fixed in 6182d3b.

Thanks. MIN_SIZE is a left-over too, we can get that the next time.

@bplb
Copy link
Member Author

bplb commented Aug 26, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Aug 26, 2022

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

  • 3844685: 8292697: ZGC: Hangs when almost out of metaspace memory
  • 2b80349: 8292669: IGV: Search not useable when in Overflow Toolbar
  • 4732abf: 8292910: Remove root to oop cast in HeapDumper
  • f694f8a: 8292083: Detected container memory limit may exceed physical machine memory
  • f91943c: 8292868: Explicitly pass a third temp register to MacroAssembler::store_heap_oop for aarch64
  • 6354a57: 8290711: assert(false) failed: infinite loop in PhaseIterGVN::optimize
  • 3e18773: 8292880: Improve debuggee logging for com/sun/jdi/ClassUnloadEventTest.java
  • 909e1ed: 8292919: Build failure due to UseJVMCICompiler was not declared when C2 is disabled after JDK-8292691
  • 55f5a83: 8282410: Remove SA ProcDebugger support
  • d83faea: 8292250: Create test for co-located JDI MethodEntry, Step, and Breakpoint events
  • ... and 106 more: https://git.openjdk.org/jdk/compare/494d3873b1d0f7e3ca0a063b44362e7242298dec...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 26, 2022

@bplb Pushed as commit c74b6d4.

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

@bplb bplb deleted the FileChannel-transferTo-8292562 branch September 2, 2022 14:56
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 nio nio-dev@openjdk.org
2 participants