Skip to content

Commit

Permalink
[GC] Fix data type in IOPrioritySizePolicy
Browse files Browse the repository at this point in the history
Summary: use SIZE_FORMAT to avoid build failure on windows

Testing: jtreg

Reviewers: maoliang.ml, yude.lyd

Issue: #855
  • Loading branch information
weixlu committed Aug 5, 2024
1 parent 38d15a6 commit 2fe2058
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ class IOPolicy : public CHeapObj<mtGC> {
* 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;
Expand Down Expand Up @@ -252,8 +252,8 @@ class IOPolicy : public CHeapObj<mtGC> {
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);
log_debug(gc, ergo, heap)(
"decrease eden from " SIZE_FORMAT "M to " SIZE_FORMAT "M , "
"survivor avg: %fM, min threshold: " SIZE_FORMAT "M",
Expand All @@ -268,8 +268,8 @@ class IOPolicy : public CHeapObj<mtGC> {
}
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);
log_debug(gc, ergo, heap)(
"decrease promotion from " SIZE_FORMAT "M to " SIZE_FORMAT "M , "
Expand Down

0 comments on commit 2fe2058

Please sign in to comment.