diff src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp @ 14314:2c95095271e9

Merge
author ehelin
date Thu, 30 Jan 2014 14:01:45 +0100
parents 1e1c8d358b52
children 4ca6dc0799b6
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp	Wed Jan 29 19:54:44 2014 -0500
+++ b/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp	Thu Jan 30 14:01:45 2014 +0100
@@ -89,6 +89,10 @@
 // scavenge; it clears the sensor accumulators.
 void PLABStats::adjust_desired_plab_sz(uint no_of_gc_workers) {
   assert(ResizePLAB, "Not set");
+
+  assert(is_object_aligned(max_size()) && min_size() <= max_size(),
+         "PLAB clipping computation may be incorrect");
+
   if (_allocated == 0) {
     assert(_unused == 0,
            err_msg("Inconsistency in PLAB stats: "
@@ -152,7 +156,7 @@
 
 // The buffer comes with its own BOT, with a shared (obviously) underlying
 // BlockOffsetSharedArray. We manipulate this BOT in the normal way
-// as we would for any contiguous space. However, on accasion we
+// as we would for any contiguous space. However, on occasion we
 // need to do some buffer surgery at the extremities before we
 // start using the body of the buffer for allocations. Such surgery
 // (as explained elsewhere) is to prevent allocation on a card that