Mercurial > hg > truffle

comparison src/share/vm/runtime/arguments.cpp @ 7212:291ffc492eb6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Fri, 14 Dec 2012 14:35:13 +0100
parents 5d0bb7d52783 53715fb1597d
children 2912b72d840a
comparison
equal deleted inserted replaced
7163:2ed8d74e5984 7212:291ffc492eb6
1500 // interpretation and are not ergonomically set. 1500 // interpretation and are not ergonomically set.
1501 if (FLAG_IS_DEFAULT(MarkSweepDeadRatio)) { 1501 if (FLAG_IS_DEFAULT(MarkSweepDeadRatio)) {
1502 FLAG_SET_DEFAULT(MarkSweepDeadRatio, 1); 1502 FLAG_SET_DEFAULT(MarkSweepDeadRatio, 1);
1503 } 1503 }
1504 } 1504 }
1505 }
1506 if (UseNUMA) {
1507 if (FLAG_IS_DEFAULT(MinHeapDeltaBytes)) {
1508 FLAG_SET_DEFAULT(MinHeapDeltaBytes, 64*M);
1509 }
1510 // For those collectors or operating systems (eg, Windows) that do
1511 // not support full UseNUMA, we will map to UseNUMAInterleaving for now
1512 UseNUMAInterleaving = true;
1513 } 1505 }
1514 } 1506 }
1515 1507
1516 void Arguments::set_g1_gc_flags() { 1508 void Arguments::set_g1_gc_flags() {
1517 assert(UseG1GC, "Error"); 1509 assert(UseG1GC, "Error");
3512 } 3504 }
3513 3505
3514 return JNI_OK; 3506 return JNI_OK;
3515 } 3507 }
3516 3508
3509 jint Arguments::adjust_after_os() {
3510 #if INCLUDE_ALTERNATE_GCS
3511 if (UseParallelGC || UseParallelOldGC) {
3512 if (UseNUMA) {
3513 if (FLAG_IS_DEFAULT(MinHeapDeltaBytes)) {
3514 FLAG_SET_DEFAULT(MinHeapDeltaBytes, 64*M);
3515 }
3516 // For those collectors or operating systems (eg, Windows) that do
3517 // not support full UseNUMA, we will map to UseNUMAInterleaving for now
3518 UseNUMAInterleaving = true;
3519 }
3520 }
3521 #endif
3522 return JNI_OK;
3523 }
3524
3517 int Arguments::PropertyList_count(SystemProperty* pl) { 3525 int Arguments::PropertyList_count(SystemProperty* pl) {
3518 int count = 0; 3526 int count = 0;
3519 while(pl != NULL) { 3527 while(pl != NULL) {
3520 count++; 3528 count++;
3521 pl = pl->next(); 3529 pl = pl->next();