On Thu, Feb 8, 2024 at 4:30 PM <r...@apache.org> wrote:
>
> This is an automated email from the ASF dual-hosted git repository.
>
> remm pushed a commit to branch main
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>
>
> The following commit(s) were added to refs/heads/main by this push:
> new 830771823e Jextract library load refinements
> 830771823e is described below
>
> commit 830771823edbb79d2884eb1c6f5122e81df4df78
> Author: remm <r...@apache.org>
> AuthorDate: Thu Feb 8 16:30:07 2024 +0100
>
> Jextract library load refinements
This makes OpenSSL FFM work on the CI runs, so it actually does something ;)
Rémy
> ---
> java/org/apache/tomcat/util/openssl/openssl_h.java | 10 +++-------
> 1 file changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/java/org/apache/tomcat/util/openssl/openssl_h.java
> b/java/org/apache/tomcat/util/openssl/openssl_h.java
> index f006407e23..25ba1ae96f 100644
> --- a/java/org/apache/tomcat/util/openssl/openssl_h.java
> +++ b/java/org/apache/tomcat/util/openssl/openssl_h.java
> @@ -29,13 +29,6 @@ import static java.lang.foreign.ValueLayout.*;
> @SuppressWarnings({"javadoc", "boxing"})
> public class openssl_h {
>
> - static final SymbolLookup SYMBOL_LOOKUP
> - =
> SymbolLookup.loaderLookup().or(Linker.nativeLinker().defaultLookup());
> -
> - static {
> - System.loadLibrary("ssl");
> - }
> -
> openssl_h() {
> // Suppresses public default constructor, ensuring
> non-instantiability,
> // but allows generated subclasses in same package.
> @@ -54,6 +47,9 @@ public class openssl_h {
>
> static final Arena LIBRARY_ARENA = Arena.ofAuto();
> static final boolean TRACE_DOWNCALLS =
> Boolean.getBoolean("jextract.trace.downcalls");
> + static final SymbolLookup SYMBOL_LOOKUP =
> SymbolLookup.libraryLookup(System.mapLibraryName("ssl"), LIBRARY_ARENA)
> + .or(SymbolLookup.loaderLookup())
> + .or(Linker.nativeLinker().defaultLookup());
>
> static void traceDowncall(String name, Object... args) {
> String traceArgs = Arrays.stream(args)
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
