1.1 --- a/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Thu May 15 18:23:26 2014 -0400
1.2 +++ b/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Thu May 22 15:52:41 2014 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -63,6 +63,8 @@
1.11 #include "services/memoryService.hpp"
1.12 #include "services/runtimeService.hpp"
1.13
1.14 +PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
1.15 +
1.16 // statics
1.17 CMSCollector* ConcurrentMarkSweepGeneration::_collector = NULL;
1.18 bool CMSCollector::_full_gc_requested = false;
1.19 @@ -1181,7 +1183,7 @@
1.20 gclog_or_tty->print(" icms alloc limits: "
1.21 PTR_FORMAT "," PTR_FORMAT
1.22 " (" SIZE_FORMAT "%%," SIZE_FORMAT "%%) ",
1.23 - _icms_start_limit, _icms_stop_limit,
1.24 + p2i(_icms_start_limit), p2i(_icms_stop_limit),
1.25 percent_of_space(eden, _icms_start_limit),
1.26 percent_of_space(eden, _icms_stop_limit));
1.27 if (Verbose) {
1.28 @@ -1209,7 +1211,7 @@
1.29 gclog_or_tty->print_cr(" start limit top=" PTR_FORMAT
1.30 ", new limit=" PTR_FORMAT
1.31 " (" SIZE_FORMAT "%%)",
1.32 - top, _icms_stop_limit,
1.33 + p2i(top), p2i(_icms_stop_limit),
1.34 percent_of_space(space, _icms_stop_limit));
1.35 }
1.36 ConcurrentMarkSweepThread::start_icms();
1.37 @@ -1226,7 +1228,7 @@
1.38 gclog_or_tty->print_cr(" +stop limit top=" PTR_FORMAT
1.39 ", new limit=" PTR_FORMAT
1.40 " (" SIZE_FORMAT "%%)",
1.41 - top, space->end(),
1.42 + p2i(top), p2i(space->end()),
1.43 percent_of_space(space, space->end()));
1.44 }
1.45 ConcurrentMarkSweepThread::stop_icms();
1.46 @@ -1501,7 +1503,7 @@
1.47 if (PrintCMSInitiationStatistics && stats().valid()) {
1.48 gclog_or_tty->print("CMSCollector shouldConcurrentCollect: ");
1.49 gclog_or_tty->stamp();
1.50 - gclog_or_tty->print_cr("");
1.51 + gclog_or_tty->cr();
1.52 stats().print_on(gclog_or_tty);
1.53 gclog_or_tty->print_cr("time_until_cms_gen_full %3.7f",
1.54 stats().time_until_cms_gen_full());
1.55 @@ -3577,7 +3579,7 @@
1.56 _collector->cmsGen()->short_name(),
1.57 _phase, _collector->timerValue(), _wallclock.seconds());
1.58 if (_print_cr) {
1.59 - gclog_or_tty->print_cr("");
1.60 + gclog_or_tty->cr();
1.61 }
1.62 if (PrintCMSStatistics != 0) {
1.63 gclog_or_tty->print_cr(" (CMS-concurrent-%s yielded %d times)", _phase,
