1.1 --- a/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.cpp Thu May 15 18:23:26 2014 -0400
1.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.cpp Thu May 22 15:52:41 2014 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2003, 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 @@ -112,11 +112,11 @@
1.11 size_t result = policy->eden_increment_aligned_down(max_contraction);
1.12 size_t result_aligned = align_size_down(result, gen_alignment);
1.13 if (PrintAdaptiveSizePolicy && Verbose) {
1.14 - gclog_or_tty->print_cr("ASPSYoungGen::available_for_contraction: %d K",
1.15 + gclog_or_tty->print_cr("ASPSYoungGen::available_for_contraction: " SIZE_FORMAT " K",
1.16 result_aligned/K);
1.17 - gclog_or_tty->print_cr(" max_contraction %d K", max_contraction/K);
1.18 - gclog_or_tty->print_cr(" eden_avail %d K", eden_avail/K);
1.19 - gclog_or_tty->print_cr(" gen_avail %d K", gen_avail/K);
1.20 + gclog_or_tty->print_cr(" max_contraction " SIZE_FORMAT " K", max_contraction/K);
1.21 + gclog_or_tty->print_cr(" eden_avail " SIZE_FORMAT " K", eden_avail/K);
1.22 + gclog_or_tty->print_cr(" gen_avail " SIZE_FORMAT " K", gen_avail/K);
1.23 }
1.24 return result_aligned;
1.25 }
1.26 @@ -252,22 +252,22 @@
1.27 requested_eden_size, requested_survivor_size);
1.28 gclog_or_tty->print_cr(" eden: [" PTR_FORMAT ".." PTR_FORMAT ") "
1.29 SIZE_FORMAT,
1.30 - eden_space()->bottom(),
1.31 - eden_space()->end(),
1.32 + p2i(eden_space()->bottom()),
1.33 + p2i(eden_space()->end()),
1.34 pointer_delta(eden_space()->end(),
1.35 eden_space()->bottom(),
1.36 sizeof(char)));
1.37 gclog_or_tty->print_cr(" from: [" PTR_FORMAT ".." PTR_FORMAT ") "
1.38 SIZE_FORMAT,
1.39 - from_space()->bottom(),
1.40 - from_space()->end(),
1.41 + p2i(from_space()->bottom()),
1.42 + p2i(from_space()->end()),
1.43 pointer_delta(from_space()->end(),
1.44 from_space()->bottom(),
1.45 sizeof(char)));
1.46 gclog_or_tty->print_cr(" to: [" PTR_FORMAT ".." PTR_FORMAT ") "
1.47 SIZE_FORMAT,
1.48 - to_space()->bottom(),
1.49 - to_space()->end(),
1.50 + p2i(to_space()->bottom()),
1.51 + p2i(to_space()->end()),
1.52 pointer_delta( to_space()->end(),
1.53 to_space()->bottom(),
1.54 sizeof(char)));
1.55 @@ -373,18 +373,18 @@
1.56 if (PrintAdaptiveSizePolicy && Verbose) {
1.57 gclog_or_tty->print_cr(" [eden_start .. eden_end): "
1.58 "[" PTR_FORMAT " .. " PTR_FORMAT ") " SIZE_FORMAT,
1.59 - eden_start,
1.60 - eden_end,
1.61 + p2i(eden_start),
1.62 + p2i(eden_end),
1.63 pointer_delta(eden_end, eden_start, sizeof(char)));
1.64 gclog_or_tty->print_cr(" [from_start .. from_end): "
1.65 "[" PTR_FORMAT " .. " PTR_FORMAT ") " SIZE_FORMAT,
1.66 - from_start,
1.67 - from_end,
1.68 + p2i(from_start),
1.69 + p2i(from_end),
1.70 pointer_delta(from_end, from_start, sizeof(char)));
1.71 gclog_or_tty->print_cr(" [ to_start .. to_end): "
1.72 "[" PTR_FORMAT " .. " PTR_FORMAT ") " SIZE_FORMAT,
1.73 - to_start,
1.74 - to_end,
1.75 + p2i(to_start),
1.76 + p2i(to_end),
1.77 pointer_delta( to_end, to_start, sizeof(char)));
1.78 }
1.79 } else {
1.80 @@ -427,18 +427,18 @@
1.81 if (PrintAdaptiveSizePolicy && Verbose) {
1.82 gclog_or_tty->print_cr(" [eden_start .. eden_end): "
1.83 "[" PTR_FORMAT " .. " PTR_FORMAT ") " SIZE_FORMAT,
1.84 - eden_start,
1.85 - eden_end,
1.86 + p2i(eden_start),
1.87 + p2i(eden_end),
1.88 pointer_delta(eden_end, eden_start, sizeof(char)));
1.89 gclog_or_tty->print_cr(" [ to_start .. to_end): "
1.90 "[" PTR_FORMAT " .. " PTR_FORMAT ") " SIZE_FORMAT,
1.91 - to_start,
1.92 - to_end,
1.93 + p2i(to_start),
1.94 + p2i(to_end),
1.95 pointer_delta( to_end, to_start, sizeof(char)));
1.96 gclog_or_tty->print_cr(" [from_start .. from_end): "
1.97 "[" PTR_FORMAT " .. " PTR_FORMAT ") " SIZE_FORMAT,
1.98 - from_start,
1.99 - from_end,
1.100 + p2i(from_start),
1.101 + p2i(from_end),
1.102 pointer_delta(from_end, from_start, sizeof(char)));
1.103 }
1.104 }
