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

8284956: Potential leak awtImageData/color_data when initializes X11GraphicsEnvironment #8317

Conversation

zhengyu123
Copy link
Contributor

@zhengyu123 zhengyu123 commented Apr 20, 2022

During initializing native data of X11GraphicsEnvironment, a single AwtGraphicsConfigData is used/reused, not only failed cases, but also succeeded cases. So AwtGraphicsConfigData internal states need to be cleanup properly to avoid memory leaks.

Test:

  • jdk_awt

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed (2 reviews required, with at least 1 reviewer, 1 author)

Issue

  • JDK-8284956: Potential leak awtImageData/color_data when initializes X11GraphicsEnvironment

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 8317

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 20, 2022

👋 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 openjdk bot added the rfr label Apr 20, 2022
@openjdk
Copy link

openjdk bot commented Apr 20, 2022

@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.

@openjdk openjdk bot added the client label Apr 20, 2022
@mlbridge
Copy link

mlbridge bot commented Apr 20, 2022

Webrevs

prrace
prrace approved these changes Apr 27, 2022
@openjdk
Copy link

openjdk bot commented Apr 27, 2022

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

8284956: Potential leak awtImageData/color_data when initializes X11GraphicsEnvironment

Reviewed-by: prr, shade

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

  • 8daf08d: 8286628: Remove unused BufferNode::Allocator::flush_free_list
  • 04df8b7: 8286194: ExecutorShutdown test fails intermittently
  • 0be1f3e: 8286689: (se) Adjusting to select timeout after EINTR messed up after JDK-8286378
  • 6a1b098: 8278039: Code completion not woking after some statements such as "if" or "while"
  • 11fa03f: 8282160: JShell circularly-required classes cannot be defined
  • d5ae383: 8286117: Remove unnecessary indirection and unused code in UL
  • c3bade2: 8286623: Bundle zlib by default with JDK on macos aarch64
  • 617ef54: 8286647: JFR: Build failure when C1 or C2 is disabled after JDK-8282420
  • 369611e: 8286677: [BACKOUT] (fc) Tune FileChannel.transferFrom()
  • 4b8a66a: 8286424: GetVersionEx is deprecated
  • ... and 362 more: https://git.openjdk.java.net/jdk/compare/4594696f5462995ec58ca1d2c1bde7cc857c5caf...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.

@openjdk openjdk bot added the ready label Apr 27, 2022
@prrace
Copy link
Contributor

prrace commented Apr 27, 2022

/reviewers 2

@openjdk
Copy link

openjdk bot commented Apr 27, 2022

@prrace
The total number of required reviews for this PR (including the jcheck configuration and the last /reviewers command) is now set to 2 (with 1 of role reviewers, 1 of role authors).

@openjdk openjdk bot removed the ready label Apr 27, 2022
Copy link
Contributor

@shipilev shipilev left a comment

What about _ColorData::img_grays, _ColorData::awt_Colors, _ColorData::img_oda_*?

Copy link
Member

@gnu-andrew gnu-andrew left a comment

I see calloc calls also for img_grays and awt_Colors. Is there a reason these aren't freed too?

@zhengyu123
Copy link
Contributor Author

zhengyu123 commented Apr 28, 2022

@gnu-andrew @shipilev Nice catch, fixed.

Thanks

@zhengyu123
Copy link
Contributor Author

zhengyu123 commented Apr 28, 2022

What about _ColorData::img_grays, _ColorData::awt_Colors, _ColorData::img_oda_*?

_ColorData::img_oda_* are not malloc'd

 awt_data->color_data->img_oda_red   = &(std_img_oda_red[0][0]);
 awt_data->color_data->img_oda_green = &(std_img_oda_green[0][0]);
 awt_data->color_data->img_oda_blue  = &(std_img_oda_blue[0][0]);

and std_img_oda_* are defined as

JNIEXPORT extern sgn_ordered_dither_array std_img_oda_red;
JNIEXPORT extern sgn_ordered_dither_array std_img_oda_green;
JNIEXPORT extern sgn_ordered_dither_array std_img_oda_blue;

@openjdk openjdk bot added the ready label May 13, 2022
@zhengyu123
Copy link
Contributor Author

zhengyu123 commented May 13, 2022

Thanks for the reviews, @prrace @shipilev and @gnu-andrew

@zhengyu123
Copy link
Contributor Author

zhengyu123 commented May 13, 2022

/integrate

@openjdk
Copy link

openjdk bot commented May 13, 2022

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

  • 8daf08d: 8286628: Remove unused BufferNode::Allocator::flush_free_list
  • 04df8b7: 8286194: ExecutorShutdown test fails intermittently
  • 0be1f3e: 8286689: (se) Adjusting to select timeout after EINTR messed up after JDK-8286378
  • 6a1b098: 8278039: Code completion not woking after some statements such as "if" or "while"
  • 11fa03f: 8282160: JShell circularly-required classes cannot be defined
  • d5ae383: 8286117: Remove unnecessary indirection and unused code in UL
  • c3bade2: 8286623: Bundle zlib by default with JDK on macos aarch64
  • 617ef54: 8286647: JFR: Build failure when C1 or C2 is disabled after JDK-8282420
  • 369611e: 8286677: [BACKOUT] (fc) Tune FileChannel.transferFrom()
  • 4b8a66a: 8286424: GetVersionEx is deprecated
  • ... and 362 more: https://git.openjdk.java.net/jdk/compare/4594696f5462995ec58ca1d2c1bde7cc857c5caf...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label May 13, 2022
@openjdk openjdk bot closed this May 13, 2022
@openjdk openjdk bot removed ready rfr labels May 13, 2022
@openjdk
Copy link

openjdk bot commented May 13, 2022

@zhengyu123 Pushed as commit cbe7e7b.

💡 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
Labels
client integrated
4 participants