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

8266814: Improve library loading with SymbolLookup abstraction #532

Closed

Conversation

@mcimadamore
Copy link
Collaborator

@mcimadamore mcimadamore commented May 11, 2021

This patch add jextract support for the newly added SymbolLookup abstraction.

Note that the symbol lookup used by jextract classes is a chained lookup. That is, first the loader lookup is searched, and, when that fails, the system lookup is also searched.


Progress

  • Change must not contain extraneous whitespace
  • Change must be properly reviewed

Issue

  • JDK-8266814: Improve library loading with SymbolLookup abstraction ⚠️ Issue is not open.

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/panama-foreign pull/532/head:pull/532
$ git checkout pull/532

Update a local copy of the PR:
$ git checkout pull/532
$ git pull https://git.openjdk.java.net/panama-foreign pull/532/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 532

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/panama-foreign/pull/532.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented May 11, 2021

👋 Welcome back mcimadamore! A progress list of the required criteria for merging this PR into foreign-jextract 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 openjdk bot commented May 11, 2021

⚠️ @mcimadamore This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

@openjdk openjdk bot added the rfr label May 11, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented May 11, 2021

Webrevs

Copy link
Member

@JornVernee JornVernee left a comment

LGTM. Small comment inline


private String quoteLibraryName(String lib) {
return lib.replace("\\", "\\\\"); // double up slashes
.replace("${C_LANG}", C_LANG_CONSTANTS_HOLDER);
Copy link
Member

@JornVernee JornVernee May 11, 2021

Choose a reason for hiding this comment

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

I don't think this is actually doing anything? I don't see ${C_LANG} being used in RuntimeHelper Not sure the accompanying change in ClassSourceBuilder is needed either.

Copy link
Member

@sundararajana sundararajana May 11, 2021

Choose a reason for hiding this comment

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

I thought I removed it. Hmm..

Yes, this C_LANG is not used anymore

@openjdk
Copy link

@openjdk openjdk bot commented May 11, 2021

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

8266814: Improve library loading with SymbolLookup abstraction

Reviewed-by: jvernee

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 no new commits pushed to the foreign-jextract branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

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

@openjdk openjdk bot added the ready label May 11, 2021
@mcimadamore
Copy link
Collaborator Author

@mcimadamore mcimadamore commented May 11, 2021

/integrate

Copy link
Member

@sundararajana sundararajana left a comment

LGTM

Tests fine on Mac. Samples jextract and run fine. libproc and time samples no longer need -l libSystem.B.dylib option

@openjdk openjdk bot closed this May 11, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels May 11, 2021
@openjdk
Copy link

@openjdk openjdk bot commented May 11, 2021

@mcimadamore Pushed as commit 30ff6cd.

💡 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
3 participants