aboutsummaryrefslogtreecommitdiff
path: root/spark-common/src/main/java/me/lucko/spark/common/util
diff options
context:
space:
mode:
authorLuck <git@lucko.me>2022-04-19 12:45:46 +0100
committerLuck <git@lucko.me>2022-04-19 12:45:54 +0100
commit86a312842662ba57faa8fd5e8471672dfac13089 (patch)
tree484c8089f82e1486602d06e965cde61cab31a087 /spark-common/src/main/java/me/lucko/spark/common/util
parent45edd6197aa777d0c746f37a813d6be4ca916694 (diff)
downloadspark-86a312842662ba57faa8fd5e8471672dfac13089.tar.gz
spark-86a312842662ba57faa8fd5e8471672dfac13089.tar.bz2
spark-86a312842662ba57faa8fd5e8471672dfac13089.zip
Fix /proc/net output parsing and number formatting (#195)
Diffstat (limited to 'spark-common/src/main/java/me/lucko/spark/common/util')
-rw-r--r--spark-common/src/main/java/me/lucko/spark/common/util/FormatUtil.java10
-rw-r--r--spark-common/src/main/java/me/lucko/spark/common/util/StatisticFormatter.java3
2 files changed, 8 insertions, 5 deletions
diff --git a/spark-common/src/main/java/me/lucko/spark/common/util/FormatUtil.java b/spark-common/src/main/java/me/lucko/spark/common/util/FormatUtil.java
index cbc496d..c4a3d66 100644
--- a/spark-common/src/main/java/me/lucko/spark/common/util/FormatUtil.java
+++ b/spark-common/src/main/java/me/lucko/spark/common/util/FormatUtil.java
@@ -23,6 +23,8 @@ package me.lucko.spark.common.util;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.TextColor;
+import java.util.Locale;
+
public enum FormatUtil {
;
@@ -34,23 +36,23 @@ public enum FormatUtil {
}
public static String formatBytes(long bytes) {
- if (bytes == 0) {
+ if (bytes <= 0) {
return "0 bytes";
}
int sizeIndex = (int) (Math.log(bytes) / Math.log(1024));
- return String.format("%.1f", bytes / Math.pow(1024, sizeIndex)) + " " + SIZE_UNITS[sizeIndex];
+ return String.format(Locale.ENGLISH, "%.1f", bytes / Math.pow(1024, sizeIndex)) + " " + SIZE_UNITS[sizeIndex];
}
public static Component formatBytes(long bytes, TextColor color, String suffix) {
String value;
String unit;
- if (bytes == 0) {
+ if (bytes <= 0) {
value = "0";
unit = "KB" + suffix;
} else {
int sizeIndex = (int) (Math.log(bytes) / Math.log(1024));
- value = String.format("%.1f", bytes / Math.pow(1024, sizeIndex));
+ value = String.format(Locale.ENGLISH, "%.1f", bytes / Math.pow(1024, sizeIndex));
unit = SIZE_UNITS[sizeIndex] + suffix;
}
diff --git a/spark-common/src/main/java/me/lucko/spark/common/util/StatisticFormatter.java b/spark-common/src/main/java/me/lucko/spark/common/util/StatisticFormatter.java
index 24e49fa..22ee9bb 100644
--- a/spark-common/src/main/java/me/lucko/spark/common/util/StatisticFormatter.java
+++ b/spark-common/src/main/java/me/lucko/spark/common/util/StatisticFormatter.java
@@ -27,6 +27,7 @@ import net.kyori.adventure.text.TextComponent;
import net.kyori.adventure.text.format.TextColor;
import java.lang.management.MemoryUsage;
+import java.util.Locale;
import static net.kyori.adventure.text.Component.text;
import static net.kyori.adventure.text.format.NamedTextColor.DARK_GRAY;
@@ -76,7 +77,7 @@ public enum StatisticFormatter {
color = GREEN;
}
- return text(String.format("%.1f", duration), color);
+ return text(String.format(Locale.ENGLISH, "%.1f", duration), color);
}
public static TextComponent formatCpuUsage(double usage) {