8284023: java.sun.awt.X11GraphicsDevice.getDoubleBufferVisuals() leaks XdbeScreenVisualInfo #8047

zhengyu123 · 2022-03-30T19:13:24Z

Please review this small patch that fixes memory leak of XdbeScreenVisualInfo obtained from XdbeGetVisualInfo() method call.

Test:

jdk_awt

Progress

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

Issue

JDK-8284023: java.sun.awt.X11GraphicsDevice.getDoubleBufferVisuals() leaks XdbeScreenVisualInfo

Reviewers

Phil Race (@prrace - Reviewer)
Sergey Bylokhov (@mrserb - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/8047/head:pull/8047
$ git checkout pull/8047

Update a local copy of the PR:
$ git checkout pull/8047
$ git pull https://git.openjdk.java.net/jdk pull/8047/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 8047

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/8047.diff

…s XdbeScreenVisualInfo

bridgekeeper · 2022-03-30T19:15:13Z

👋 Welcome back zgu! 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-03-30T19:17:29Z

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

client

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-03-30T19:20:53Z

Webrevs

01: Full - Incremental (5bfd83d3)
00: Full (55655fad)

mrserb · 2022-03-31T05:00:29Z

src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c

@@ -1428,6 +1428,7 @@ Java_sun_awt_X11GraphicsDevice_getDoubleBufferVisuals(JNIEnv *env,
            break;
        }
    }
+    XdbeFreeVisualInfo(visScreenInfo);


I think we should use AWT_UNLOCK/AWT_UNLOCK here.

Fixed. I assume all X11 calls have to be serialized, right?

Thanks.

If you mean "and so there's no chance of a deadlock", well no .. but here we only have the one lock in this JNI method and we are using the lock already earlier so it is relatively safe.

Thanks for the review, @prrace

@mrserb Is it okay now?

Thanks

openjdk · 2022-04-04T18:18:19Z

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

8284023: java.sun.awt.X11GraphicsDevice.getDoubleBufferVisuals() leaks XdbeScreenVisualInfo

Reviewed-by: prr, serb

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

741be46: 8183390: Fix and re-enable post loop vectorization
500f9a5: 8283396: Null pointer dereference in loopnode.cpp:2851
e9e3aa7: 8283730: Improve discussion of modeling of packages and modules
20acea4: 8284362: Remove the "unsupported API" warning from jdk.javadoc
ff1daa8: 8284380: ProblemList jdk/jshell/HighlightUITest.java on more platforms
526e734: 8282819: Deprecate Locale class constructors
648efd7: 8284275: Remove unused sun.nio.fs.Reflect
f20ed33: 8284278: Diagnostic Fix Updated.
632825c: 8283621: Write a regression test for CCC4400728
9561b5e: 8284165: Add pid to process reaper thread name
... and 69 more: https://git.openjdk.java.net/jdk/compare/720e751f35150251cab05bc9fca3add39daf70af...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.

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

zhengyu123 · 2022-04-06T12:49:10Z

Thanks, @mrserb

zhengyu123 · 2022-04-06T12:49:18Z

/integrate

openjdk · 2022-04-06T12:50:52Z

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

b9cc3bc: 8284067: jpackage'd launcher reports non-zero exit codes with error prompt
bbe894f: 8284288: Use SVG images for FocusSpec.html and Modality.html
e524107: 8280872: Reorder code cache segments to improve code density
e18414a: 8284014: Menu items with submenus in JPopupMEnu are not spoken on macOS
b56df28: 8283935: Parallel: Crash during pretouch after large pages allocation failure
0a67d68: 8284294: Create an automated regression test for RFE 4138746
955d61d: 8284369: TestFailedAllocationBadGraph fails with -XX:TieredStopAtLevel < 4
4ffe96a: 8282506: Clean up remaining references to TwoStacksPlain*SocketImpl
741be46: 8183390: Fix and re-enable post loop vectorization
500f9a5: 8283396: Null pointer dereference in loopnode.cpp:2851
... and 77 more: https://git.openjdk.java.net/jdk/compare/720e751f35150251cab05bc9fca3add39daf70af...master

Your commit was automatically rebased without conflicts.

openjdk · 2022-04-06T12:51:06Z

@zhengyu123 Pushed as commit ec205f6.

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

8284023: java.sun.awt.X11GraphicsDevice.getDoubleBufferVisuals() leak…

55655fa

…s XdbeScreenVisualInfo

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

openjdk bot added the client client-libs-dev@openjdk.org label Mar 30, 2022

mrserb reviewed Mar 31, 2022

View reviewed changes

@mrserb's comment

5bfd83d

prrace approved these changes Apr 4, 2022

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Apr 4, 2022

mrserb approved these changes Apr 6, 2022

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Apr 6, 2022

openjdk bot closed this Apr 6, 2022

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 6, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8284023: java.sun.awt.X11GraphicsDevice.getDoubleBufferVisuals() leaks XdbeScreenVisualInfo #8047

8284023: java.sun.awt.X11GraphicsDevice.getDoubleBufferVisuals() leaks XdbeScreenVisualInfo #8047

zhengyu123 commented Mar 30, 2022 •

edited by openjdk bot

Loading

bridgekeeper bot commented Mar 30, 2022

openjdk bot commented Mar 30, 2022

mlbridge bot commented Mar 30, 2022 •

edited

Loading

mrserb Mar 31, 2022

zhengyu123 Mar 31, 2022

prrace Apr 4, 2022

zhengyu123 Apr 5, 2022

zhengyu123 Apr 5, 2022

openjdk bot commented Apr 4, 2022 •

edited

Loading

zhengyu123 commented Apr 6, 2022

zhengyu123 commented Apr 6, 2022

openjdk bot commented Apr 6, 2022

openjdk bot commented Apr 6, 2022

8284023: java.sun.awt.X11GraphicsDevice.getDoubleBufferVisuals() leaks XdbeScreenVisualInfo #8047

8284023: java.sun.awt.X11GraphicsDevice.getDoubleBufferVisuals() leaks XdbeScreenVisualInfo #8047

Conversation

zhengyu123 commented Mar 30, 2022 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Mar 30, 2022

openjdk bot commented Mar 30, 2022

mlbridge bot commented Mar 30, 2022 • edited Loading

Webrevs

mrserb Mar 31, 2022

Choose a reason for hiding this comment

zhengyu123 Mar 31, 2022

Choose a reason for hiding this comment

prrace Apr 4, 2022

Choose a reason for hiding this comment

zhengyu123 Apr 5, 2022

Choose a reason for hiding this comment

zhengyu123 Apr 5, 2022

Choose a reason for hiding this comment

openjdk bot commented Apr 4, 2022 • edited Loading

zhengyu123 commented Apr 6, 2022

zhengyu123 commented Apr 6, 2022

openjdk bot commented Apr 6, 2022

openjdk bot commented Apr 6, 2022

zhengyu123 commented Mar 30, 2022 •

edited by openjdk bot

Loading

mlbridge bot commented Mar 30, 2022 •

edited

Loading

openjdk bot commented Apr 4, 2022 •

edited

Loading