Repo-Mirror/Gale
9
0
Fork 0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2026-01-06 15:41:56 +00:00
Code Issues Releases Activity

Pad string after comma in MHz metric

Browse Source
This commit is contained in:
Martijn Muijsers
2023-08-11 21:23:40 +02:00
parent dc0ed0d1c7
commit f6e1bd84e8
4 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0007-Gale-metrics.patch
View File

@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org
diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
index 4b002e8b75d117b726b0de274a76d3596fce015b..d10c024a7a5c3dd78e624526974d6c6ca2c0fbfb 100644
index 4b002e8b75d117b726b0de274a76d3596fce015b..2868dab7b100d9c325b0e5056f86660d631dec4b 100644
--- a/src/main/java/com/destroystokyo/paper/Metrics.java
+++ b/src/main/java/com/destroystokyo/paper/Metrics.java
@@ -593,7 +593,7 @@ public class Metrics {
@@ -64,7 +64,7 @@ index 4b002e8b75d117b726b0de274a76d3596fce015b..d10c024a7a5c3dd78e624526974d6c6c
entry.put(String.valueOf(legacy), 1);
// create buckets as higher dimension
@@ -676,6 +676,249 @@ public class Metrics {
@@ -676,6 +676,253 @@ public class Metrics {
return map;
}));
@@ -234,7 +234,11 @@ index 4b002e8b75d117b726b0de274a76d3596fce015b..d10c024a7a5c3dd78e624526974d6c6c
+ entry.put(flooredMHz + " MHz", 1);
+ } else {
+ // Add a comma
+ entry.put((flooredMHz / 1000) + "," + (flooredMHz % 1000) + " MHz", 1);
+ StringBuilder flooredMHzAfterComma = new StringBuilder(String.valueOf(flooredMHz % 1000));
+ while (flooredMHzAfterComma.length() < 3) {
+ flooredMHzAfterComma.insert(0, "0");
+ }
+ entry.put((flooredMHz / 1000) + "," + flooredMHzAfterComma + " MHz", 1);
+ }
+
+ // use tenth of GHz as higher dimension

8
patches/server/0008-Gale-semantic-version.patch
View File

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org
diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
index d10c024a7a5c3dd78e624526974d6c6ca2c0fbfb..432731a10443cd7ee62f79693b27e9759581b9bb 100644
index 2868dab7b100d9c325b0e5056f86660d631dec4b..2acad4c3fd58178b0f8b22bdb04eeeeb689d5afa 100644
--- a/src/main/java/com/destroystokyo/paper/Metrics.java
+++ b/src/main/java/com/destroystokyo/paper/Metrics.java
@@ -919,6 +919,16 @@ public class Metrics {
@@ -923,6 +923,16 @@ public class Metrics {
}));
// Gale end - metrics - runtime max memory
@@ -29,7 +29,7 @@ index d10c024a7a5c3dd78e624526974d6c6ca2c0fbfb..432731a10443cd7ee62f79693b27e975
}
diff --git a/src/main/java/org/galemc/gale/version/GaleSemanticVersion.java b/src/main/java/org/galemc/gale/version/GaleSemanticVersion.java
new file mode 100644
index 0000000000000000000000000000000000000000..e7ff81841798adf75931b0198c3f69f8680cfc81
index 0000000000000000000000000000000000000000..6db1098c6728e9de2863205da55208edf376acee
--- /dev/null
+++ b/src/main/java/org/galemc/gale/version/GaleSemanticVersion.java
@@ -0,0 +1,37 @@
@@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..e7ff81841798adf75931b0198c3f69f8
+ * The <code>patch</code> version is incremented for small changes that do not affect the goal of any feature,
+ * such as bug fixes, performance improvements or changes in wording.
+ */
+ public static final @NotNull String version = "0.5.3";
+ public static final @NotNull String version = "0.5.4";
+
+ /**
+ * The "<code>major.minor</code>" portion of the {@link #version}.

4
patches/server/0046-SIMD-support.patch
View File

@@ -33,10 +33,10 @@ index 50bb7e538c7493e52b2d1356ef6c89194efa593a..a0237112353240d9c8d0dc733f9176fd
doFirst {
workingDir.mkdirs()
diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
index 432731a10443cd7ee62f79693b27e9759581b9bb..c2a3839f21afeefb37a760b204a4da43cd64a9ae 100644
index 2acad4c3fd58178b0f8b22bdb04eeeeb689d5afa..850ccd53c5007e8b18344ba76c9e7f0003decaff 100644
--- a/src/main/java/com/destroystokyo/paper/Metrics.java
+++ b/src/main/java/com/destroystokyo/paper/Metrics.java
@@ -929,6 +929,46 @@ public class Metrics {
@@ -933,6 +933,46 @@ public class Metrics {
metrics.addCustomChart(new Metrics.DrilldownPie("gale_semantic_version", () -> semanticVersionMap));
// Gale end - semantic version - include in metrics

6
patches/server/0145-Virtual-thread-support.patch
View File

@@ -1,16 +1,16 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martijn Muijsers <martijnmuijsers@live.nl>
Date: Wed, 9 Aug 2023 19:12:50 +0200
Date: Wed, 9 Aug 2023 15:04:56 +0200
Subject: [PATCH] Virtual thread support
License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
Gale - https://galemc.org
diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
index c2a3839f21afeefb37a760b204a4da43cd64a9ae..2bbf1ee16ab27e81e870e50504ff50b943c4189e 100644
index 850ccd53c5007e8b18344ba76c9e7f0003decaff..88102f6ba8352a080125512d0bbfacdf779f4f38 100644
--- a/src/main/java/com/destroystokyo/paper/Metrics.java
+++ b/src/main/java/com/destroystokyo/paper/Metrics.java
@@ -969,6 +969,22 @@ public class Metrics {
@@ -973,6 +973,22 @@ public class Metrics {
}));
// Gale end - SIMD support - include in metrics