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

Use dynamic heap size for installers #4336

Merged

Conversation

ssoloff
Copy link
Member

@ssoloff ssoloff commented Nov 9, 2018

Overview

Fixes #4255 on master. This PR is simply a cherry-pick of #4328.

Changes

See #4328.

Manual Testing Performed

Locally built the Windows x86 installer and ran it. Verified the resulting installation could be started.

We cannot use a fixed heap size of 2 GiB because it will fail to be
allocated on 32-bit OSes.  Instead, we employ the following algorithm:

* Initially use half of available memory
* If a 32-bit JVM, use no more than 1 GiB
* If a 64-bit JVM, use no more than 2 GiB
@codecov-io
Copy link

Codecov Report

Merging #4336 into master will increase coverage by <.01%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##             master    #4336      +/-   ##
============================================
+ Coverage     22.61%   22.62%   +<.01%     
- Complexity     6099     6101       +2     
============================================
  Files           870      870              
  Lines         71159    71159              
  Branches      11362    11362              
============================================
+ Hits          16096    16099       +3     
+ Misses        53023    53022       -1     
+ Partials       2040     2038       -2
Impacted Files Coverage Δ Complexity Δ
.../strategy/triplea/odds/calculator/DummyPlayer.java 35.95% <0%> (+1.12%) 10% <0%> (+1%) ⬆️
...rategy/triplea/attachments/UnitTypeComparator.java 53.84% <0%> (+7.69%) 13% <0%> (+1%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 187ff30...c434f96. Read the comment docs.

@ron-murhammer ron-murhammer self-requested a review November 9, 2018 06:07
@ron-murhammer ron-murhammer merged commit ce18a00 into triplea-game:master Nov 9, 2018
@ssoloff ssoloff deleted the issue-4255-fix-on-master branch November 9, 2018 16:15
@ron-murhammer ron-murhammer mentioned this pull request Nov 11, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Windows 32 bit installer doesn't create a usuable installation
3 participants