From afffb54106e85c2ea36a26422d920fa94fb7c0ad Mon Sep 17 00:00:00 2001 From: lxw Date: Tue, 20 Aug 2024 14:07:29 +0800 Subject: [PATCH] [GC] Fix data type in IOPrioritySizePolicy Summary: use SIZE_FORMAT to avoid build failure on windows Testing: jtreg Reviewers: yyang, yude.lyd Issue: https://github.com/dragonwell-project/dragonwell8/issues/672 --- .../parallelScavenge/psAdaptiveSizePolicy.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp index e00b9644d5..c962a13ac9 100644 --- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp +++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp @@ -91,8 +91,8 @@ class IOPolicy : public CHeapObj { * cpu 417487649 75106 102895030 23107566512 152075 65480092 6013218 0 0 0 */ size_t user, nice, system, idle, iowait_time, irq, softirq, steal, guest, guest_nice; - int parse_line = sscanf(line, "cpu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu", &user, - &nice, &system, &idle, &iowait_time, &irq, &softirq, &steal, &guest, &guest_nice); + int parse_line = sscanf(line, "cpu " SIZE_FORMAT " " SIZE_FORMAT " " SIZE_FORMAT " " SIZE_FORMAT " " SIZE_FORMAT " " SIZE_FORMAT " " SIZE_FORMAT " " SIZE_FORMAT " " SIZE_FORMAT " " SIZE_FORMAT, &user, + &nice, &system, &idle, &iowait_time, &irq, &softirq, &steal, &guest, &guest_nice); if (parse_line != 10) { fill_value_fail(file); return; @@ -276,8 +276,8 @@ class IOPolicy : public CHeapObj { return eden_size; } size_t reduced_size; - reduced_size = MIN(eden_size, avg_survivor * IOPrioritySizePolicyEdenScale); - reduced_size = MAX(reduced_size, ParallelScavengeHeap::heap()->young_gen()->max_size() / 10); + reduced_size = (size_t)MIN2((float)eden_size, avg_survivor * (float)IOPrioritySizePolicyEdenScale); + reduced_size = MAX2(reduced_size, ParallelScavengeHeap::heap()->young_gen()->max_size() / 10); if (PrintAdaptiveSizePolicy) { gclog_or_tty->print_cr( "decrease eden from " SIZE_FORMAT "M to " SIZE_FORMAT @@ -294,8 +294,8 @@ class IOPolicy : public CHeapObj { } const static float PromoScale = 5; size_t reduced_size; - reduced_size = MIN(reduced_size, avg_promo * PromoScale); - reduced_size = MAX(reduced_size, + reduced_size = (size_t)MIN2((float)promo_size, avg_promo * PromoScale); + reduced_size = MAX2(reduced_size, ParallelScavengeHeap::heap()->old_gen()->max_gen_size() / 10); if (PrintAdaptiveSizePolicy) { gclog_or_tty->print_cr(