8026849: Fix typos in the GC code, part 2
Summary: Fixed typos in assert messages, flag descriptions and verbose messages
Reviewed-by: stefank, tschatzl
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp Mon Feb 10 12:58:09 2014 +0100
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp Tue Dec 10 15:11:02 2013 +0100
@@ -700,7 +700,7 @@
double latest_cms_sum_concurrent_phases_time_secs =
concurrent_collection_time();
if (PrintAdaptiveSizePolicy && Verbose) {
- gclog_or_tty->print_cr("\nCMSAdaptiveSizePolicy::ms_collecton_end "
+ gclog_or_tty->print_cr("\nCMSAdaptiveSizePolicy::ms_collection_end "
"STW_in_foreground_in_seconds %f "
"_latest_cms_initial_mark_start_to_end_time_secs %f "
"_latest_cms_remark_start_to_end_time_secs %f "
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Mon Feb 10 12:58:09 2014 +0100
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Tue Dec 10 15:11:02 2013 +0100
@@ -958,7 +958,7 @@
desired_free_percentage);
gclog_or_tty->print_cr(" Maximum free fraction %f",
maximum_free_percentage);
- gclog_or_tty->print_cr(" Capactiy "SIZE_FORMAT, capacity()/1000);
+ gclog_or_tty->print_cr(" Capacity "SIZE_FORMAT, capacity()/1000);
gclog_or_tty->print_cr(" Desired capacity "SIZE_FORMAT,
desired_capacity/1000);
int prev_level = level() - 1;
@@ -3313,7 +3313,7 @@
}
// Not unloading classes this cycle
- assert(!should_unload_classes(), "Inconsitency!");
+ assert(!should_unload_classes(), "Inconsistency!");
remove_root_scanning_option(SharedHeap::SO_SystemClasses);
add_root_scanning_option(SharedHeap::SO_AllClasses);
@@ -7243,7 +7243,7 @@
HeapWord* addr = (HeapWord*)p;
DEBUG_ONLY(_collector->verify_work_stacks_empty();)
assert(!_span.contains(addr), "we are scanning the survivor spaces");
- assert(p->klass_or_null() != NULL, "object should be initializd");
+ assert(p->klass_or_null() != NULL, "object should be initialized");
// an initialized object; ignore mark word in verification below
// since we are running concurrent with mutators
assert(p->is_oop(true), "should be an oop");
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp Mon Feb 10 12:58:09 2014 +0100
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp Tue Dec 10 15:11:02 2013 +0100
@@ -254,7 +254,7 @@
// No need to do a young gc, we'll just nudge the CMS thread
// in the doit() method above, to be executed soon.
assert(_gc_count_before < gch->total_collections(),
- "total_collections() should be monotnically increasing");
+ "total_collections() should be monotonically increasing");
return false; // no need for foreground young gc
}
}
--- a/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp Mon Feb 10 12:58:09 2014 +0100
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp Tue Dec 10 15:11:02 2013 +0100
@@ -183,7 +183,7 @@
"When true, record recent calls to rem set operations.") \
\
develop(intx, G1MaxVerifyFailures, -1, \
- "The maximum number of verification failrues to print. " \
+ "The maximum number of verification failures to print. " \
"-1 means print all.") \
\
develop(bool, G1ScrubRemSets, true, \
--- a/hotspot/src/share/vm/gc_implementation/g1/satbQueue.cpp Mon Feb 10 12:58:09 2014 +0100
+++ b/hotspot/src/share/vm/gc_implementation/g1/satbQueue.cpp Tue Dec 10 15:11:02 2013 +0100
@@ -91,7 +91,7 @@
assert(new_index > 0, "we should not have already filled up the buffer");
new_index -= oopSize;
assert(new_index >= i,
- "new_index should never be below i, as we alwaysr compact 'up'");
+ "new_index should never be below i, as we always compact 'up'");
oop* new_p = (oop*) &buf[byte_index_to_index((int) new_index)];
assert(new_p >= p, "the destination location should never be below "
"the source as we always compact 'up'");
--- a/hotspot/src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp Mon Feb 10 12:58:09 2014 +0100
+++ b/hotspot/src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp Tue Dec 10 15:11:02 2013 +0100
@@ -250,7 +250,7 @@
// right neighbor (up to the end of the first object).
if (last_card_of_cur_chunk < last_card_of_first_obj) {
tty->print_cr(" LNC: BEWARE!!! first obj straddles past right end of chunk:\n"
- " might be efficient to get value from right neighbour?");
+ " might be efficient to get value from right neighbor?");
}
})
} else {
--- a/hotspot/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp Mon Feb 10 12:58:09 2014 +0100
+++ b/hotspot/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp Tue Dec 10 15:11:02 2013 +0100
@@ -168,7 +168,7 @@
if (TraceDynamicGCThreads) {
gclog_or_tty->print_cr("GCTaskManager::calc_default_active_workers() : "
- "active_workers(): %d new_acitve_workers: %d "
+ "active_workers(): %d new_active_workers: %d "
"prev_active_workers: %d\n"
" active_workers_by_JT: %d active_workers_by_heap_size: %d",
active_workers, new_active_workers, prev_active_workers,
--- a/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp Mon Feb 10 12:58:09 2014 +0100
+++ b/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp Tue Dec 10 15:11:02 2013 +0100
@@ -559,7 +559,7 @@
bool clear_space,
bool mangle_space,
bool setup_pages) {
- assert(clear_space, "Reallocation will destory data!");
+ assert(clear_space, "Reallocation will destroy data!");
assert(lgrp_spaces()->length() > 0, "There should be at least one space");
MemRegion old_region = region(), new_region;
--- a/hotspot/src/share/vm/memory/binaryTreeDictionary.cpp Mon Feb 10 12:58:09 2014 +0100
+++ b/hotspot/src/share/vm/memory/binaryTreeDictionary.cpp Tue Dec 10 15:11:02 2013 +0100
@@ -1352,7 +1352,7 @@
template <class Chunk_t, template <class> class FreeList_t>
void BinaryTreeDictionary<Chunk_t, FreeList_t>::verify_tree() const {
guarantee(root() == NULL || total_free_blocks() == 0 ||
- total_size() != 0, "_total_size should't be 0?");
+ total_size() != 0, "_total_size shouldn't be 0?");
guarantee(root() == NULL || root()->parent() == NULL, "_root shouldn't have parent");
verify_tree_helper(root());
}
--- a/hotspot/src/share/vm/memory/cardTableModRefBS.cpp Mon Feb 10 12:58:09 2014 +0100
+++ b/hotspot/src/share/vm/memory/cardTableModRefBS.cpp Tue Dec 10 15:11:02 2013 +0100
@@ -54,8 +54,8 @@
size_t CardTableModRefBS::compute_byte_map_size()
{
assert(_guard_index == cards_required(_whole_heap.word_size()) - 1,
- "unitialized, check declaration order");
- assert(_page_size != 0, "unitialized, check declaration order");
+ "uninitialized, check declaration order");
+ assert(_page_size != 0, "uninitialized, check declaration order");
const size_t granularity = os::vm_allocation_granularity();
return align_size_up(_guard_index + 1, MAX2(_page_size, granularity));
}
--- a/hotspot/src/share/vm/memory/metaspace.cpp Mon Feb 10 12:58:09 2014 +0100
+++ b/hotspot/src/share/vm/memory/metaspace.cpp Tue Dec 10 15:11:02 2013 +0100
@@ -746,7 +746,7 @@
assert_lock_strong(SpaceManager::expand_lock());
_container_count++;
assert(_container_count == container_count_slow(),
- err_msg("Inconsistency in countainer_count _container_count " SIZE_FORMAT
+ err_msg("Inconsistency in container_count _container_count " SIZE_FORMAT
" container_count_slow() " SIZE_FORMAT,
_container_count, container_count_slow()));
}
@@ -759,7 +759,7 @@
#ifdef ASSERT
void VirtualSpaceNode::verify_container_count() {
assert(_container_count == container_count_slow(),
- err_msg("Inconsistency in countainer_count _container_count " SIZE_FORMAT
+ err_msg("Inconsistency in container_count _container_count " SIZE_FORMAT
" container_count_slow() " SIZE_FORMAT, _container_count, container_count_slow()));
}
#endif
--- a/hotspot/src/share/vm/memory/referenceProcessor.cpp Mon Feb 10 12:58:09 2014 +0100
+++ b/hotspot/src/share/vm/memory/referenceProcessor.cpp Tue Dec 10 15:11:02 2013 +0100
@@ -62,7 +62,7 @@
}
guarantee(RefDiscoveryPolicy == ReferenceBasedDiscovery ||
RefDiscoveryPolicy == ReferentBasedDiscovery,
- "Unrecongnized RefDiscoveryPolicy");
+ "Unrecognized RefDiscoveryPolicy");
_pending_list_uses_discovered_field = JDK_Version::current().pending_list_uses_discovered_field();
}
--- a/hotspot/src/share/vm/runtime/globals.hpp Mon Feb 10 12:58:09 2014 +0100
+++ b/hotspot/src/share/vm/runtime/globals.hpp Tue Dec 10 15:11:02 2013 +0100
@@ -565,7 +565,7 @@
"Force NUMA optimizations on single-node/UMA systems") \
\
product(uintx, NUMAChunkResizeWeight, 20, \
- "Percentage (0-100) used to weigh the current sample when " \
+ "Percentage (0-100) used to weight the current sample when " \
"computing exponentially decaying average for " \
"AdaptiveNUMAChunkSizing") \
\
@@ -1502,7 +1502,7 @@
"allocation") \
\
product(uintx, PLABWeight, 75, \
- "Percentage (0-100) used to weigh the current sample when " \
+ "Percentage (0-100) used to weight the current sample when " \
"computing exponentially decaying average for ResizePLAB") \
\
product(bool, ResizePLAB, true, \
@@ -1611,11 +1611,11 @@
"is shifted to the right within the period between young GCs") \
\
product(uintx, CMSExpAvgFactor, 50, \
- "Percentage (0-100) used to weigh the current sample when " \
+ "Percentage (0-100) used to weight the current sample when " \
"computing exponential averages for CMS statistics") \
\
product(uintx, CMS_FLSWeight, 75, \
- "Percentage (0-100) used to weigh the current sample when " \
+ "Percentage (0-100) used to weight the current sample when " \
"computing exponentially decaying averages for CMS FLS " \
"statistics") \
\
@@ -1727,19 +1727,15 @@
"to simulate overflow; a smaller number increases frequency") \
\
product(uintx, CMSMaxAbortablePrecleanLoops, 0, \
- "(Temporary, subject to experimentation) " \
"Maximum number of abortable preclean iterations, if > 0") \
\
product(intx, CMSMaxAbortablePrecleanTime, 5000, \
- "(Temporary, subject to experimentation) " \
"Maximum time in abortable preclean (in milliseconds)") \
\
product(uintx, CMSAbortablePrecleanMinWorkPerIteration, 100, \
- "(Temporary, subject to experimentation) " \
"Nominal minimum work per abortable preclean iteration") \
\
manageable(intx, CMSAbortablePrecleanWaitMillis, 100, \
- "(Temporary, subject to experimentation) " \
"Time that we sleep between iterations when not given " \
"enough work per iteration") \
\
@@ -1955,13 +1951,13 @@
"(other young collectors)") \
\
develop(uintx, PromotionFailureALotInterval, 5, \
- "Total collections between promotion failures alot") \
+ "Total collections between promotion failures a lot") \
\
experimental(uintx, WorkStealingSleepMillis, 1, \
"Sleep time when sleep is used for yields") \
\
experimental(uintx, WorkStealingYieldsBeforeSleep, 5000, \
- "Number of yields before a sleep is done during workstealing") \
+ "Number of yields before a sleep is done during work stealing") \
\
experimental(uintx, WorkStealingHardSpins, 4096, \
"Number of iterations in a spin loop between checks on " \
@@ -2039,7 +2035,7 @@
"size; deprecated: to be renamed to MaxRAMFraction") \
\
product(uintx, MinRAMFraction, 2, \
- "Minimum fraction (1/n) of real memory used for maxmimum heap " \
+ "Minimum fraction (1/n) of real memory used for maximum heap " \
"size on systems with small physical memory size") \
\
product(uintx, InitialRAMFraction, 64, \
--- a/hotspot/src/share/vm/runtime/javaCalls.cpp Mon Feb 10 12:58:09 2014 +0100
+++ b/hotspot/src/share/vm/runtime/javaCalls.cpp Tue Dec 10 15:11:02 2013 +0100
@@ -337,7 +337,7 @@
// A klass might not be initialized since JavaCall's might be used during the executing of
// the <clinit>. For example, a Thread.start might start executing on an object that is
// not fully initialized! (bad Java programming style)
- assert(holder->is_linked(), "rewritting must have taken place");
+ assert(holder->is_linked(), "rewriting must have taken place");
}
#endif
--- a/hotspot/src/share/vm/runtime/os.cpp Mon Feb 10 12:58:09 2014 +0100
+++ b/hotspot/src/share/vm/runtime/os.cpp Tue Dec 10 15:11:02 2013 +0100
@@ -1197,7 +1197,7 @@
char fileSep,
char pathSep) {
assert((fileSep == '/' && pathSep == ':') ||
- (fileSep == '\\' && pathSep == ';'), "unexpected seperator chars");
+ (fileSep == '\\' && pathSep == ';'), "unexpected separator chars");
// Scan the format string to determine the length of the actual
// boot classpath, and handle platform dependencies as well.
--- a/hotspot/src/share/vm/runtime/virtualspace.cpp Mon Feb 10 12:58:09 2014 +0100
+++ b/hotspot/src/share/vm/runtime/virtualspace.cpp Tue Dec 10 15:11:02 2013 +0100
@@ -215,9 +215,9 @@
noaccess_prefix == _alignment, "noaccess prefix wrong");
assert(markOopDesc::encode_pointer_as_mark(_base)->decode_pointer() == _base,
- "area must be distinguisable from marks for mark-sweep");
+ "area must be distinguishable from marks for mark-sweep");
assert(markOopDesc::encode_pointer_as_mark(&_base[size])->decode_pointer() == &_base[size],
- "area must be distinguisable from marks for mark-sweep");
+ "area must be distinguishable from marks for mark-sweep");
}