8320890: [AIX] Find a better way to mimic dl handle equality #252

JoKern65 · 2024-02-09T16:42:01Z

Hi all,

This pull request contains a backport of commit b8ae4a8c from the openjdk/jdk repository.

The commit being backported was authored by Joachim Kern on 11 Jan 2024 and was reviewed by Thomas Stuefe and Martin Doerr.

Thanks!

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
JDK-8320890 needs maintainer approval

Issue

JDK-8320890: [AIX] Find a better way to mimic dl handle equality (Enhancement - P4 - Approved)

Reviewers

Martin Doerr (@TheRealMDoerr - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk21u-dev.git pull/252/head:pull/252
$ git checkout pull/252

Update a local copy of the PR:
$ git checkout pull/252
$ git pull https://git.openjdk.org/jdk21u-dev.git pull/252/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 252

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk21u-dev/pull/252.diff

Webrev

Link to Webrev Comment

bridgekeeper · 2024-02-09T16:42:38Z

👋 Welcome back jkern! 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 · 2024-02-09T16:43:12Z

This backport pull request has now been updated with issue from the original commit.

mlbridge · 2024-02-09T16:46:25Z

Webrevs

01: Full - Incremental (b703a3da)
00: Full (b4112246)

TheRealMDoerr

Looks correct, but please minimize diffs to upstream version!

TheRealMDoerr · 2024-02-10T07:34:22Z

src/hotspot/os/aix/os_aix.cpp

@@ -1126,7 +1128,8 @@ void *os::dll_load(const char *filename, char *ebuf, int ebuflen) {
    dflags |= RTLD_MEMBER;
  }

-  void * result= ::dlopen(filename, dflags);
+  const char* error_report = nullptr;
+  void * result = Aix_dlopen(filename, dflags, &error_report);


Diff to upstream version should get minimized: void* result; is in a separate line here: openjdk/jdk@b8ae4a8

TheRealMDoerr · 2024-02-10T07:35:49Z

src/hotspot/os/aix/porting_aix.cpp

+  LoadedLibraries::reload();
+
+  return res;
+} // end: os::pd_dll_unload()


Newline diff.

This newline at the end of the file was marked red in my diff check, therefore I removed it. But OK I put it in again.

TheRealMDoerr · 2024-02-10T07:40:14Z

src/hotspot/os/posix/os_posix.cpp

