mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-26 06:14:49 +02:00
7112912: Message "Error occurred during initialization of VM" on boxes with lots of RAM
Ergonomics now also takes available virtual memory into account when deciding for a heap size. The helper method to determine the maximum allocatable memory block now uses the appropriate OS specific calls to retrieve available virtual memory for the java process. In 32 bit environments this method now also searches for the maximum actually reservable amount of memory. Merge previously separate implementations for Linux/BSD/Solaris into a single method. Reviewed-by: jmasa, tamao
This commit is contained in:
parent
89120e7827
commit
bb5bd507d7
9 changed files with 92 additions and 57 deletions
|
@ -194,20 +194,6 @@ julong os::physical_memory() {
|
|||
return Linux::physical_memory();
|
||||
}
|
||||
|
||||
julong os::allocatable_physical_memory(julong size) {
|
||||
#ifdef _LP64
|
||||
return size;
|
||||
#else
|
||||
julong result = MIN2(size, (julong)3800*M);
|
||||
if (!is_allocatable(result)) {
|
||||
// See comments under solaris for alignment considerations
|
||||
julong reasonable_size = (julong)2*G - 2 * os::vm_page_size();
|
||||
result = MIN2(size, reasonable_size);
|
||||
}
|
||||
return result;
|
||||
#endif // _LP64
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// environment support
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue