8238755: allow to create static lib for javafx.media on linux #109

johanvos · 2020-02-10T12:26:53Z

add support for the "resource" protocol (which is used in the GraalVM URLs pointing to statically bundled resources)
avoid duplicate symbols with different gst plugins
statically register gst plugins

Progress

Change must not contain extraneous whitespace
Commit message must refer to an issue
Change must be properly reviewed

Issue

JDK-8238755: allow to create static lib for javafx.media on linux

Reviewers

Kevin Rushforth (kcr - Reviewer)
Alexander Matveev (almatvee - Reviewer)

Download

$ git fetch https://git.openjdk.java.net/jfx pull/109/head:pull/109
$ git checkout pull/109

* add support for the "resource" protocol (which is used in the GraalVM URLs pointing to statically bundled resources) * avoid duplicate symbols with different gst plugins * statically register gst plugins

bridgekeeper · 2020-02-10T12:27:49Z

👋 Welcome back jvos! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request.

mlbridge · 2020-02-10T12:39:59Z

Webrevs

kevinrushforth · 2020-02-10T15:07:31Z

/reviewers 2

openjdk · 2020-02-10T15:07:37Z

@kevinrushforth
The number of required reviews for this PR is now set to 2 (with at least 1 of role reviewers).

kevinrushforth · 2020-02-10T15:07:49Z

I'll review this and also ask @sashamatveev to review.

kevinrushforth

I added a comment about using an ifdef for GSTREAMER_LITE in one of the modified files (the others are fine, since those files are entirely FX_specific).

One other question: do you need any changes in ConnectionHolder.java? That class checks for URL scheme to determine whether a URL is seekable.

modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gst.c

sashamatveev · 2020-02-10T22:06:40Z

...es/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/platform/gstreamer/GSTPlatform.java

@@ -62,7 +62,8 @@
        "file",
        "http",
        "https",
-        "jrt"
+        "jrt",
+        "resource"


We do not support "resource" protocol in non-static build, so it is better to only enable it for static build. Not sure how to do this.

As an alternative, the "iPod" strategy can be used.
For some reasons, the "ipod-library" protocol is supported in the code (Locator), and if that is found, most connection code is bypassed.
That strategy seems to be much more difficult to maintain though.

"ipod-library" is only supported if IOSPlatform is loaded, but it will not be loaded on all platform due to check for HostUtils.isIOS(). Do you know what happens if user tries "resource" protocol on not supported platform? and same for some "unknown" protocol. If error message makes sense we can probably keep it as is.

