Mercurial > hg > graal-jvmci-8
comparison src/share/vm/runtime/arguments.cpp @ 7182:c24f778e9401
Merge
author | johnc |
---|---|
date | Thu, 29 Nov 2012 11:23:15 -0800 |
parents | 53715fb1597d |
children | 291ffc492eb6 442f942757c0 7d42f3b08300 |
comparison
equal
deleted
inserted
replaced
7176:59c790074993 | 7182:c24f778e9401 |
---|---|
1482 // interpretation and are not ergonomically set. | 1482 // interpretation and are not ergonomically set. |
1483 if (FLAG_IS_DEFAULT(MarkSweepDeadRatio)) { | 1483 if (FLAG_IS_DEFAULT(MarkSweepDeadRatio)) { |
1484 FLAG_SET_DEFAULT(MarkSweepDeadRatio, 1); | 1484 FLAG_SET_DEFAULT(MarkSweepDeadRatio, 1); |
1485 } | 1485 } |
1486 } | 1486 } |
1487 } | |
1488 if (UseNUMA) { | |
1489 if (FLAG_IS_DEFAULT(MinHeapDeltaBytes)) { | |
1490 FLAG_SET_DEFAULT(MinHeapDeltaBytes, 64*M); | |
1491 } | |
1492 // For those collectors or operating systems (eg, Windows) that do | |
1493 // not support full UseNUMA, we will map to UseNUMAInterleaving for now | |
1494 UseNUMAInterleaving = true; | |
1495 } | 1487 } |
1496 } | 1488 } |
1497 | 1489 |
1498 void Arguments::set_g1_gc_flags() { | 1490 void Arguments::set_g1_gc_flags() { |
1499 assert(UseG1GC, "Error"); | 1491 assert(UseG1GC, "Error"); |
3330 } | 3322 } |
3331 | 3323 |
3332 return JNI_OK; | 3324 return JNI_OK; |
3333 } | 3325 } |
3334 | 3326 |
3327 jint Arguments::adjust_after_os() { | |
3328 #if INCLUDE_ALTERNATE_GCS | |
3329 if (UseParallelGC || UseParallelOldGC) { | |
3330 if (UseNUMA) { | |
3331 if (FLAG_IS_DEFAULT(MinHeapDeltaBytes)) { | |
3332 FLAG_SET_DEFAULT(MinHeapDeltaBytes, 64*M); | |
3333 } | |
3334 // For those collectors or operating systems (eg, Windows) that do | |
3335 // not support full UseNUMA, we will map to UseNUMAInterleaving for now | |
3336 UseNUMAInterleaving = true; | |
3337 } | |
3338 } | |
3339 #endif | |
3340 return JNI_OK; | |
3341 } | |
3342 | |
3335 int Arguments::PropertyList_count(SystemProperty* pl) { | 3343 int Arguments::PropertyList_count(SystemProperty* pl) { |
3336 int count = 0; | 3344 int count = 0; |
3337 while(pl != NULL) { | 3345 while(pl != NULL) { |
3338 count++; | 3346 count++; |
3339 pl = pl->next(); | 3347 pl = pl->next(); |