1.1 --- a/src/share/vm/memory/metaspace.cpp Fri Feb 01 13:17:04 2013 -0800
1.2 +++ b/src/share/vm/memory/metaspace.cpp Fri Feb 01 17:21:53 2013 -0800
1.3 @@ -1737,10 +1737,10 @@
1.4 *class_chunk_word_size = ClassSmallChunk;
1.5 break;
1.6 }
1.7 - assert(chunk_word_size != 0 && class_chunk_word_size != 0,
1.8 + assert(*chunk_word_size != 0 && *class_chunk_word_size != 0,
1.9 err_msg("Initial chunks sizes bad: data " SIZE_FORMAT
1.10 " class " SIZE_FORMAT,
1.11 - chunk_word_size, class_chunk_word_size));
1.12 + *chunk_word_size, *class_chunk_word_size));
1.13 }
1.14
1.15 size_t SpaceManager::sum_free_in_chunks_in_use() const {
1.16 @@ -2040,7 +2040,7 @@
1.17 align_size_up(humongous_chunks->word_size(),
1.18 HumongousChunkGranularity),
1.19 err_msg("Humongous chunk size is wrong: word size " SIZE_FORMAT
1.20 - " granularity " SIZE_FORMAT,
1.21 + " granularity %d",
1.22 humongous_chunks->word_size(), HumongousChunkGranularity));
1.23 Metachunk* next_humongous_chunks = humongous_chunks->next();
1.24 chunk_manager->humongous_dictionary()->return_chunk(humongous_chunks);
1.25 @@ -2264,7 +2264,8 @@
1.26 }
1.27 MutexLockerEx cl(lock(), Mutex::_no_safepoint_check_flag);
1.28 assert(allocation_total() == sum_used_in_chunks_in_use(),
1.29 - err_msg("allocation total is not consistent %d vs %d",
1.30 + err_msg("allocation total is not consistent " SIZE_FORMAT
1.31 + " vs " SIZE_FORMAT,
1.32 allocation_total(), sum_used_in_chunks_in_use()));
1.33 }
1.34
1.35 @@ -2578,7 +2579,8 @@
1.36 // argument passed in is at the top of the compressed space
1.37 void Metaspace::initialize_class_space(ReservedSpace rs) {
1.38 // The reserved space size may be bigger because of alignment, esp with UseLargePages
1.39 - assert(rs.size() >= ClassMetaspaceSize, err_msg("%d != %d", rs.size(), ClassMetaspaceSize));
1.40 + assert(rs.size() >= ClassMetaspaceSize,
1.41 + err_msg(SIZE_FORMAT " != " UINTX_FORMAT, rs.size(), ClassMetaspaceSize));
1.42 _class_space_list = new VirtualSpaceList(rs);
1.43 }
1.44
