8297822: De-duplicate code in module jdk.sctp by minborg · Pull Request #11436 · openjdk/jdk

minborg · 2022-11-30T16:54:02Z

This PR proposes merging logic and optimising three classes that exist for aix, macos and windows.

Optimisation will reduce byte code. Below is an example for one of the many methods optimised.

Before:

public void implCloseSelectableChannel() throws java.io.IOException;
  Code:
     0: new           #7                  // class java/lang/UnsupportedOperationException
     3: dup
     4: ldc           #11                 // String SCTP not supported on this platform
     6: invokespecial #13                 // Method java/lang/UnsupportedOperationException."<init>":(Ljava/lang/String;)V
     9: athrow

After:

public void implCloseSelectableChannel() throws java.io.IOException;
  Code:
     0: invokestatic  #16                 // Method sun/nio/ch/sctp/UnsupportedUtil.sctpUnsupported:()Ljava/lang/UnsupportedOperationException;
     3: athrow

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-8297822: De-duplicate code in module jdk.sctp

Reviewers

Daniel Fuchs (@dfuch - Reviewer) ⚠️ Review applies to 6c5c1f41
Roger Riggs (@RogerRiggs - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11436

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

Using diff file

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

bridgekeeper · 2022-11-30T16:55:40Z

👋 Welcome back pminborg! 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 · 2022-11-30T17:02:01Z

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

net

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.

mlbridge · 2022-11-30T17:05:17Z

Webrevs

dfuch

Good to see all the duplication go away.

dfuch · 2022-11-30T17:30:56Z

src/jdk.sctp/share/classes/sun/nio/ch/sctp/UnsupportedUtil.java

@@ -0,0 +1,14 @@
+package sun.nio.ch.sctp;


Still need regular copyright header :-)

AlanBateman · 2022-11-30T18:11:36Z

One thing to try is moving the files from src/jdk.sctp/windows/classes/sun/nio/ch/sctp to src/jdk.sctp/share/classes/sun/nio/ch/sctp and removing the src/jdk.sctp/windows, src/jdk.sctp/macosx, and src/jdk.sctp/aix tress. If that works then it would avoid needing to have 3 copies of the "unsupported" implementation and avoid include UnsupportedXXX classes in the Linux implementation.

RogerRiggs · 2022-11-30T18:34:15Z

src/jdk.sctp/macosx/classes/sun/nio/ch/sctp/SctpChannelImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.


Please check the copyrights (2022), some look like they went back in time.

dfuch · 2022-12-01T15:05:01Z

Please make sure that all related tests (as well as tier1 and tier2) pass before integrating.

openjdk · 2022-12-01T15:05:59Z

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

8297822: De-duplicate code in module jdk.sctp

Reviewed-by: dfuchs, rriggs

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:

fabda24: 8296389: C2: PhaseCFG::convert_NeverBranch_to_Goto must handle both orders of successors
6c23b4f: 8298480: Remove unused KlassRemSet
8e5c331: 8298471: Parallel: Don't keep alive nmethods in Young GC
d646e32: 8298090: Use String.join() instead of manual loop in DescriptorSupport.toString
a37de62: 8298126: Print statistics for objects in CDS archive heap
8ea2a67: 8292265: Add old gen used field at G1HeapSummary JFR event
478ef38: 8296812: sprintf is deprecated in Xcode 14
715bf70: Merge
a894649: 8298225: [AIX] Disable PPC64LE continuations on AIX
52fffdd: 8298463: tools/javac/modules/EdgeCases.java fails on Windows after JDK-8297988
... and 106 more: https://git.openjdk.org/jdk/compare/6a7a0db587446160e77c9ac225669e5a0c9bc638...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@dfuch, @RogerRiggs) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

RogerRiggs

Looks much better

AlanBateman · 2022-12-01T15:27:23Z

The latest update looks quite good but you might want to update make/jdk.sctp/Java.gmk to exclude UnsupportedUtils on linux, meaning there is no need to compile/include that on a Linux build.

minborg · 2022-12-05T13:39:34Z

Please make sure that all related tests (as well as tier1 and tier2) pass before integrating.

We have run tests on a box where SCTP was enabled and they passed.

minborg · 2022-12-06T11:21:30Z

/integrate

openjdk · 2022-12-06T11:24:09Z

@minborg
Your change (at version 6c5c1f4) is now ready to be sponsored by a Committer.

dfuch · 2022-12-06T14:06:11Z

Hi Per, I will sponsor this PR after the RDP 1 fork (after the latest changes have been reviewed).

minborg · 2022-12-09T09:59:09Z

Can either of you please have a look at the make file @AlanBateman or @RogerRiggs ?

AlanBateman · 2022-12-09T12:03:22Z

Can either of you please have a look at the make file @AlanBateman or @RogerRiggs ?

It looks right. SCTP used to be Solaris + Linux, now it's Linux only. If there is a low chance that it will remain the only port then we could move it to src/jdk.sctp/linux but no need to do that now.

RogerRiggs

LGTM

dfuch · 2022-12-12T10:12:20Z

/sponsor

openjdk · 2022-12-12T10:14:07Z

@dfuch The PR has been updated since the change author (@minborg) issued the integrate command - the author must perform this command again.