@@ -734,25 +735,19 @@ void os::dll_unload(void *lib) {
  if (l_path == nullptr) {
    l_path = "<not available>";
  }
-  int res = ::dlclose(lib);
+  char ebuf[1024];
+  bool res = os::pd_dll_unload(lib, ebuf, sizeof(ebuf));



Empty lines are different than in upstream version.

TheRealMDoerr

LGTM. Thanks!

openjdk · 2024-02-12T07:08:01Z

⚠️ @JoKern65 This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

JoKern65 · 2024-02-17T07:50:11Z

/approval JDK-8320890 request I backport this to fix the bug on AIX. Not clean but trivial backport. Test runs on various platforms succeeded. Minor risk as the shared code changes are basically a refactoring, so the risk is limited to AIX.

openjdk · 2024-02-17T07:50:37Z

@JoKern65
JDK-8320890: The approval request has been created successfully.

openjdk · 2024-02-19T09:08:57Z

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

8320890: [AIX] Find a better way to mimic dl handle equality

Reviewed-by: mdoerr

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

93be33c: 8325672: C2: allocate PhaseIdealLoop::_loop_or_ctrl from C->comp_arena()
70112e3: 8315891: java/foreign/TestLinker.java failed with "error occurred while instantiating class TestLinker: null"
e181516: 8315602: Open source swing security manager test
70fa49e: 8324347: Enable "maybe-uninitialized" warning for FreeType 2.13.1
1c92a05: 8318603: Parallelize sun/java2d/marlin/ClipShapeTest.java
941ca60: 8009550: PlatformPCSC should load versioned so
fb19cb3: 8319314: NMT detail report slow or hangs for large number of mappings
3da175b: 8323717: Introduce test keyword for tests that need external dependencies
24fae7a: 8324514: ClassLoaderData::print_on should print address of class loader
786c5fb: 8324858: [vectorapi] Bounds checking issues when accessing memory segments
... and 8 more: https://git.openjdk.org/jdk21u-dev/compare/0604ce7f383b67c372d55987ff8a7bf3a2189c55...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 (@TheRealMDoerr) 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).

JoKern65 · 2024-02-19T09:49:41Z

/integrate

openjdk · 2024-02-19T09:49:55Z

@JoKern65
Your change (at version b703a3d) is now ready to be sponsored by a Committer.

TheRealMDoerr · 2024-02-19T09:50:30Z

/sponsor

openjdk · 2024-02-19T09:51:02Z

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

93be33c: 8325672: C2: allocate PhaseIdealLoop::_loop_or_ctrl from C->comp_arena()
70112e3: 8315891: java/foreign/TestLinker.java failed with "error occurred while instantiating class TestLinker: null"
e181516: 8315602: Open source swing security manager test
70fa49e: 8324347: Enable "maybe-uninitialized" warning for FreeType 2.13.1
1c92a05: 8318603: Parallelize sun/java2d/marlin/ClipShapeTest.java
941ca60: 8009550: PlatformPCSC should load versioned so
fb19cb3: 8319314: NMT detail report slow or hangs for large number of mappings
3da175b: 8323717: Introduce test keyword for tests that need external dependencies
24fae7a: 8324514: ClassLoaderData::print_on should print address of class loader
786c5fb: 8324858: [vectorapi] Bounds checking issues when accessing memory segments
... and 8 more: https://git.openjdk.org/jdk21u-dev/compare/0604ce7f383b67c372d55987ff8a7bf3a2189c55...master

Your commit was automatically rebased without conflicts.

openjdk · 2024-02-19T09:51:12Z

@TheRealMDoerr @JoKern65 Pushed as commit 4d4c47d.

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

Backport b8ae4a8c0985d1763ac48ba78943d8b992d7be77

b411224

openjdk bot changed the title ~~Backport b8ae4a8c0985d1763ac48ba78943d8b992d7be77~~ 8320890: [AIX] Find a better way to mimic dl handle equality Feb 9, 2024

openjdk bot added backport rfr Pull request is ready for review labels Feb 9, 2024

TheRealMDoerr reviewed Feb 10, 2024

View reviewed changes

cosmetic changes

b703a3d

TheRealMDoerr approved these changes Feb 12, 2024

View reviewed changes

openjdk bot added the approval label Feb 17, 2024

openjdk bot added ready Pull request is ready to be integrated and removed approval labels Feb 19, 2024

openjdk bot added the sponsor Pull request is ready to be sponsored label Feb 19, 2024

openjdk bot added the integrated Pull request has been integrated label Feb 19, 2024

openjdk bot closed this Feb 19, 2024

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 Feb 19, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8320890: [AIX] Find a better way to mimic dl handle equality #252

8320890: [AIX] Find a better way to mimic dl handle equality #252

JoKern65 commented Feb 9, 2024 •

edited by openjdk bot

Loading

bridgekeeper bot commented Feb 9, 2024

openjdk bot commented Feb 9, 2024

mlbridge bot commented Feb 9, 2024 •

edited

Loading

TheRealMDoerr left a comment

TheRealMDoerr Feb 10, 2024

TheRealMDoerr Feb 10, 2024

JoKern65 Feb 11, 2024

TheRealMDoerr Feb 10, 2024

TheRealMDoerr left a comment

openjdk bot commented Feb 12, 2024

JoKern65 commented Feb 17, 2024

openjdk bot commented Feb 17, 2024

openjdk bot commented Feb 19, 2024

JoKern65 commented Feb 19, 2024

openjdk bot commented Feb 19, 2024

TheRealMDoerr commented Feb 19, 2024

openjdk bot commented Feb 19, 2024

openjdk bot commented Feb 19, 2024

8320890: [AIX] Find a better way to mimic dl handle equality #252

8320890: [AIX] Find a better way to mimic dl handle equality #252

Conversation

JoKern65 commented Feb 9, 2024 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

Webrev

bridgekeeper bot commented Feb 9, 2024

openjdk bot commented Feb 9, 2024

mlbridge bot commented Feb 9, 2024 • edited Loading

Webrevs

TheRealMDoerr left a comment

Choose a reason for hiding this comment

TheRealMDoerr Feb 10, 2024

Choose a reason for hiding this comment

TheRealMDoerr Feb 10, 2024

Choose a reason for hiding this comment

JoKern65 Feb 11, 2024

Choose a reason for hiding this comment

TheRealMDoerr Feb 10, 2024

Choose a reason for hiding this comment

TheRealMDoerr left a comment

Choose a reason for hiding this comment

openjdk bot commented Feb 12, 2024

JoKern65 commented Feb 17, 2024

openjdk bot commented Feb 17, 2024

openjdk bot commented Feb 19, 2024

JoKern65 commented Feb 19, 2024

openjdk bot commented Feb 19, 2024

TheRealMDoerr commented Feb 19, 2024

openjdk bot commented Feb 19, 2024

openjdk bot commented Feb 19, 2024

JoKern65 commented Feb 9, 2024 •

edited by openjdk bot

Loading

mlbridge bot commented Feb 9, 2024 •

edited

Loading