提交 5ba50015 编写于 作者: J jwilhelm

8006432: Ratio flags should be unsigned

Summary: Flags changed to be of uintx type
Reviewed-by: johnc, tamao
上级 3684dc8f
/* /*
* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright 2008, 2009, 2010 Red Hat, Inc. * Copyright 2008, 2009, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
...@@ -51,7 +51,7 @@ define_pd_global(intx, Tier4BackEdgeThreshold, 100000); ...@@ -51,7 +51,7 @@ define_pd_global(intx, Tier4BackEdgeThreshold, 100000);
define_pd_global(intx, OnStackReplacePercentage, 933 ); define_pd_global(intx, OnStackReplacePercentage, 933 );
define_pd_global(intx, FreqInlineSize, 325 ); define_pd_global(intx, FreqInlineSize, 325 );
define_pd_global(intx, InlineSmallCode, 1000 ); define_pd_global(intx, InlineSmallCode, 1000 );
define_pd_global(intx, NewRatio, 12 ); define_pd_global(uintx, NewRatio, 12 );
define_pd_global(intx, NewSizeThreadIncrease, 4*K ); define_pd_global(intx, NewSizeThreadIncrease, 4*K );
define_pd_global(intx, InitialCodeCacheSize, 160*K); define_pd_global(intx, InitialCodeCacheSize, 160*K);
define_pd_global(intx, ReservedCodeCacheSize, 32*M ); define_pd_global(intx, ReservedCodeCacheSize, 32*M );
......
/* /*
* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -42,7 +42,7 @@ define_pd_global(intx, VMThreadStackSize, 512); ...@@ -42,7 +42,7 @@ define_pd_global(intx, VMThreadStackSize, 512);
#endif // AMD64 #endif // AMD64
define_pd_global(intx, CompilerThreadStackSize, 0); define_pd_global(intx, CompilerThreadStackSize, 0);
define_pd_global(intx, SurvivorRatio, 8); define_pd_global(uintx, SurvivorRatio, 8);
define_pd_global(uintx, JVMInvokeMethodSlack, 8192); define_pd_global(uintx, JVMInvokeMethodSlack, 8192);
......
...@@ -274,8 +274,8 @@ ConcurrentMarkSweepGeneration::ConcurrentMarkSweepGeneration( ...@@ -274,8 +274,8 @@ ConcurrentMarkSweepGeneration::ConcurrentMarkSweepGeneration(
// end of a collection, we let CMSTriggerRatio of the (purported) free // end of a collection, we let CMSTriggerRatio of the (purported) free
// space be allocated before initiating a new collection cycle. // space be allocated before initiating a new collection cycle.
// //
void ConcurrentMarkSweepGeneration::init_initiating_occupancy(intx io, intx tr) { void ConcurrentMarkSweepGeneration::init_initiating_occupancy(intx io, uintx tr) {
assert(io <= 100 && tr >= 0 && tr <= 100, "Check the arguments"); assert(io <= 100 && tr <= 100, "Check the arguments");
if (io >= 0) { if (io >= 0) {
_initiating_occupancy = (double)io / 100.0; _initiating_occupancy = (double)io / 100.0;
} else { } else {
......
/* /*
* Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -1093,7 +1093,7 @@ class ConcurrentMarkSweepGeneration: public CardGeneration { ...@@ -1093,7 +1093,7 @@ class ConcurrentMarkSweepGeneration: public CardGeneration {
// getter and initializer for _initiating_occupancy field. // getter and initializer for _initiating_occupancy field.
double initiating_occupancy() const { return _initiating_occupancy; } double initiating_occupancy() const { return _initiating_occupancy; }
void init_initiating_occupancy(intx io, intx tr); void init_initiating_occupancy(intx io, uintx tr);
public: public:
ConcurrentMarkSweepGeneration(ReservedSpace rs, size_t initial_byte_size, ConcurrentMarkSweepGeneration(ReservedSpace rs, size_t initial_byte_size,
......
...@@ -101,9 +101,6 @@ ...@@ -101,9 +101,6 @@
"to-space, we will allow regions whose survival rate is up to " \ "to-space, we will allow regions whose survival rate is up to " \
"S + (1 - S)*X, where X is this parameter (as a fraction.)") \ "S + (1 - S)*X, where X is this parameter (as a fraction.)") \
\ \
develop(intx, G1InitYoungSurvRatio, 50, \
"Expected Survival Rate for newly allocated bytes") \
\
develop(bool, G1SATBPrintStubs, false, \ develop(bool, G1SATBPrintStubs, false, \
"If true, print generated stubs for the SATB barrier") \ "If true, print generated stubs for the SATB barrier") \
\ \
......
...@@ -1239,7 +1239,7 @@ void Arguments::set_cms_and_parnew_gc_flags() { ...@@ -1239,7 +1239,7 @@ void Arguments::set_cms_and_parnew_gc_flags() {
// prefer minuscule survivor spaces so as not to waste // prefer minuscule survivor spaces so as not to waste
// space for (non-existent) survivors // space for (non-existent) survivors
if (FLAG_IS_DEFAULT(SurvivorRatio) && MaxTenuringThreshold == 0) { if (FLAG_IS_DEFAULT(SurvivorRatio) && MaxTenuringThreshold == 0) {
FLAG_SET_ERGO(intx, SurvivorRatio, MAX2((intx)1024, SurvivorRatio)); FLAG_SET_ERGO(uintx, SurvivorRatio, MAX2((uintx)1024, SurvivorRatio));
} }
// If OldPLABSize is set and CMSParPromoteBlocksToClaim is not, // If OldPLABSize is set and CMSParPromoteBlocksToClaim is not,
// set CMSParPromoteBlocksToClaim equal to OldPLABSize. // set CMSParPromoteBlocksToClaim equal to OldPLABSize.
...@@ -1881,7 +1881,7 @@ bool Arguments::check_vm_args_consistency() { ...@@ -1881,7 +1881,7 @@ bool Arguments::check_vm_args_consistency() {
if (UseParallelOldGC && ParallelOldGCSplitALot) { if (UseParallelOldGC && ParallelOldGCSplitALot) {
// Settings to encourage splitting. // Settings to encourage splitting.
if (!FLAG_IS_CMDLINE(NewRatio)) { if (!FLAG_IS_CMDLINE(NewRatio)) {
FLAG_SET_CMDLINE(intx, NewRatio, 2); FLAG_SET_CMDLINE(uintx, NewRatio, 2);
} }
if (!FLAG_IS_CMDLINE(ScavengeBeforeFullGC)) { if (!FLAG_IS_CMDLINE(ScavengeBeforeFullGC)) {
FLAG_SET_CMDLINE(bool, ScavengeBeforeFullGC, false); FLAG_SET_CMDLINE(bool, ScavengeBeforeFullGC, false);
......
...@@ -1802,7 +1802,7 @@ class CommandLineFlags { ...@@ -1802,7 +1802,7 @@ class CommandLineFlags {
product(bool, ParallelRefProcBalancingEnabled, true, \ product(bool, ParallelRefProcBalancingEnabled, true, \
"Enable balancing of reference processing queues") \ "Enable balancing of reference processing queues") \
\ \
product(intx, CMSTriggerRatio, 80, \ product(uintx, CMSTriggerRatio, 80, \
"Percentage of MinHeapFreeRatio in CMS generation that is " \ "Percentage of MinHeapFreeRatio in CMS generation that is " \
"allocated before a CMS collection cycle commences") \ "allocated before a CMS collection cycle commences") \
\ \
...@@ -2977,10 +2977,10 @@ class CommandLineFlags { ...@@ -2977,10 +2977,10 @@ class CommandLineFlags {
product(uintx, TLABWasteIncrement, 4, \ product(uintx, TLABWasteIncrement, 4, \
"Increment allowed waste at slow allocation") \ "Increment allowed waste at slow allocation") \
\ \
product(intx, SurvivorRatio, 8, \ product(uintx, SurvivorRatio, 8, \
"Ratio of eden/survivor space size") \ "Ratio of eden/survivor space size") \
\ \
product(intx, NewRatio, 2, \ product(uintx, NewRatio, 2, \
"Ratio of new/old generation sizes") \ "Ratio of new/old generation sizes") \
\ \
product_pd(uintx, NewSizeThreadIncrease, \ product_pd(uintx, NewSizeThreadIncrease, \
...@@ -3031,7 +3031,7 @@ class CommandLineFlags { ...@@ -3031,7 +3031,7 @@ class CommandLineFlags {
product(uintx, InitialTenuringThreshold, 7, \ product(uintx, InitialTenuringThreshold, 7, \
"Initial value for tenuring threshold") \ "Initial value for tenuring threshold") \
\ \
product(intx, TargetSurvivorRatio, 50, \ product(uintx, TargetSurvivorRatio, 50, \
"Desired percentage of survivor space used after scavenge") \ "Desired percentage of survivor space used after scavenge") \
\ \
product(uintx, MarkSweepDeadRatio, 5, \ product(uintx, MarkSweepDeadRatio, 5, \
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册