minborg · 2022-12-12T12:52:48Z

/integrate

openjdk · 2022-12-12T12:55:10Z

@minborg
Your change (at version 7e3aaf9) is now ready to be sponsored by a Committer.

dfuch · 2022-12-12T13:31:20Z

/sponsor

openjdk · 2022-12-12T13:33:40Z

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

fabda24: 8296389: C2: PhaseCFG::convert_NeverBranch_to_Goto must handle both orders of successors
6c23b4f: 8298480: Remove unused KlassRemSet
8e5c331: 8298471: Parallel: Don't keep alive nmethods in Young GC
d646e32: 8298090: Use String.join() instead of manual loop in DescriptorSupport.toString
a37de62: 8298126: Print statistics for objects in CDS archive heap
8ea2a67: 8292265: Add old gen used field at G1HeapSummary JFR event
478ef38: 8296812: sprintf is deprecated in Xcode 14
715bf70: Merge
a894649: 8298225: [AIX] Disable PPC64LE continuations on AIX
52fffdd: 8298463: tools/javac/modules/EdgeCases.java fails on Windows after JDK-8297988
... and 106 more: https://git.openjdk.org/jdk/compare/6a7a0db587446160e77c9ac225669e5a0c9bc638...master

Your commit was automatically rebased without conflicts.

openjdk · 2022-12-12T13:34:06Z

@dfuch @minborg Pushed as commit 56c438b.

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

magicus · 2022-12-14T13:38:59Z

Please note that Skara does not update the list of labels when new files are added to a PR after it's creation. It is up to the committer and reviewer to be aware of such changes during the lifetime of a PR. In this case, it would have been appropriate to add the build label when the changes to the makefiles were introduced.

dfuch · 2022-12-14T15:29:38Z

Oh - I didn't know that. Thanks for the reminder Magnus!

De-duplicate code in module jdk.sctp

fcecbc4

openjdk bot added the rfr Pull request is ready for review label Nov 30, 2022

openjdk bot added the net net-dev@openjdk.org label Nov 30, 2022

dfuch reviewed Nov 30, 2022

View reviewed changes

RogerRiggs reviewed Nov 30, 2022

View reviewed changes

minborg added 2 commits December 1, 2022 10:18

Fix copyrignt and add sealed classes

b73819f

Move and refactor classes to reduce duplication

6c5c1f4

dfuch approved these changes Dec 1, 2022

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Dec 1, 2022

RogerRiggs approved these changes Dec 1, 2022

View reviewed changes

minborg added 3 commits December 5, 2022 19:08

Remove final declarations

c79a394

Merge branch 'master' into sctp-dedup

da76c96

Remove UnsupportedUtil.java where not needed

7e3aaf9

openjdk bot added the sponsor Pull request is ready to be sponsored label Dec 6, 2022

openjdk bot removed the sponsor Pull request is ready to be sponsored label Dec 6, 2022

RogerRiggs approved these changes Dec 9, 2022

View reviewed changes

openjdk bot added the sponsor Pull request is ready to be sponsored label Dec 12, 2022

openjdk bot added the integrated Pull request has been integrated label Dec 12, 2022

openjdk bot closed this Dec 12, 2022

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Dec 12, 2022

Conversation

minborg commented Nov 30, 2022 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Uh oh!

bridgekeeper bot commented Nov 30, 2022

Uh oh!

openjdk bot commented Nov 30, 2022

Uh oh!

mlbridge bot commented Nov 30, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

dfuch left a comment

Choose a reason for hiding this comment

Uh oh!

dfuch Nov 30, 2022

Choose a reason for hiding this comment

Uh oh!

AlanBateman commented Nov 30, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

RogerRiggs Nov 30, 2022

Choose a reason for hiding this comment

Uh oh!

dfuch commented Dec 1, 2022

Uh oh!

openjdk bot commented Dec 1, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

RogerRiggs left a comment

Choose a reason for hiding this comment

Uh oh!

AlanBateman commented Dec 1, 2022

Uh oh!

minborg commented Dec 5, 2022

Uh oh!

minborg commented Dec 6, 2022

Uh oh!

openjdk bot commented Dec 6, 2022

Uh oh!

dfuch commented Dec 6, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

minborg commented Dec 9, 2022

Uh oh!

AlanBateman commented Dec 9, 2022

Uh oh!

RogerRiggs left a comment

Choose a reason for hiding this comment

Uh oh!

dfuch commented Dec 12, 2022

Uh oh!

openjdk bot commented Dec 12, 2022

Uh oh!

minborg commented Dec 12, 2022

Uh oh!

openjdk bot commented Dec 12, 2022

Uh oh!

dfuch commented Dec 12, 2022

Uh oh!

openjdk bot commented Dec 12, 2022

Uh oh!

openjdk bot commented Dec 12, 2022

Uh oh!

magicus commented Dec 14, 2022

Uh oh!

dfuch commented Dec 14, 2022

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

5 participants

minborg commented Nov 30, 2022 •

edited by openjdk bot

Loading

mlbridge bot commented Nov 30, 2022 •

edited

Loading

AlanBateman commented Nov 30, 2022 •

edited

Loading

openjdk bot commented Dec 1, 2022 •

edited

Loading

dfuch commented Dec 6, 2022 •

edited

Loading