That is not 100% correct. ipod-library is supported in case System.getProperty("os.name") starts with "ios" (which we do in GraalVM and OpenJDK/mobile) (which does not guarantee at all that we're on ios).

We can encapsulate the "resource" protocol using the same approach (with a System.getProperty check). In that case, it might make sense to use a wide property that indicates we're running on a statically linked image. That would then be useful for all Java code, not just javafx.media. But that is a bigger change, so I'd like @kevinrushforth opinion on this.

It might make sense to add an isStaticallyLinked method to PlatformUtil, which is where similar platform methods are kept.

johanvos · 2020-02-11T10:59:32Z

As for the ConnectionHolder: the URIConnectionHolder will be used. This indeed will by default return false for isSeekable hence that functionality will now not be possible using the "resource" protocol.

EDIT: with 1c7a4eb this is now working as intended (support for seek has been added, since the lower layers support it)

sashamatveev · 2020-02-11T22:31:49Z

Does "resource" protocol allows random access? If yes, we should update isSeekable() to return true for resource protocol. seek() should also be updated. I think same should work as for "if ((urlConnection instanceof JarURLConnection) || isJRT())"

johanvos · 2020-02-12T09:30:16Z

Does "resource" protocol allows random access? If yes, we should update isSeekable() to return true for resource protocol. seek() should also be updated. I think same should work as for "if ((urlConnection instanceof JarURLConnection) || isJRT())"

Good suggestion, committed.

…38755-staticmedia

…ly linked image (which has resources linked into the executable)

kevinrushforth

Looks good to me. I ran a full test on Linux with the default dynamic libraries and all looks good. I also tested that the resource protocol throws an informative exception:

MediaException: MEDIA_INACCESSIBLE : unknown protocol: resource

I asked one question, but whatever you decide is fine with me.

kevinrushforth · 2020-02-20T21:55:37Z

modules/javafx.base/src/main/java/com/sun/javafx/PlatformUtil.java

@@ -71,6 +71,7 @@
    private static final boolean LINUX = os.startsWith("Linux") && !ANDROID;
    private static final boolean SOLARIS = os.startsWith("SunOS");
    private static final boolean IOS = os.startsWith("iOS");
+    private static final boolean STATIC_BUILD = "Substrate VM".equals(System.getProperty("java.vm.name"));


Is it always going to be the case that STATIC_BUILD == is SubStrate VM?

That's a good question. At this moment, there is a 1-1 link between statically linked images and Substrate VM.
In case there will be more VM's that are statically linked with the applications and resources, I assume it will be beneficial to add a property in the "java." space to reflect this. There are more parts in OpenJDK that can benefit from different treatment in case of a statically linked image.

sashamatveev

Looks good.

openjdk · 2020-02-21T22:34:38Z

@johanvos This change now passes all automated pre-integration checks. When the change also fulfills all project specific requirements, type /integrate in a new comment to proceed. After integration, the commit message will be:

8238755: allow to create static lib for javafx.media on linux

Reviewed-by: kcr, almatvee

If you would like to add a summary, use the /summary command.
To credit additional contributors, use the /contributor command.
To add additional solved issues, use the /solves command.

Since the source branch of this PR was last updated there have been 9 commits pushed to the master branch. Since there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid automatic rebasing, please merge master into your branch, and then specify the current head hash when integrating, like this: /integrate ef2f9ce96e21ff5ec4f528fb8e5f191632506791.

➡️ To integrate this PR with the above commit message, type /integrate in a new comment.

johanvos · 2020-02-25T22:01:29Z

/integrate

openjdk · 2020-02-25T22:02:10Z

@johanvos The following commits have been pushed to master since your change was applied:

c3ee1a3: 8239822: Intermittent unit test failures in RegionCSSTest
3150562: 8235772: Remove use of deprecated finalize method from PiscesRenderer and AbstractSurface
4eaff0d: 8239109: Update SQLite to version 3.31.1
d8e7f85: 8239454: LLIntData : invalid opcode returned for 16 and 32 bit wide instructions
48ddd80: Merge
35a01ca: 8228867: Fix mistakes in FX API docs
b5e65ec: 8238434: Ensemble: Update version of Lucene to 7.7.2
e986459: 8227619: Potential memory leak in javafx.scene.control.ListView

Your commit was automatically rebased without conflicts.

Pushed as commit ef2f9ce.

mlbridge · 2020-02-25T22:03:30Z

Mailing list message from Johan Vos on openjfx-dev:

Changeset: ef2f9ce
Author: Johan Vos <jvos at openjdk.org>
Date: 2020-02-25 22:02:00 +0000
URL: https://git.openjdk.java.net/jfx/commit/ef2f9ce9

8238755: allow to create static lib for javafx.media on linux

Reviewed-by: kcr, almatvee

! modules/javafx.base/src/main/java/com/sun/javafx/PlatformUtil.java
! modules/javafx.base/src/main/java/module-info.java
! modules/javafx.media/src/main/java/com/sun/media/jfxmedia/locator/ConnectionHolder.java
! modules/javafx.media/src/main/java/com/sun/media/jfxmedia/locator/Locator.java
! modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/platform/PlatformManager.java
! modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/platform/gstreamer/GSTPlatform.java
! modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gst.c
! modules/javafx.media/src/main/native/gstreamer/plugins/av/fxavcodecplugin.c
! modules/javafx.media/src/main/native/gstreamer/plugins/fxplugins.c
! modules/javafx.media/src/main/native/jfxmedia/platform/gstreamer/GstPlatform.cpp

Fix for JDK-8238755

c334ba8

* add support for the "resource" protocol (which is used in the GraalVM URLs pointing to statically bundled resources) * avoid duplicate symbols with different gst plugins * statically register gst plugins

johanvos requested a review from kevinrushforth February 10, 2020 12:26

openjdk bot added the rfr Ready for review label Feb 10, 2020

kevinrushforth assigned johanvos Feb 10, 2020

kevinrushforth reviewed Feb 10, 2020

View reviewed changes

modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gst.c Show resolved Hide resolved

sashamatveev reviewed Feb 10, 2020

View reviewed changes

add check for GSTREAMER_LITE

03759cf

Add support for seek when the protocol is "resource"

1c7a4eb

johanvos mentioned this pull request Feb 12, 2020

Cannot play AudioClips on Mac gluonhq/substrate#336

Open

johanvos added 4 commits February 12, 2020 11:25

Merge branch '8238755-staticmedia' of github.com:johanvos/jfx into 82…

3722e48

…38755-staticmedia

Only apply JavaFX specific test in case GSTREAMER_LITE is defined

d95cf4c

Merge branch '8238755-staticmedia' of github.com:johanvos/jfx into 82…

a76b7c3

…38755-staticmedia

Only allow the resource protocol to be used when we are in a statical…

21ac3de

…ly linked image (which has resources linked into the executable)

kevinrushforth approved these changes Feb 20, 2020

View reviewed changes

sashamatveev approved these changes Feb 21, 2020

View reviewed changes

openjdk bot added the ready Ready to be integrated label Feb 21, 2020

openjdk bot closed this Feb 25, 2020

openjdk bot added integrated Pull request has been integrated and removed ready Ready to be integrated rfr Ready for review labels Feb 25, 2020

8238755: allow to create static lib for javafx.media on linux #109

8238755: allow to create static lib for javafx.media on linux #109

johanvos commented Feb 10, 2020 •

edited by openjdk bot

bridgekeeper bot commented Feb 10, 2020

mlbridge bot commented Feb 10, 2020 •

edited

kevinrushforth commented Feb 10, 2020

openjdk bot commented Feb 10, 2020

kevinrushforth commented Feb 10, 2020

kevinrushforth left a comment •

edited

sashamatveev Feb 10, 2020

johanvos Feb 11, 2020

sashamatveev Feb 11, 2020

johanvos Feb 12, 2020

kevinrushforth Feb 13, 2020

johanvos commented Feb 11, 2020 •

edited

sashamatveev commented Feb 11, 2020

johanvos commented Feb 12, 2020

kevinrushforth left a comment

kevinrushforth Feb 20, 2020

johanvos Feb 21, 2020

sashamatveev left a comment

openjdk bot commented Feb 21, 2020 •

edited

johanvos commented Feb 25, 2020

openjdk bot commented Feb 25, 2020

mlbridge bot commented Feb 25, 2020

8238755: allow to create static lib for javafx.media on linux #109

8238755: allow to create static lib for javafx.media on linux #109

Conversation

johanvos commented Feb 10, 2020 • edited by openjdk bot

Progress

Issue

Reviewers

Download

bridgekeeper bot commented Feb 10, 2020

mlbridge bot commented Feb 10, 2020 • edited

Webrevs

kevinrushforth commented Feb 10, 2020

openjdk bot commented Feb 10, 2020

kevinrushforth commented Feb 10, 2020

kevinrushforth left a comment • edited

Choose a reason for hiding this comment

sashamatveev Feb 10, 2020

Choose a reason for hiding this comment

johanvos Feb 11, 2020

Choose a reason for hiding this comment

sashamatveev Feb 11, 2020

Choose a reason for hiding this comment

johanvos Feb 12, 2020

Choose a reason for hiding this comment

kevinrushforth Feb 13, 2020

Choose a reason for hiding this comment

johanvos commented Feb 11, 2020 • edited

sashamatveev commented Feb 11, 2020

johanvos commented Feb 12, 2020

kevinrushforth left a comment

Choose a reason for hiding this comment

kevinrushforth Feb 20, 2020

Choose a reason for hiding this comment

johanvos Feb 21, 2020

Choose a reason for hiding this comment

sashamatveev left a comment

Choose a reason for hiding this comment

openjdk bot commented Feb 21, 2020 • edited

johanvos commented Feb 25, 2020

openjdk bot commented Feb 25, 2020

mlbridge bot commented Feb 25, 2020

johanvos commented Feb 10, 2020 •

edited by openjdk bot

mlbridge bot commented Feb 10, 2020 •

edited

kevinrushforth left a comment •

edited

johanvos commented Feb 11, 2020 •

edited

openjdk bot commented Feb 21, 2020 •

edited