Merge

Fri, 27 Aug 2010 10:44:06 -0700

author
tonyp
date
Fri, 27 Aug 2010 10:44:06 -0700
changeset 2113
af586a7893cf
parent 2111
21c29458b334
parent 2112
1c63587d925b
child 2114
75107ee8712f

Merge

     1.1 --- a/src/share/vm/services/management.cpp	Fri Aug 27 16:57:04 2010 +0100
     1.2 +++ b/src/share/vm/services/management.cpp	Fri Aug 27 10:44:06 2010 -0700
     1.3 @@ -785,10 +785,11 @@
     1.4      }
     1.5    }
     1.6  
     1.7 -  // In our current implementation, all pools should have
     1.8 -  // defined init and max size
     1.9 -  assert(!has_undefined_init_size, "Undefined init size");
    1.10 -  assert(!has_undefined_max_size, "Undefined max size");
    1.11 +  // In our current implementation, we make sure that all non-heap
    1.12 +  // pools have defined init and max sizes. Heap pools do not matter,
    1.13 +  // as we never use total_init and total_max for them.
    1.14 +  assert(heap || !has_undefined_init_size, "Undefined init size");
    1.15 +  assert(heap || !has_undefined_max_size,  "Undefined max size");
    1.16  
    1.17    MemoryUsage usage((heap ? InitialHeapSize : total_init),
    1.18                      total_used,

mercurial