Repo-Mirror/PlazmaBukkitMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity
Files
bd642eb8d65e57539f43d146fb3c48c68f8e8227
PlazmaBukkitMC/patches/server/0048-Remove-Mojang-Profiler-codes.patch
AlphaKR93 3f15d7a684 Updated Upstream (Paper, Pufferfish, Purpur) 
Upstream has released updates that appear to apply and compile correctly.

[Purpur Changes]
PurpurMC/Purpur@e86a1b6: Updated Upstream (Paper)
PurpurMC/Purpur@962ee30: Updated Upstream (Paper)
PurpurMC/Purpur@74d1b4c: Updated Upstream (Paper)
PurpurMC/Purpur@e2e8c61: Updated Upstream (Paper)
PurpurMC/Purpur@7a01fd8: Updated Upstream (Paper)
PurpurMC/Purpur@34c18f0: Updated Upstream (Paper)
PurpurMC/Purpur@ca668ab: Updated Upstream (Paper)
PurpurMC/Purpur@200178d: Updated Upstream (Paper)
PurpurMC/Purpur@9968cbb: Updated Upstream (Paper)
PurpurMC/Purpur@db09358: Fix clamp-levels option not being true by default (#1609)
PurpurMC/Purpur@f289b6a: Updated Upstream (Paper)
PurpurMC/Purpur@959c29d: Fix Tridents giving errors without having an Elytra equipped (#1612)
PurpurMC/Purpur@68c1612: Fix villagers not spawning when the `follow-emerald-blocks` option is enabled (#1611)
PurpurMC/Purpur@5b75c68: fix `bypass-mob-griefing` not being the inverse of mobgriefing gamerule, closes #1603
PurpurMC/Purpur@55d4309: Updated Upstream (Paper)
PurpurMC/Purpur@0601f87: Updated Upstream (Paper)
PurpurMC/Purpur@06dde9d: Add Ridable and Attribute options for Creaking mob (#1613)
PurpurMC/Purpur@420a1ce: Set the bee's `takes-damage-from-water` option to true by default (#1614)
PurpurMC/Purpur@2b6f273: Updated Upstream (Paper)
PurpurMC/Purpur@504f311: Updated Upstream (Paper)
PurpurMC/Purpur@2b694c9: Updated Upstream (Paper)
PurpurMC/Purpur@96d7ef7: Updated Upstream (Paper)
PurpurMC/Purpur@e141f68: Updated Upstream (Paper)
PurpurMC/Purpur@7f6f667: Updated Upstream (Pufferfish)
PurpurMC/Purpur@de20ba9: ignore `minecart.max-speed` config value if using minecart experiment, closes #1618
PurpurMC/Purpur@03062a8: fix ridable mobs not being controllable, closes #1620
PurpurMC/Purpur@0493ac3: Updated Upstream (Paper)
PurpurMC/Purpur@16ce24a: fix(ridables/creaking): override tick method in look/move control
2024-12-14 01:59:42 +09:00

2226 lines
83 KiB
Diff
Raw Blame History

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: AlphaKR93 <dev@alpha93.kr>
Date: Wed, 27 Sep 2023 17:52:52 +0900
Subject: [PATCH] Remove Mojang Profiler codes
diff --git a/src/main/java/net/minecraft/util/profiling/ActiveProfiler.java b/src/main/java/net/minecraft/util/profiling/ActiveProfiler.java
index bce2dac613d29083dd5fbb68739304cc5a6d4d27..aacfd9b8d71a47a75eefa3a0f87636e58a5b6370 100644
--- a/src/main/java/net/minecraft/util/profiling/ActiveProfiler.java
+++ b/src/main/java/net/minecraft/util/profiling/ActiveProfiler.java
@@ -1,206 +1,3 @@
package net.minecraft.util.profiling;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.mojang.logging.LogUtils;
-import it.unimi.dsi.fastutil.longs.LongArrayList;
-import it.unimi.dsi.fastutil.longs.LongList;
-import it.unimi.dsi.fastutil.objects.Object2LongMap;
-import it.unimi.dsi.fastutil.objects.Object2LongMaps;
-import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap;
-import it.unimi.dsi.fastutil.objects.ObjectArraySet;
-import java.time.Duration;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.IntSupplier;
-import java.util.function.LongSupplier;
-import java.util.function.Supplier;
-import javax.annotation.Nullable;
-import net.minecraft.Util;
-import net.minecraft.util.profiling.metrics.MetricCategory;
-import org.apache.commons.lang3.tuple.Pair;
-import org.slf4j.Logger;
-
-public class ActiveProfiler implements ProfileCollector {
- private static final long WARNING_TIME_NANOS = Duration.ofMillis(100L).toNanos();
- private static final Logger LOGGER = LogUtils.getLogger();
- private final List<String> paths = Lists.newArrayList();
- private final LongList startTimes = new LongArrayList();
- private final Map<String, ActiveProfiler.PathEntry> entries = Maps.newHashMap();
- private final IntSupplier getTickTime;
- private final LongSupplier getRealTime;
- private final long startTimeNano;
- private final int startTimeTicks;
- private String path = "";
- private boolean started;
- @Nullable
- private ActiveProfiler.PathEntry currentEntry;
- private final boolean warn;
- private final Set<Pair<String, MetricCategory>> chartedPaths = new ObjectArraySet<>();
-
- public ActiveProfiler(LongSupplier timeGetter, IntSupplier tickGetter, boolean checkTimeout) {
- this.startTimeNano = timeGetter.getAsLong();
- this.getRealTime = timeGetter;
- this.startTimeTicks = tickGetter.getAsInt();
- this.getTickTime = tickGetter;
- this.warn = checkTimeout;
- }
-
- @Override
- public void startTick() {
- if (this.started) {
- LOGGER.error("Profiler tick already started - missing endTick()?");
- } else {
- this.started = true;
- this.path = "";
- this.paths.clear();
- this.push("root");
- }
- }
-
- @Override
- public void endTick() {
- if (!this.started) {
- LOGGER.error("Profiler tick already ended - missing startTick()?");
- } else {
- this.pop();
- this.started = false;
- if (!this.path.isEmpty()) {
- LOGGER.error(
- "Profiler tick ended before path was fully popped (remainder: '{}'). Mismatched push/pop?",
- LogUtils.defer(() -> ProfileResults.demanglePath(this.path))
- );
- }
- }
- }
-
- @Override
- public void push(String location) {
- if (!this.started) {
- LOGGER.error("Cannot push '{}' to profiler if profiler tick hasn't started - missing startTick()?", location);
- } else {
- if (!this.path.isEmpty()) {
- this.path = this.path + "\u001e";
- }
-
- this.path = this.path + location;
- this.paths.add(this.path);
- this.startTimes.add(Util.getNanos());
- this.currentEntry = null;
- }
- }
-
- @Override
- public void push(Supplier<String> locationGetter) {
- this.push(locationGetter.get());
- }
-
- @Override
- public void markForCharting(MetricCategory type) {
- this.chartedPaths.add(Pair.of(this.path, type));
- }
-
- @Override
- public void pop() {
- if (!this.started) {
- LOGGER.error("Cannot pop from profiler if profiler tick hasn't started - missing startTick()?");
- } else if (this.startTimes.isEmpty()) {
- LOGGER.error("Tried to pop one too many times! Mismatched push() and pop()?");
- } else {
- long l = Util.getNanos();
- long m = this.startTimes.removeLong(this.startTimes.size() - 1);
- this.paths.remove(this.paths.size() - 1);
- long n = l - m;
- ActiveProfiler.PathEntry pathEntry = this.getCurrentEntry();
- pathEntry.accumulatedDuration += n;
- pathEntry.count++;
- pathEntry.maxDuration = Math.max(pathEntry.maxDuration, n);
- pathEntry.minDuration = Math.min(pathEntry.minDuration, n);
- if (this.warn && n > WARNING_TIME_NANOS) {
- LOGGER.warn(
- "Something's taking too long! '{}' took aprox {} ms",
- LogUtils.defer(() -> ProfileResults.demanglePath(this.path)),
- LogUtils.defer(() -> (double)n / 1000000.0)
- );
- }
-
- this.path = this.paths.isEmpty() ? "" : this.paths.get(this.paths.size() - 1);
- this.currentEntry = null;
- }
- }
-
- @Override
- public void popPush(String location) {
- this.pop();
- this.push(location);
- }
-
- @Override
- public void popPush(Supplier<String> locationGetter) {
- this.pop();
- this.push(locationGetter);
- }
-
- private ActiveProfiler.PathEntry getCurrentEntry() {
- if (this.currentEntry == null) {
- this.currentEntry = this.entries.computeIfAbsent(this.path, k -> new ActiveProfiler.PathEntry());
- }
-
- return this.currentEntry;
- }
-
- @Override
- public void incrementCounter(String marker, int num) {
- this.getCurrentEntry().counters.addTo(marker, (long)num);
- }
-
- @Override
- public void incrementCounter(Supplier<String> markerGetter, int num) {
- this.getCurrentEntry().counters.addTo(markerGetter.get(), (long)num);
- }
-
- @Override
- public ProfileResults getResults() {
- return new FilledProfileResults(this.entries, this.startTimeNano, this.startTimeTicks, this.getRealTime.getAsLong(), this.getTickTime.getAsInt());
- }
-
- @Nullable
- @Override
- public ActiveProfiler.PathEntry getEntry(String name) {
- return this.entries.get(name);
- }
-
- @Override
- public Set<Pair<String, MetricCategory>> getChartedPaths() {
- return this.chartedPaths;
- }
-
- public static class PathEntry implements ProfilerPathEntry {
- long maxDuration = Long.MIN_VALUE;
- long minDuration = Long.MAX_VALUE;
- long accumulatedDuration;
- long count;
- final Object2LongOpenHashMap<String> counters = new Object2LongOpenHashMap<>();
-
- @Override
- public long getDuration() {
- return this.accumulatedDuration;
- }
-
- @Override
- public long getMaxDuration() {
- return this.maxDuration;
- }
-
- @Override
- public long getCount() {
- return this.count;
- }
-
- @Override
- public Object2LongMap<String> getCounters() {
- return Object2LongMaps.unmodifiable(this.counters);
- }
- }
-}
+@Deprecated(forRemoval = true) interface ActiveProfiler {} // Plazma - Completely remove Mojang's Profiler
diff --git a/src/main/java/net/minecraft/util/profiling/ContinuousProfiler.java b/src/main/java/net/minecraft/util/profiling/ContinuousProfiler.java
index 4424bca7effa4fef26453afcd06d86e6a30d7b8f..ed0329b8ab3272048a2c1d459a3c091ca32f7d42 100644
--- a/src/main/java/net/minecraft/util/profiling/ContinuousProfiler.java
+++ b/src/main/java/net/minecraft/util/profiling/ContinuousProfiler.java
@@ -1,35 +1,3 @@
package net.minecraft.util.profiling;
-import java.util.function.IntSupplier;
-import java.util.function.LongSupplier;
-
-public class ContinuousProfiler {
- private final LongSupplier realTime;
- private final IntSupplier tickCount;
- private ProfileCollector profiler = InactiveProfiler.INSTANCE;
-
- public ContinuousProfiler(LongSupplier timeGetter, IntSupplier tickGetter) {
- this.realTime = timeGetter;
- this.tickCount = tickGetter;
- }
-
- public boolean isEnabled() {
- return this.profiler != InactiveProfiler.INSTANCE;
- }
-
- public void disable() {
- this.profiler = InactiveProfiler.INSTANCE;
- }
-
- public void enable() {
- this.profiler = new ActiveProfiler(this.realTime, this.tickCount, true);
- }
-
- public ProfilerFiller getFiller() {
- return this.profiler;
- }
-
- public ProfileResults getResults() {
- return this.profiler.getResults();
- }
-}
+@Deprecated(forRemoval = true) interface ContinuousProfiler {} // Plazma - Completely remove Mojang's Profiler
diff --git a/src/main/java/net/minecraft/util/profiling/EmptyProfileResults.java b/src/main/java/net/minecraft/util/profiling/EmptyProfileResults.java
index 843e28baf089349851d7794c496e518ca396e92d..5900697867a589d272b1c00be75cfd9a838098b1 100644
--- a/src/main/java/net/minecraft/util/profiling/EmptyProfileResults.java
+++ b/src/main/java/net/minecraft/util/profiling/EmptyProfileResults.java
@@ -1,47 +1,3 @@
package net.minecraft.util.profiling;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
-
-public class EmptyProfileResults implements ProfileResults {
- public static final EmptyProfileResults EMPTY = new EmptyProfileResults();
-
- private EmptyProfileResults() {
- }
-
- @Override
- public List<ResultField> getTimes(String parentPath) {
- return Collections.emptyList();
- }
-
- @Override
- public boolean saveResults(Path path) {
- return false;
- }
-
- @Override
- public long getStartTimeNano() {
- return 0L;
- }
-
- @Override
- public int getStartTimeTicks() {
- return 0;
- }
-
- @Override
- public long getEndTimeNano() {
- return 0L;
- }
-
- @Override
- public int getEndTimeTicks() {
- return 0;
- }
-
- @Override
- public String getProfilerResults() {
- return "";
- }
-}
+@Deprecated(forRemoval = true) interface EmptyProfileResults {} // Plazma - Completely remove Mojang's Profiler
diff --git a/src/main/java/net/minecraft/util/profiling/FilledProfileResults.java b/src/main/java/net/minecraft/util/profiling/FilledProfileResults.java
index 81683f9f24263f663b9e51e429cd2c9e5acf2b1c..eb5dad1cb2e52557dbdee961b26aa97bc0bfbc20 100644
--- a/src/main/java/net/minecraft/util/profiling/FilledProfileResults.java
+++ b/src/main/java/net/minecraft/util/profiling/FilledProfileResults.java
@@ -1,312 +1,3 @@
package net.minecraft.util.profiling;
-import com.google.common.base.Splitter;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.mojang.logging.LogUtils;
-import it.unimi.dsi.fastutil.objects.Object2LongMap;
-import it.unimi.dsi.fastutil.objects.Object2LongMaps;
-import java.io.Writer;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Map.Entry;
-import net.minecraft.ReportType;
-import net.minecraft.SharedConstants;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.ObjectUtils;
-import org.slf4j.Logger;
-
-public class FilledProfileResults implements ProfileResults {
- private static final Logger LOGGER = LogUtils.getLogger();
- private static final ProfilerPathEntry EMPTY = new ProfilerPathEntry() {
- @Override
- public long getDuration() {
- return 0L;
- }
-
- @Override
- public long getMaxDuration() {
- return 0L;
- }
-
- @Override
- public long getCount() {
- return 0L;
- }
-
- @Override
- public Object2LongMap<String> getCounters() {
- return Object2LongMaps.emptyMap();
- }
- };
- private static final Splitter SPLITTER = Splitter.on('\u001e');
- private static final Comparator<Entry<String, FilledProfileResults.CounterCollector>> COUNTER_ENTRY_COMPARATOR = Entry.<String, FilledProfileResults.CounterCollector>comparingByValue(
- Comparator.comparingLong(counterCollector -> counterCollector.totalValue)
- )
- .reversed();
- private final Map<String, ? extends ProfilerPathEntry> entries;
- private final long startTimeNano;
- private final int startTimeTicks;
- private final long endTimeNano;
- private final int endTimeTicks;
- private final int tickDuration;
-
- public FilledProfileResults(Map<String, ? extends ProfilerPathEntry> locationInfos, long startTime, int startTick, long endTime, int endTick) {
- this.entries = locationInfos;
- this.startTimeNano = startTime;
- this.startTimeTicks = startTick;
- this.endTimeNano = endTime;
- this.endTimeTicks = endTick;
- this.tickDuration = endTick - startTick;
- }
-
- private ProfilerPathEntry getEntry(String path) {
- ProfilerPathEntry profilerPathEntry = this.entries.get(path);
- return profilerPathEntry != null ? profilerPathEntry : EMPTY;
- }
-
- @Override
- public List<ResultField> getTimes(String parentPath) {
- String string = parentPath;
- ProfilerPathEntry profilerPathEntry = this.getEntry("root");
- long l = profilerPathEntry.getDuration();
- ProfilerPathEntry profilerPathEntry2 = this.getEntry(parentPath);
- long m = profilerPathEntry2.getDuration();
- long n = profilerPathEntry2.getCount();
- List<ResultField> list = Lists.newArrayList();
- if (!parentPath.isEmpty()) {
- parentPath = parentPath + "\u001e";
- }
-
- long o = 0L;
-
- for (String string2 : this.entries.keySet()) {
- if (isDirectChild(parentPath, string2)) {
- o += this.getEntry(string2).getDuration();
- }
- }
-
- float f = (float)o;
- if (o < m) {
- o = m;
- }
-
- if (l < o) {
- l = o;
- }
-
- for (String string3 : this.entries.keySet()) {
- if (isDirectChild(parentPath, string3)) {
- ProfilerPathEntry profilerPathEntry3 = this.getEntry(string3);
- long p = profilerPathEntry3.getDuration();
- double d = (double)p * 100.0 / (double)o;
- double e = (double)p * 100.0 / (double)l;
- String string4 = string3.substring(parentPath.length());
- list.add(new ResultField(string4, d, e, profilerPathEntry3.getCount()));
- }
- }
-
- if ((float)o > f) {
- list.add(new ResultField("unspecified", (double)((float)o - f) * 100.0 / (double)o, (double)((float)o - f) * 100.0 / (double)l, n));
- }
-
- Collections.sort(list);
- list.add(0, new ResultField(string, 100.0, (double)o * 100.0 / (double)l, n));
- return list;
- }
-
- private static boolean isDirectChild(String parent, String path) {
- return path.length() > parent.length() && path.startsWith(parent) && path.indexOf(30, parent.length() + 1) < 0;
- }
-
- private Map<String, FilledProfileResults.CounterCollector> getCounterValues() {
- Map<String, FilledProfileResults.CounterCollector> map = Maps.newTreeMap();
- this.entries
- .forEach(
- (location, info) -> {
- Object2LongMap<String> object2LongMap = info.getCounters();
- if (!object2LongMap.isEmpty()) {
- List<String> list = SPLITTER.splitToList(location);
- object2LongMap.forEach(
- (marker, count) -> map.computeIfAbsent(marker, k -> new FilledProfileResults.CounterCollector()).addValue(list.iterator(), count)
- );
- }
- }
- );
- return map;
- }
-
- @Override
- public long getStartTimeNano() {
- return this.startTimeNano;
- }
-
- @Override
- public int getStartTimeTicks() {
- return this.startTimeTicks;
- }
-
- @Override
- public long getEndTimeNano() {
- return this.endTimeNano;
- }
-
- @Override
- public int getEndTimeTicks() {
- return this.endTimeTicks;
- }
-
- @Override
- public boolean saveResults(Path path) {
- Writer writer = null;
-
- boolean var4;
- try {
- Files.createDirectories(path.getParent());
- writer = Files.newBufferedWriter(path, StandardCharsets.UTF_8);
- writer.write(this.getProfilerResults(this.getNanoDuration(), this.getTickDuration()));
- return true;
- } catch (Throwable var8) {
- LOGGER.error("Could not save profiler results to {}", path, var8);
- var4 = false;
- } finally {
- IOUtils.closeQuietly(writer);
- }
-
- return var4;
- }
-
- protected String getProfilerResults(long timeSpan, int tickSpan) {
- StringBuilder stringBuilder = new StringBuilder();
- ReportType.PROFILE.appendHeader(stringBuilder, List.of());
- stringBuilder.append("Version: ").append(SharedConstants.getCurrentVersion().getId()).append('\n');
- stringBuilder.append("Time span: ").append(timeSpan / 1000000L).append(" ms\n");
- stringBuilder.append("Tick span: ").append(tickSpan).append(" ticks\n");
- stringBuilder.append("// This is approximately ")
- .append(String.format(Locale.ROOT, "%.2f", (float)tickSpan / ((float)timeSpan / 1.0E9F)))
- .append(" ticks per second. It should be ")
- .append(20)
- .append(" ticks per second\n\n");
- stringBuilder.append("--- BEGIN PROFILE DUMP ---\n\n");
- this.appendProfilerResults(0, "root", stringBuilder);
- stringBuilder.append("--- END PROFILE DUMP ---\n\n");
- Map<String, FilledProfileResults.CounterCollector> map = this.getCounterValues();
- if (!map.isEmpty()) {
- stringBuilder.append("--- BEGIN COUNTER DUMP ---\n\n");
- this.appendCounters(map, stringBuilder, tickSpan);
- stringBuilder.append("--- END COUNTER DUMP ---\n\n");
- }
-
- return stringBuilder.toString();
- }
-
- @Override
- public String getProfilerResults() {
- StringBuilder stringBuilder = new StringBuilder();
- this.appendProfilerResults(0, "root", stringBuilder);
- return stringBuilder.toString();
- }
-
- private static StringBuilder indentLine(StringBuilder sb, int size) {
- sb.append(String.format(Locale.ROOT, "[%02d] ", size));
-
- for (int i = 0; i < size; i++) {
- sb.append("| ");
- }
-
- return sb;
- }
-
- private void appendProfilerResults(int level, String name, StringBuilder sb) {
- List<ResultField> list = this.getTimes(name);
- Object2LongMap<String> object2LongMap = ObjectUtils.firstNonNull(this.entries.get(name), EMPTY).getCounters();
- object2LongMap.forEach(
- (marker, count) -> indentLine(sb, level)
- .append('#')
- .append(marker)
- .append(' ')
- .append(count)
- .append('/')
- .append(count / (long)this.tickDuration)
- .append('\n')
- );
- if (list.size() >= 3) {
- for (int i = 1; i < list.size(); i++) {
- ResultField resultField = list.get(i);
- indentLine(sb, level)
- .append(resultField.name)
- .append('(')
- .append(resultField.count)
- .append('/')
- .append(String.format(Locale.ROOT, "%.0f", (float)resultField.count / (float)this.tickDuration))
- .append(')')
- .append(" - ")
- .append(String.format(Locale.ROOT, "%.2f", resultField.percentage))
- .append("%/")
- .append(String.format(Locale.ROOT, "%.2f", resultField.globalPercentage))
- .append("%\n");
- if (!"unspecified".equals(resultField.name)) {
- try {
- this.appendProfilerResults(level + 1, name + "\u001e" + resultField.name, sb);
- } catch (Exception var9) {
- sb.append("[[ EXCEPTION ").append(var9).append(" ]]");
- }
- }
- }
- }
- }
-
- private void appendCounterResults(int depth, String name, FilledProfileResults.CounterCollector info, int tickSpan, StringBuilder sb) {
- indentLine(sb, depth)
- .append(name)
- .append(" total:")
- .append(info.selfValue)
- .append('/')
- .append(info.totalValue)
- .append(" average: ")
- .append(info.selfValue / (long)tickSpan)
- .append('/')
- .append(info.totalValue / (long)tickSpan)
- .append('\n');
- info.children
- .entrySet()
- .stream()
- .sorted(COUNTER_ENTRY_COMPARATOR)
- .forEach(entry -> this.appendCounterResults(depth + 1, entry.getKey(), entry.getValue(), tickSpan, sb));
- }
-
- private void appendCounters(Map<String, FilledProfileResults.CounterCollector> counters, StringBuilder sb, int tickSpan) {
- counters.forEach((name, info) -> {
- sb.append("-- Counter: ").append(name).append(" --\n");
- this.appendCounterResults(0, "root", info.children.get("root"), tickSpan, sb);
- sb.append("\n\n");
- });
- }
-
- @Override
- public int getTickDuration() {
- return this.tickDuration;
- }
-
- static class CounterCollector {
- long selfValue;
- long totalValue;
- final Map<String, FilledProfileResults.CounterCollector> children = Maps.newHashMap();
-
- public void addValue(Iterator<String> pathIterator, long time) {
- this.totalValue += time;
- if (!pathIterator.hasNext()) {
- this.selfValue += time;
- } else {
- this.children.computeIfAbsent(pathIterator.next(), k -> new FilledProfileResults.CounterCollector()).addValue(pathIterator, time);
- }
- }
- }
-}
+@Deprecated(forRemoval = true) interface FilledProfileResults {} // Plazma - Completely remove Mojang's Profiler
diff --git a/src/main/java/net/minecraft/util/profiling/InactiveProfiler.java b/src/main/java/net/minecraft/util/profiling/InactiveProfiler.java
index af326c4396d0af69208c5418c8329b163f7e3d73..9c8859f264f0a57d0c74a3870cd9f38595757b12 100644
--- a/src/main/java/net/minecraft/util/profiling/InactiveProfiler.java
+++ b/src/main/java/net/minecraft/util/profiling/InactiveProfiler.java
@@ -1,81 +1,3 @@
package net.minecraft.util.profiling;
-import com.google.common.collect.ImmutableSet;
-import java.util.Set;
-import java.util.function.Supplier;
-import javax.annotation.Nullable;
-import net.minecraft.util.profiling.metrics.MetricCategory;
-import org.apache.commons.lang3.tuple.Pair;
-
-public class InactiveProfiler implements ProfileCollector {
- public static final InactiveProfiler INSTANCE = new InactiveProfiler();
-
- private InactiveProfiler() {
- }
-
- @Override
- public void startTick() {
- }
-
- @Override
- public void endTick() {
- }
-
- @Override
- public void push(String location) {
- }
-
- @Override
- public void push(Supplier<String> locationGetter) {
- }
-
- @Override
- public void markForCharting(MetricCategory type) {
- }
-
- @Override
- public void pop() {
- }
-
- @Override
- public void popPush(String location) {
- }
-
- @Override
- public void popPush(Supplier<String> locationGetter) {
- }
-
- @Override
- public Zone zone(String name) {
- return Zone.INACTIVE;
- }
-
- @Override
- public Zone zone(Supplier<String> nameSupplier) {
- return Zone.INACTIVE;
- }
-
- @Override
- public void incrementCounter(String marker, int num) {
- }
-
- @Override
- public void incrementCounter(Supplier<String> markerGetter, int num) {
- }
-
- @Override
- public ProfileResults getResults() {
- return EmptyProfileResults.EMPTY;
- }
-
- @Nullable
- @Override
- public ActiveProfiler.PathEntry getEntry(String name) {
- return null;
- }
-
- @Override
- public Set<Pair<String, MetricCategory>> getChartedPaths() {
- return ImmutableSet.of();
- }
-}
+@Deprecated(forRemoval = true) interface InactiveProfiler {} // Plazma - Completely remove Mojang's Profiler
diff --git a/src/main/java/net/minecraft/util/profiling/ProfileCollector.java b/src/main/java/net/minecraft/util/profiling/ProfileCollector.java
index fe47a3ce6318ad74bd4d9b10dbf5ee06c94b6939..f8b0a1ce259ccee9e46a09ee0a114d210a4704ce 100644
--- a/src/main/java/net/minecraft/util/profiling/ProfileCollector.java
+++ b/src/main/java/net/minecraft/util/profiling/ProfileCollector.java
@@ -1,15 +1,3 @@
package net.minecraft.util.profiling;
-import java.util.Set;
-import javax.annotation.Nullable;
-import net.minecraft.util.profiling.metrics.MetricCategory;
-import org.apache.commons.lang3.tuple.Pair;
-
-public interface ProfileCollector extends ProfilerFiller {
- ProfileResults getResults();
-
- @Nullable
- ActiveProfiler.PathEntry getEntry(String name);
-
- Set<Pair<String, MetricCategory>> getChartedPaths();
-}
+@Deprecated(forRemoval = true) interface ProfileCollector {} // Plazma - Completely remove Mojang's Profiler
diff --git a/src/main/java/net/minecraft/util/profiling/ProfileResults.java b/src/main/java/net/minecraft/util/profiling/ProfileResults.java
index afefd549cf9792a91dd8919c12697a693200d042..313a37de769e74b949fa36ca516a32297622d918 100644
--- a/src/main/java/net/minecraft/util/profiling/ProfileResults.java
+++ b/src/main/java/net/minecraft/util/profiling/ProfileResults.java
@@ -1,34 +1,3 @@
package net.minecraft.util.profiling;
-import java.nio.file.Path;
-import java.util.List;
-
-public interface ProfileResults {
- char PATH_SEPARATOR = '\u001e';
-
- List<ResultField> getTimes(String parentPath);
-
- boolean saveResults(Path path);
-
- long getStartTimeNano();
-
- int getStartTimeTicks();
-
- long getEndTimeNano();
-
- int getEndTimeTicks();
-
- default long getNanoDuration() {
- return this.getEndTimeNano() - this.getStartTimeNano();
- }
-
- default int getTickDuration() {
- return this.getEndTimeTicks() - this.getStartTimeTicks();
- }
-
- String getProfilerResults();
-
- static String demanglePath(String path) {
- return path.replace('\u001e', '.');
- }
-}
+@Deprecated interface ProfileResults {} // Plazma - Completely remove Mojang's Profiler
diff --git a/src/main/java/net/minecraft/util/profiling/Profiler.java b/src/main/java/net/minecraft/util/profiling/Profiler.java
index fe8a8ee1f88c58a9fe730c4c0cc5fc4e3651e9f8..09d2768bd51e0bd8917e870387fd187798c809bb 100644
--- a/src/main/java/net/minecraft/util/profiling/Profiler.java
+++ b/src/main/java/net/minecraft/util/profiling/Profiler.java
@@ -1,58 +1,3 @@
package net.minecraft.util.profiling;
-import com.mojang.jtracy.TracyClient;
-import java.util.Objects;
-import java.util.concurrent.atomic.AtomicInteger;
-
-public final class Profiler {
- private static final ThreadLocal<TracyZoneFiller> TRACY_FILLER = ThreadLocal.withInitial(TracyZoneFiller::new);
- private static final ThreadLocal<ProfilerFiller> ACTIVE = new ThreadLocal<>();
- private static final AtomicInteger ACTIVE_COUNT = new AtomicInteger();
-
- private Profiler() {
- }
-
- public static Profiler.Scope use(ProfilerFiller profiler) {
- startUsing(profiler);
- return Profiler::stopUsing;
- }
-
- private static void startUsing(ProfilerFiller profiler) {
- if (ACTIVE.get() != null) {
- throw new IllegalStateException("Profiler is already active");
- } else {
- ProfilerFiller profilerFiller = decorateFiller(profiler);
- ACTIVE.set(profilerFiller);
- ACTIVE_COUNT.incrementAndGet();
- profilerFiller.startTick();
- }
- }
-
- private static void stopUsing() {
- ProfilerFiller profilerFiller = ACTIVE.get();
- if (profilerFiller == null) {
- throw new IllegalStateException("Profiler was not active");
- } else {
- ACTIVE.remove();
- ACTIVE_COUNT.decrementAndGet();
- profilerFiller.endTick();
- }
- }
-
- private static ProfilerFiller decorateFiller(ProfilerFiller builtinProfiler) {
- return ProfilerFiller.combine(getDefaultFiller(), builtinProfiler);
- }
-
- public static ProfilerFiller get() {
- return ACTIVE_COUNT.get() == 0 ? getDefaultFiller() : Objects.requireNonNullElseGet(ACTIVE.get(), Profiler::getDefaultFiller);
- }
-
- private static ProfilerFiller getDefaultFiller() {
- return (ProfilerFiller)(TracyClient.isAvailable() ? TRACY_FILLER.get() : InactiveProfiler.INSTANCE);
- }
-
- public interface Scope extends AutoCloseable {
- @Override
- void close();
- }
-}
+@Deprecated(forRemoval = true) interface Profiler {} // Plazma - Completely remove Mojang's Profiler
diff --git a/src/main/java/net/minecraft/util/profiling/ProfilerFiller.java b/src/main/java/net/minecraft/util/profiling/ProfilerFiller.java
index bc5c8879befe849ce81becf5e3fba6757b01cb70..1bce6008d63c371c666db13633902e303142127f 100644
--- a/src/main/java/net/minecraft/util/profiling/ProfilerFiller.java
+++ b/src/main/java/net/minecraft/util/profiling/ProfilerFiller.java
@@ -1,151 +1,3 @@
package net.minecraft.util.profiling;
-import java.util.function.Supplier;
-import net.minecraft.util.profiling.metrics.MetricCategory;
-
-public interface ProfilerFiller {
- String ROOT = "root";
-
- void startTick();
-
- void endTick();
-
- void push(String location);
-
- void push(Supplier<String> locationGetter);
-
- void pop();
-
- void popPush(String location);
-
- void popPush(Supplier<String> locationGetter);
-
- default void addZoneText(String label) {
- }
-
- default void addZoneValue(long value) {
- }
-
- default void setZoneColor(int color) {
- }
-
- default Zone zone(String name) {
- this.push(name);
- return new Zone(this);
- }
-
- default Zone zone(Supplier<String> nameSupplier) {
- this.push(nameSupplier);
- return new Zone(this);
- }
-
- void markForCharting(MetricCategory type);
-
- default void incrementCounter(String marker) {
- this.incrementCounter(marker, 1);
- }
-
- void incrementCounter(String marker, int num);
-
- default void incrementCounter(Supplier<String> markerGetter) {
- this.incrementCounter(markerGetter, 1);
- }
-
- void incrementCounter(Supplier<String> markerGetter, int num);
-
- static ProfilerFiller combine(ProfilerFiller first, ProfilerFiller second) {
- if (first == InactiveProfiler.INSTANCE) {
- return second;
- } else {
- return (ProfilerFiller)(second == InactiveProfiler.INSTANCE ? first : new ProfilerFiller.CombinedProfileFiller(first, second));
- }
- }
-
- public static class CombinedProfileFiller implements ProfilerFiller {
- private final ProfilerFiller first;
- private final ProfilerFiller second;
-
- public CombinedProfileFiller(ProfilerFiller first, ProfilerFiller second) {
- this.first = first;
- this.second = second;
- }
-
- @Override
- public void startTick() {
- this.first.startTick();
- this.second.startTick();
- }
-
- @Override
- public void endTick() {
- this.first.endTick();
- this.second.endTick();
- }
-
- @Override
- public void push(String location) {
- this.first.push(location);
- this.second.push(location);
- }
-
- @Override
- public void push(Supplier<String> locationGetter) {
- this.first.push(locationGetter);
- this.second.push(locationGetter);
- }
-
- @Override
- public void markForCharting(MetricCategory type) {
- this.first.markForCharting(type);
- this.second.markForCharting(type);
- }
-
- @Override
- public void pop() {
- this.first.pop();
- this.second.pop();
- }
-
- @Override
- public void popPush(String location) {
- this.first.popPush(location);
- this.second.popPush(location);
- }
-
- @Override
- public void popPush(Supplier<String> locationGetter) {
- this.first.popPush(locationGetter);
- this.second.popPush(locationGetter);
- }
-
- @Override
- public void incrementCounter(String marker, int num) {
- this.first.incrementCounter(marker, num);
- this.second.incrementCounter(marker, num);
- }
-
- @Override
- public void incrementCounter(Supplier<String> markerGetter, int num) {
- this.first.incrementCounter(markerGetter, num);
- this.second.incrementCounter(markerGetter, num);
- }
-
- @Override
- public void addZoneText(String label) {
- this.first.addZoneText(label);
- this.second.addZoneText(label);
- }
-
- @Override
- public void addZoneValue(long value) {
- this.first.addZoneValue(value);
- this.second.addZoneValue(value);
- }
-
- @Override
- public void setZoneColor(int color) {
- this.first.setZoneColor(color);
- this.second.setZoneColor(color);
- }
- }
-}
+@Deprecated(forRemoval = true) interface ProfilerFiller {} // Plazma - Completely remove Mojang's Profiler
diff --git a/src/main/java/net/minecraft/util/profiling/ProfilerPathEntry.java b/src/main/java/net/minecraft/util/profiling/ProfilerPathEntry.java
index c073262f663309e6f73e67b303927b3996ea0c16..01f2ea7461197c904038edd8920cfd4657539414 100644
--- a/src/main/java/net/minecraft/util/profiling/ProfilerPathEntry.java
+++ b/src/main/java/net/minecraft/util/profiling/ProfilerPathEntry.java
@@ -1,13 +1,3 @@
package net.minecraft.util.profiling;
-import it.unimi.dsi.fastutil.objects.Object2LongMap;
-
-public interface ProfilerPathEntry {
- long getDuration();
-
- long getMaxDuration();
-
- long getCount();
-
- Object2LongMap<String> getCounters();
-}
+@Deprecated(forRemoval = true) interface ProfilerPathEntry {} // Plazma - Completely remove Mojang's Profiler
diff --git a/src/main/java/net/minecraft/util/profiling/ResultField.java b/src/main/java/net/minecraft/util/profiling/ResultField.java
index 179dd48aeeacc0b2a42c99f6213dd23683159681..06282475e1300e095a5ba47ca14066b98f29c79f 100644
--- a/src/main/java/net/minecraft/util/profiling/ResultField.java
+++ b/src/main/java/net/minecraft/util/profiling/ResultField.java
@@ -1,28 +1,3 @@
package net.minecraft.util.profiling;
-public final class ResultField implements Comparable<ResultField> {
- public final double percentage;
- public final double globalPercentage;
- public final long count;
- public final String name;
-
- public ResultField(String name, double parentUsagePercentage, double totalUsagePercentage, long visitCount) {
- this.name = name;
- this.percentage = parentUsagePercentage;
- this.globalPercentage = totalUsagePercentage;
- this.count = visitCount;
- }
-
- @Override
- public int compareTo(ResultField resultField) {
- if (resultField.percentage < this.percentage) {
- return -1;
- } else {
- return resultField.percentage > this.percentage ? 1 : resultField.name.compareTo(this.name);
- }
- }
-
- public int getColor() {
- return (this.name.hashCode() & 11184810) + 4473924;
- }
-}
+@Deprecated(forRemoval = true) interface ResultField {} // Plazma - Completely remove Mojang's Profiler
diff --git a/src/main/java/net/minecraft/util/profiling/SingleTickProfiler.java b/src/main/java/net/minecraft/util/profiling/SingleTickProfiler.java
index 242237c605b4cd46958089063cf096ed29e73918..5ca52264bad74529f0a652efb91c3d5aa515e3d9 100644
--- a/src/main/java/net/minecraft/util/profiling/SingleTickProfiler.java
+++ b/src/main/java/net/minecraft/util/profiling/SingleTickProfiler.java
@@ -1,50 +1,3 @@
package net.minecraft.util.profiling;
-import com.mojang.logging.LogUtils;
-import java.io.File;
-import java.util.function.LongSupplier;
-import javax.annotation.Nullable;
-import net.minecraft.Util;
-import org.slf4j.Logger;
-
-public class SingleTickProfiler {
- private static final Logger LOGGER = LogUtils.getLogger();
- private final LongSupplier realTime;
- private final long saveThreshold;
- private int tick;
- private final File location;
- private ProfileCollector profiler = InactiveProfiler.INSTANCE;
-
- public SingleTickProfiler(LongSupplier timeGetter, String filename, long overtime) {
- this.realTime = timeGetter;
- this.location = new File("debug", filename);
- this.saveThreshold = overtime;
- }
-
- public ProfilerFiller startTick() {
- this.profiler = new ActiveProfiler(this.realTime, () -> this.tick, false);
- this.tick++;
- return this.profiler;
- }
-
- public void endTick() {
- if (this.profiler != InactiveProfiler.INSTANCE) {
- ProfileResults profileResults = this.profiler.getResults();
- this.profiler = InactiveProfiler.INSTANCE;
- if (profileResults.getNanoDuration() >= this.saveThreshold) {
- File file = new File(this.location, "tick-results-" + Util.getFilenameFormattedDateTime() + ".txt");
- profileResults.saveResults(file.toPath());
- LOGGER.info("Recorded long tick -- wrote info to: {}", file.getAbsolutePath());
- }
- }
- }
-
- @Nullable
- public static SingleTickProfiler createTickProfiler(String name) {
- return null;
- }
-
- public static ProfilerFiller decorateFiller(ProfilerFiller profiler, @Nullable SingleTickProfiler monitor) {
- return monitor != null ? ProfilerFiller.combine(monitor.startTick(), profiler) : profiler;
- }
-}
+@Deprecated(forRemoval = true) interface SingleTickProfiler {} // Plazma - Completely remove Mojang's Profiler
diff --git a/src/main/java/net/minecraft/util/profiling/TracyZoneFiller.java b/src/main/java/net/minecraft/util/profiling/TracyZoneFiller.java
index 8a3df14ef0cf135c5a1d2e251a51a860a3481064..73afff34ce603a9d4df725a44b3f3396d768fec7 100644
--- a/src/main/java/net/minecraft/util/profiling/TracyZoneFiller.java
+++ b/src/main/java/net/minecraft/util/profiling/TracyZoneFiller.java
@@ -1,140 +1,3 @@
package net.minecraft.util.profiling;
-import com.mojang.jtracy.Plot;
-import com.mojang.jtracy.TracyClient;
-import com.mojang.logging.LogUtils;
-import java.lang.StackWalker.Option;
-import java.lang.StackWalker.StackFrame;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Supplier;
-import net.minecraft.SharedConstants;
-import net.minecraft.util.profiling.metrics.MetricCategory;
-import org.slf4j.Logger;
-
-public class TracyZoneFiller implements ProfilerFiller {
- private static final Logger LOGGER = LogUtils.getLogger();
- private static final StackWalker STACK_WALKER = StackWalker.getInstance(Set.of(Option.RETAIN_CLASS_REFERENCE), 5);
- private final List<com.mojang.jtracy.Zone> activeZones = new ArrayList<>();
- private final Map<String, TracyZoneFiller.PlotAndValue> plots = new HashMap<>();
- private final String name = Thread.currentThread().getName();
-
- @Override
- public void startTick() {
- }
-
- @Override
- public void endTick() {
- for (TracyZoneFiller.PlotAndValue plotAndValue : this.plots.values()) {
- plotAndValue.set(0);
- }
- }
-
- @Override
- public void push(String location) {
- String string = "";
- String string2 = "";
- int i = 0;
- if (SharedConstants.IS_RUNNING_IN_IDE) {
- Optional<StackFrame> optional = STACK_WALKER.walk(
- stream -> stream.filter(
- frame -> frame.getDeclaringClass() != TracyZoneFiller.class
- && frame.getDeclaringClass() != ProfilerFiller.CombinedProfileFiller.class
- )
- .findFirst()
- );
- if (optional.isPresent()) {
- StackFrame stackFrame = optional.get();
- string = stackFrame.getMethodName();
- string2 = stackFrame.getFileName();
- i = stackFrame.getLineNumber();
- }
- }
-
- com.mojang.jtracy.Zone zone = TracyClient.beginZone(location, string, string2, i);
- this.activeZones.add(zone);
- }
-
- @Override
- public void push(Supplier<String> locationGetter) {
- this.push(locationGetter.get());
- }
-
- @Override
- public void pop() {
- if (this.activeZones.isEmpty()) {
- LOGGER.error("Tried to pop one too many times! Mismatched push() and pop()?");
- } else {
- com.mojang.jtracy.Zone zone = this.activeZones.removeLast();
- zone.close();
- }
- }
-
- @Override
- public void popPush(String location) {
- this.pop();
- this.push(location);
- }
-
- @Override
- public void popPush(Supplier<String> locationGetter) {
- this.pop();
- this.push(locationGetter.get());
- }
-
- @Override
- public void markForCharting(MetricCategory type) {
- }
-
- @Override
- public void incrementCounter(String marker, int num) {
- this.plots.computeIfAbsent(marker, markerName -> new TracyZoneFiller.PlotAndValue(this.name + " " + marker)).add(num);
- }
-
- @Override
- public void incrementCounter(Supplier<String> markerGetter, int num) {
- this.incrementCounter(markerGetter.get(), num);
- }
-
- private com.mojang.jtracy.Zone activeZone() {
- return this.activeZones.getLast();
- }
-
- @Override
- public void addZoneText(String label) {
- this.activeZone().addText(label);
- }
-
- @Override
- public void addZoneValue(long value) {
- this.activeZone().addValue(value);
- }
-
- @Override
- public void setZoneColor(int color) {
- this.activeZone().setColor(color);
- }
-
- static final class PlotAndValue {
- private final Plot plot;
- private int value;
-
- PlotAndValue(String name) {
- this.plot = TracyClient.createPlot(name);
- this.value = 0;
- }
-
- void set(int count) {
- this.value = count;
- this.plot.setValue((double)count);
- }
-
- void add(int count) {
- this.set(this.value + count);
- }
- }
-}
+@Deprecated(forRemoval = true) interface TracyZoneFiller {} // Plazma - Completely remove Mojang's Profiler
diff --git a/src/main/java/net/minecraft/util/profiling/Zone.java b/src/main/java/net/minecraft/util/profiling/Zone.java
index 33d0790b08d92acabc7892fcac2109fa7cba6651..276ef2b2e3b936b1a243bc8bf59110173d964d72 100644
--- a/src/main/java/net/minecraft/util/profiling/Zone.java
+++ b/src/main/java/net/minecraft/util/profiling/Zone.java
@@ -1,53 +1,3 @@
package net.minecraft.util.profiling;
-import java.util.function.Supplier;
-import javax.annotation.Nullable;
-
-public class Zone implements AutoCloseable {
- public static final Zone INACTIVE = new Zone(null);
- @Nullable
- private final ProfilerFiller profiler;
-
- Zone(@Nullable ProfilerFiller wrapped) {
- this.profiler = wrapped;
- }
-
- public Zone addText(String label) {
- if (this.profiler != null) {
- this.profiler.addZoneText(label);
- }
-
- return this;
- }
-
- public Zone addText(Supplier<String> labelSupplier) {
- if (this.profiler != null) {
- this.profiler.addZoneText(labelSupplier.get());
- }
-
- return this;
- }
-
- public Zone addValue(long value) {
- if (this.profiler != null) {
- this.profiler.addZoneValue(value);
- }
-
- return this;
- }
-
- public Zone setColor(int color) {
- if (this.profiler != null) {
- this.profiler.setZoneColor(color);
- }
-
- return this;
- }
-
- @Override
- public void close() {
- if (this.profiler != null) {
- this.profiler.pop();
- }
- }
-}
+@Deprecated(forRemoval = true) interface Zone {} // Plazma - Completely remove Mojang's Profiler
diff --git a/src/main/java/net/minecraft/util/profiling/metrics/MetricCategory.java b/src/main/java/net/minecraft/util/profiling/metrics/MetricCategory.java
index 2e6edbb481d1716c5d0bd30cf518809a7953ceea..cbfe67beb6e1962455bbcf18253b67fd4047f914 100644
--- a/src/main/java/net/minecraft/util/profiling/metrics/MetricCategory.java
+++ b/src/main/java/net/minecraft/util/profiling/metrics/MetricCategory.java
@@ -1,23 +1,3 @@
package net.minecraft.util.profiling.metrics;
-public enum MetricCategory {
- PATH_FINDING("pathfinding"),
- EVENT_LOOPS("event-loops"),
- CONSECUTIVE_EXECUTORS("consecutive-executors"),
- TICK_LOOP("ticking"),
- JVM("jvm"),
- CHUNK_RENDERING("chunk rendering"),
- CHUNK_RENDERING_DISPATCHING("chunk rendering dispatching"),
- CPU("cpu"),
- GPU("gpu");
-
- private final String description;
-
- private MetricCategory(final String name) {
- this.description = name;
- }
-
- public String getDescription() {
- return this.description;
- }
-}
+@Deprecated(forRemoval = true) interface MetricCategory {} // Plazma - Completely remove Mojang's Profiler
diff --git a/src/main/java/net/minecraft/util/profiling/metrics/MetricSampler.java b/src/main/java/net/minecraft/util/profiling/metrics/MetricSampler.java
index dd2bf15d22e5839ca986d3e824fb785786af86c8..87d3c172cffd4e6f3400895594fee540d838a911 100644
--- a/src/main/java/net/minecraft/util/profiling/metrics/MetricSampler.java
+++ b/src/main/java/net/minecraft/util/profiling/metrics/MetricSampler.java
@@ -1,213 +1,3 @@
package net.minecraft.util.profiling.metrics;
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import it.unimi.dsi.fastutil.ints.Int2DoubleMap;
-import it.unimi.dsi.fastutil.ints.Int2DoubleOpenHashMap;
-import java.util.Locale;
-import java.util.function.Consumer;
-import java.util.function.DoubleSupplier;
-import java.util.function.ToDoubleFunction;
-import javax.annotation.Nullable;
-
-public class MetricSampler {
- private final String name;
- private final MetricCategory category;
- private final DoubleSupplier sampler;
- private final ByteBuf ticks;
- private final ByteBuf values;
- private volatile boolean isRunning;
- @Nullable
- private final Runnable beforeTick;
- @Nullable
- final MetricSampler.ThresholdTest thresholdTest;
- private double currentValue;
-
- protected MetricSampler(
- String name, MetricCategory type, DoubleSupplier retriever, @Nullable Runnable startAction, @Nullable MetricSampler.ThresholdTest deviationChecker
- ) {
- this.name = name;
- this.category = type;
- this.beforeTick = startAction;
- this.sampler = retriever;
- this.thresholdTest = deviationChecker;
- this.values = ByteBufAllocator.DEFAULT.buffer();
- this.ticks = ByteBufAllocator.DEFAULT.buffer();
- this.isRunning = true;
- }
-
- public static MetricSampler create(String name, MetricCategory type, DoubleSupplier retriever) {
- return new MetricSampler(name, type, retriever, null, null);
- }
-
- public static <T> MetricSampler create(String name, MetricCategory type, T context, ToDoubleFunction<T> retriever) {
- return builder(name, type, retriever, context).build();
- }
-
- public static <T> MetricSampler.MetricSamplerBuilder<T> builder(String name, MetricCategory type, ToDoubleFunction<T> retriever, T context) {
- return new MetricSampler.MetricSamplerBuilder<>(name, type, retriever, context);
- }
-
- public void onStartTick() {
- if (!this.isRunning) {
- throw new IllegalStateException("Not running");
- } else {
- if (this.beforeTick != null) {
- this.beforeTick.run();
- }
- }
- }
-
- public void onEndTick(int tick) {
- this.verifyRunning();
- this.currentValue = this.sampler.getAsDouble();
- this.values.writeDouble(this.currentValue);
- this.ticks.writeInt(tick);
- }
-
- public void onFinished() {
- this.verifyRunning();
- this.values.release();
- this.ticks.release();
- this.isRunning = false;
- }
-
- private void verifyRunning() {
- if (!this.isRunning) {
- throw new IllegalStateException(String.format(Locale.ROOT, "Sampler for metric %s not started!", this.name));
- }
- }
-
- DoubleSupplier getSampler() {
- return this.sampler;
- }
-
- public String getName() {
- return this.name;
- }
-
- public MetricCategory getCategory() {
- return this.category;
- }
-
- public MetricSampler.SamplerResult result() {
- Int2DoubleMap int2DoubleMap = new Int2DoubleOpenHashMap();
- int i = Integer.MIN_VALUE;
- int j = Integer.MIN_VALUE;
-
- while (this.values.isReadable(8)) {
- int k = this.ticks.readInt();
- if (i == Integer.MIN_VALUE) {
- i = k;
- }
-
- int2DoubleMap.put(k, this.values.readDouble());
- j = k;
- }
-
- return new MetricSampler.SamplerResult(i, j, int2DoubleMap);
- }
-
- public boolean triggersThreshold() {
- return this.thresholdTest != null && this.thresholdTest.test(this.currentValue);
- }
-
- @Override
- public boolean equals(Object object) {
- if (this == object) {
- return true;
- } else if (object != null && this.getClass() == object.getClass()) {
- MetricSampler metricSampler = (MetricSampler)object;
- return this.name.equals(metricSampler.name) && this.category.equals(metricSampler.category);
- } else {
- return false;
- }
- }
-
- @Override
- public int hashCode() {
- return this.name.hashCode();
- }
-
- public static class MetricSamplerBuilder<T> {
- private final String name;
- private final MetricCategory category;
- private final DoubleSupplier sampler;
- private final T context;
- @Nullable
- private Runnable beforeTick;
- @Nullable
- private MetricSampler.ThresholdTest thresholdTest;
-
- public MetricSamplerBuilder(String name, MetricCategory type, ToDoubleFunction<T> timeFunction, T context) {
- this.name = name;
- this.category = type;
- this.sampler = () -> timeFunction.applyAsDouble(context);
- this.context = context;
- }
-
- public MetricSampler.MetricSamplerBuilder<T> withBeforeTick(Consumer<T> action) {
- this.beforeTick = () -> action.accept(this.context);
- return this;
- }
-
- public MetricSampler.MetricSamplerBuilder<T> withThresholdAlert(MetricSampler.ThresholdTest deviationChecker) {
- this.thresholdTest = deviationChecker;
- return this;
- }
-
- public MetricSampler build() {
- return new MetricSampler(this.name, this.category, this.sampler, this.beforeTick, this.thresholdTest);
- }
- }
-
- public static class SamplerResult {
- private final Int2DoubleMap recording;
- private final int firstTick;
- private final int lastTick;
-
- public SamplerResult(int startTick, int endTick, Int2DoubleMap values) {
- this.firstTick = startTick;
- this.lastTick = endTick;
- this.recording = values;
- }
-
- public double valueAtTick(int tick) {
- return this.recording.get(tick);
- }
-
- public int getFirstTick() {
- return this.firstTick;
- }
-
- public int getLastTick() {
- return this.lastTick;
- }
- }
-
- public interface ThresholdTest {
- boolean test(double value);
- }
-
- public static class ValueIncreasedByPercentage implements MetricSampler.ThresholdTest {
- private final float percentageIncreaseThreshold;
- private double previousValue = Double.MIN_VALUE;
-
- public ValueIncreasedByPercentage(float threshold) {
- this.percentageIncreaseThreshold = threshold;
- }
-
- @Override
- public boolean test(double value) {
- boolean bl2;
- if (this.previousValue != Double.MIN_VALUE && !(value <= this.previousValue)) {
- bl2 = (value - this.previousValue) / this.previousValue >= (double)this.percentageIncreaseThreshold;
- } else {
- bl2 = false;
- }
-
- this.previousValue = value;
- return bl2;
- }
- }
-}
+@Deprecated(forRemoval = true) interface MetricSampler {} // Plazma - Completely remove Mojang's Profiler
diff --git a/src/main/java/net/minecraft/util/profiling/metrics/MetricsRegistry.java b/src/main/java/net/minecraft/util/profiling/metrics/MetricsRegistry.java
index c22a91ee393744a4eaffe1fff168b18ac1bc55bd..2a0885bed637afe31710229c6186b79389f3cb4f 100644
--- a/src/main/java/net/minecraft/util/profiling/metrics/MetricsRegistry.java
+++ b/src/main/java/net/minecraft/util/profiling/metrics/MetricsRegistry.java
@@ -1,85 +1,3 @@
package net.minecraft.util.profiling.metrics;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.WeakHashMap;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
-public class MetricsRegistry {
- public static final MetricsRegistry INSTANCE = new MetricsRegistry();
- private final WeakHashMap<ProfilerMeasured, Void> measuredInstances = new WeakHashMap<>();
-
- private MetricsRegistry() {
- }
-
- public void add(ProfilerMeasured executor) {
- this.measuredInstances.put(executor, null);
- }
-
- public List<MetricSampler> getRegisteredSamplers() {
- Map<String, List<MetricSampler>> map = this.measuredInstances
- .keySet()
- .stream()
- .flatMap(executor -> executor.profiledMetrics().stream())
- .collect(Collectors.groupingBy(MetricSampler::getName));
- return aggregateDuplicates(map);
- }
-
- private static List<MetricSampler> aggregateDuplicates(Map<String, List<MetricSampler>> samplers) {
- return samplers.entrySet().stream().map(entry -> {
- String string = entry.getKey();
- List<MetricSampler> list = entry.getValue();
- return (MetricSampler)(list.size() > 1 ? new MetricsRegistry.AggregatedMetricSampler(string, list) : list.get(0));
- }).collect(Collectors.toList());
- }
-
- static class AggregatedMetricSampler extends MetricSampler {
- private final List<MetricSampler> delegates;
-
- AggregatedMetricSampler(String id, List<MetricSampler> delegates) {
- super(id, delegates.get(0).getCategory(), () -> averageValueFromDelegates(delegates), () -> beforeTick(delegates), thresholdTest(delegates));
- this.delegates = delegates;
- }
-
- private static MetricSampler.ThresholdTest thresholdTest(List<MetricSampler> delegates) {
- return value -> delegates.stream().anyMatch(sampler -> sampler.thresholdTest != null && sampler.thresholdTest.test(value));
- }
-
- private static void beforeTick(List<MetricSampler> samplers) {
- for (MetricSampler metricSampler : samplers) {
- metricSampler.onStartTick();
- }
- }
-
- private static double averageValueFromDelegates(List<MetricSampler> samplers) {
- double d = 0.0;
-
- for (MetricSampler metricSampler : samplers) {
- d += metricSampler.getSampler().getAsDouble();
- }
-
- return d / (double)samplers.size();
- }
-
- @Override
- public boolean equals(@Nullable Object object) {
- if (this == object) {
- return true;
- } else if (object == null || this.getClass() != object.getClass()) {
- return false;
- } else if (!super.equals(object)) {
- return false;
- } else {
- MetricsRegistry.AggregatedMetricSampler aggregatedMetricSampler = (MetricsRegistry.AggregatedMetricSampler)object;
- return this.delegates.equals(aggregatedMetricSampler.delegates);
- }
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(super.hashCode(), this.delegates);
- }
- }
-}
+@Deprecated(forRemoval = true) interface MetricsRegistry {} // Plazma - Completely remove Mojang's Profiler
diff --git a/src/main/java/net/minecraft/util/profiling/metrics/MetricsSamplerProvider.java b/src/main/java/net/minecraft/util/profiling/metrics/MetricsSamplerProvider.java
index 07f78c451e5330296c38f6b599d979610a03381f..2520855b7ca25520d5cba8ba072b16e256d5a0d8 100644
--- a/src/main/java/net/minecraft/util/profiling/metrics/MetricsSamplerProvider.java
+++ b/src/main/java/net/minecraft/util/profiling/metrics/MetricsSamplerProvider.java
@@ -1,9 +1,3 @@
package net.minecraft.util.profiling.metrics;
-import java.util.Set;
-import java.util.function.Supplier;
-import net.minecraft.util.profiling.ProfileCollector;
-
-public interface MetricsSamplerProvider {
- Set<MetricSampler> samplers(Supplier<ProfileCollector> profilerSupplier);
-}
+@Deprecated(forRemoval = true) interface MetricsSamplerProvider {} // Plazma - Completely remove Mojang's Profiler
diff --git a/src/main/java/net/minecraft/util/profiling/metrics/ProfilerMeasured.java b/src/main/java/net/minecraft/util/profiling/metrics/ProfilerMeasured.java
index 3057e9caa1936d114e07b3dfbd0dffd8aca1223c..51cde2a829dea51513ca8f689829cd3a8d4fbd48 100644
--- a/src/main/java/net/minecraft/util/profiling/metrics/ProfilerMeasured.java
+++ b/src/main/java/net/minecraft/util/profiling/metrics/ProfilerMeasured.java
@@ -1,7 +1,3 @@
package net.minecraft.util.profiling.metrics;
-import java.util.List;
-
-public interface ProfilerMeasured {
- List<MetricSampler> profiledMetrics();
-}
+@Deprecated(forRemoval = true) interface ProfilerMeasured {} // Plazma - Completely remove Mojang's Profiler
diff --git a/src/main/java/net/minecraft/util/profiling/metrics/profiling/ActiveMetricsRecorder.java b/src/main/java/net/minecraft/util/profiling/metrics/profiling/ActiveMetricsRecorder.java
index c64e1afbff4a0e32beb465ae10fff6e9f21f6af6..b0bad6ab38d118f07b0da718c99df01639f64af9 100644
--- a/src/main/java/net/minecraft/util/profiling/metrics/profiling/ActiveMetricsRecorder.java
+++ b/src/main/java/net/minecraft/util/profiling/metrics/profiling/ActiveMetricsRecorder.java
@@ -1,168 +1,3 @@
package net.minecraft.util.profiling.metrics.profiling;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Lists;
-import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
-import java.nio.file.Path;
-import java.time.Instant;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.Executor;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
-import java.util.function.LongSupplier;
-import javax.annotation.Nullable;
-import net.minecraft.util.profiling.ActiveProfiler;
-import net.minecraft.util.profiling.ContinuousProfiler;
-import net.minecraft.util.profiling.EmptyProfileResults;
-import net.minecraft.util.profiling.InactiveProfiler;
-import net.minecraft.util.profiling.ProfileCollector;
-import net.minecraft.util.profiling.ProfileResults;
-import net.minecraft.util.profiling.ProfilerFiller;
-import net.minecraft.util.profiling.metrics.MetricSampler;
-import net.minecraft.util.profiling.metrics.MetricsSamplerProvider;
-import net.minecraft.util.profiling.metrics.storage.MetricsPersister;
-import net.minecraft.util.profiling.metrics.storage.RecordedDeviation;
-
-public class ActiveMetricsRecorder implements MetricsRecorder {
- public static final int PROFILING_MAX_DURATION_SECONDS = 10;
- @Nullable
- private static Consumer<Path> globalOnReportFinished = null;
- private final Map<MetricSampler, List<RecordedDeviation>> deviationsBySampler = new Object2ObjectOpenHashMap<>();
- private final ContinuousProfiler taskProfiler;
- private final Executor ioExecutor;
- private final MetricsPersister metricsPersister;
- private final Consumer<ProfileResults> onProfilingEnd;
- private final Consumer<Path> onReportFinished;
- private final MetricsSamplerProvider metricsSamplerProvider;
- private final LongSupplier wallTimeSource;
- private final long deadlineNano;
- private int currentTick;
- private ProfileCollector singleTickProfiler;
- private volatile boolean killSwitch;
- private Set<MetricSampler> thisTickSamplers = ImmutableSet.of();
-
- private ActiveMetricsRecorder(
- MetricsSamplerProvider samplerSource,
- LongSupplier timeGetter,
- Executor dumpExecutor,
- MetricsPersister dumper,
- Consumer<ProfileResults> resultConsumer,
- Consumer<Path> dumpConsumer
- ) {
- this.metricsSamplerProvider = samplerSource;
- this.wallTimeSource = timeGetter;
- this.taskProfiler = new ContinuousProfiler(timeGetter, () -> this.currentTick);
- this.ioExecutor = dumpExecutor;
- this.metricsPersister = dumper;
- this.onProfilingEnd = resultConsumer;
- this.onReportFinished = globalOnReportFinished == null ? dumpConsumer : dumpConsumer.andThen(globalOnReportFinished);
- this.deadlineNano = timeGetter.getAsLong() + TimeUnit.NANOSECONDS.convert(10L, TimeUnit.SECONDS);
- this.singleTickProfiler = new ActiveProfiler(this.wallTimeSource, () -> this.currentTick, false);
- this.taskProfiler.enable();
- }
-
- public static ActiveMetricsRecorder createStarted(
- MetricsSamplerProvider source,
- LongSupplier timeGetter,
- Executor dumpExecutor,
- MetricsPersister dumper,
- Consumer<ProfileResults> resultConsumer,
- Consumer<Path> dumpConsumer
- ) {
- return new ActiveMetricsRecorder(source, timeGetter, dumpExecutor, dumper, resultConsumer, dumpConsumer);
- }
-
- @Override
- public synchronized void end() {
- if (this.isRecording()) {
- this.killSwitch = true;
- }
- }
-
- @Override
- public synchronized void cancel() {
- if (this.isRecording()) {
- this.singleTickProfiler = InactiveProfiler.INSTANCE;
- this.onProfilingEnd.accept(EmptyProfileResults.EMPTY);
- this.cleanup(this.thisTickSamplers);
- }
- }
-
- @Override
- public void startTick() {
- this.verifyStarted();
- this.thisTickSamplers = this.metricsSamplerProvider.samplers(() -> this.singleTickProfiler);
-
- for (MetricSampler metricSampler : this.thisTickSamplers) {
- metricSampler.onStartTick();
- }
-
- this.currentTick++;
- }
-
- @Override
- public void endTick() {
- this.verifyStarted();
- if (this.currentTick != 0) {
- for (MetricSampler metricSampler : this.thisTickSamplers) {
- metricSampler.onEndTick(this.currentTick);
- if (metricSampler.triggersThreshold()) {
- RecordedDeviation recordedDeviation = new RecordedDeviation(Instant.now(), this.currentTick, this.singleTickProfiler.getResults());
- this.deviationsBySampler.computeIfAbsent(metricSampler, s -> Lists.newArrayList()).add(recordedDeviation);
- }
- }
-
- if (!this.killSwitch && this.wallTimeSource.getAsLong() <= this.deadlineNano) {
- this.singleTickProfiler = new ActiveProfiler(this.wallTimeSource, () -> this.currentTick, false);
- } else {
- this.killSwitch = false;
- ProfileResults profileResults = this.taskProfiler.getResults();
- this.singleTickProfiler = InactiveProfiler.INSTANCE;
- this.onProfilingEnd.accept(profileResults);
- this.scheduleSaveResults(profileResults);
- }
- }
- }
-
- @Override
- public boolean isRecording() {
- return this.taskProfiler.isEnabled();
- }
-
- @Override
- public ProfilerFiller getProfiler() {
- return ProfilerFiller.combine(this.taskProfiler.getFiller(), this.singleTickProfiler);
- }
-
- private void verifyStarted() {
- if (!this.isRecording()) {
- throw new IllegalStateException("Not started!");
- }
- }
-
- private void scheduleSaveResults(ProfileResults result) {
- HashSet<MetricSampler> hashSet = new HashSet<>(this.thisTickSamplers);
- this.ioExecutor.execute(() -> {
- Path path = this.metricsPersister.saveReports(hashSet, this.deviationsBySampler, result);
- this.cleanup(hashSet);
- this.onReportFinished.accept(path);
- });
- }
-
- private void cleanup(Collection<MetricSampler> samplers) {
- for (MetricSampler metricSampler : samplers) {
- metricSampler.onFinished();
- }
-
- this.deviationsBySampler.clear();
- this.taskProfiler.disable();
- }
-
- public static void registerGlobalCompletionCallback(Consumer<Path> consumer) {
- globalOnReportFinished = consumer;
- }
-}
+@Deprecated(forRemoval = true) interface ActiveMetricsRecorder {} // Plazma - Completely remove Mojang's Profiler
diff --git a/src/main/java/net/minecraft/util/profiling/metrics/profiling/InactiveMetricsRecorder.java b/src/main/java/net/minecraft/util/profiling/metrics/profiling/InactiveMetricsRecorder.java
index 12d7b7c86115b667bd8f940206985d9ed4b837d4..97dcd747868e0fd61de5731aee8abd9e49f14d88 100644
--- a/src/main/java/net/minecraft/util/profiling/metrics/profiling/InactiveMetricsRecorder.java
+++ b/src/main/java/net/minecraft/util/profiling/metrics/profiling/InactiveMetricsRecorder.java
@@ -1,34 +1,3 @@
package net.minecraft.util.profiling.metrics.profiling;
-import net.minecraft.util.profiling.InactiveProfiler;
-import net.minecraft.util.profiling.ProfilerFiller;
-
-public class InactiveMetricsRecorder implements MetricsRecorder {
- public static final MetricsRecorder INSTANCE = new InactiveMetricsRecorder();
-
- @Override
- public void end() {
- }
-
- @Override
- public void cancel() {
- }
-
- @Override
- public void startTick() {
- }
-
- @Override
- public boolean isRecording() {
- return false;
- }
-
- @Override
- public ProfilerFiller getProfiler() {
- return InactiveProfiler.INSTANCE;
- }
-
- @Override
- public void endTick() {
- }
-}
+@Deprecated(forRemoval = true) interface InactiveMetricsRecorder {} // Plazma - Completely remove Mojang's Profiler
diff --git a/src/main/java/net/minecraft/util/profiling/metrics/profiling/MetricsRecorder.java b/src/main/java/net/minecraft/util/profiling/metrics/profiling/MetricsRecorder.java
index 48e7211e01691a677c52cf1f5982b0c179eaf83b..15da03b91bb494e2155529962e9afb42db4073b9 100644
--- a/src/main/java/net/minecraft/util/profiling/metrics/profiling/MetricsRecorder.java
+++ b/src/main/java/net/minecraft/util/profiling/metrics/profiling/MetricsRecorder.java
@@ -1,17 +1,3 @@
package net.minecraft.util.profiling.metrics.profiling;
-import net.minecraft.util.profiling.ProfilerFiller;
-
-public interface MetricsRecorder {
- void end();
-
- void cancel();
-
- void startTick();
-
- boolean isRecording();
-
- ProfilerFiller getProfiler();
-
- void endTick();
-}
+@Deprecated(forRemoval = true) interface MetricsRecorder {} // Plazma - Completely remove Mojang's Profiler
diff --git a/src/main/java/net/minecraft/util/profiling/metrics/profiling/ProfilerSamplerAdapter.java b/src/main/java/net/minecraft/util/profiling/metrics/profiling/ProfilerSamplerAdapter.java
index cf47ee0f4ec9ffb130b04c7cf92e7907f9b791ef..a1490bd2f5a2eaf0f277feb728c02b036d85fcaa 100644
--- a/src/main/java/net/minecraft/util/profiling/metrics/profiling/ProfilerSamplerAdapter.java
+++ b/src/main/java/net/minecraft/util/profiling/metrics/profiling/ProfilerSamplerAdapter.java
@@ -1,37 +1,3 @@
package net.minecraft.util.profiling.metrics.profiling;
-import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
-import java.util.Set;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-import net.minecraft.util.TimeUtil;
-import net.minecraft.util.profiling.ActiveProfiler;
-import net.minecraft.util.profiling.ProfileCollector;
-import net.minecraft.util.profiling.metrics.MetricCategory;
-import net.minecraft.util.profiling.metrics.MetricSampler;
-
-public class ProfilerSamplerAdapter {
- private final Set<String> previouslyFoundSamplerNames = new ObjectOpenHashSet<>();
-
- public Set<MetricSampler> newSamplersFoundInProfiler(Supplier<ProfileCollector> profilerSupplier) {
- Set<MetricSampler> set = profilerSupplier.get()
- .getChartedPaths()
- .stream()
- .filter(target -> !this.previouslyFoundSamplerNames.contains(target.getLeft()))
- .map(target -> samplerForProfilingPath(profilerSupplier, target.getLeft(), target.getRight()))
- .collect(Collectors.toSet());
-
- for (MetricSampler metricSampler : set) {
- this.previouslyFoundSamplerNames.add(metricSampler.getName());
- }
-
- return set;
- }
-
- private static MetricSampler samplerForProfilingPath(Supplier<ProfileCollector> profilerSupplier, String id, MetricCategory type) {
- return MetricSampler.create(id, type, () -> {
- ActiveProfiler.PathEntry pathEntry = profilerSupplier.get().getEntry(id);
- return pathEntry == null ? 0.0 : (double)pathEntry.getMaxDuration() / (double)TimeUtil.NANOSECONDS_PER_MILLISECOND;
- });
- }
-}
+@Deprecated(forRemoval = true) interface ProfilerSamplerAdapter {} // Plazma - Completely remove Mojang's Profiler
diff --git a/src/main/java/net/minecraft/util/profiling/metrics/profiling/ServerMetricsSamplersProvider.java b/src/main/java/net/minecraft/util/profiling/metrics/profiling/ServerMetricsSamplersProvider.java
index c82ea3278c9631f0575a57ff1000fea4fbfa1fd9..dc65068e952c604ac67c8b1e8f3341437a2b3410 100644
--- a/src/main/java/net/minecraft/util/profiling/metrics/profiling/ServerMetricsSamplersProvider.java
+++ b/src/main/java/net/minecraft/util/profiling/metrics/profiling/ServerMetricsSamplersProvider.java
@@ -1,106 +1,3 @@
package net.minecraft.util.profiling.metrics.profiling;
-import com.google.common.base.Stopwatch;
-import com.google.common.base.Ticker;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSet.Builder;
-import com.mojang.logging.LogUtils;
-import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.function.LongSupplier;
-import java.util.function.Supplier;
-import java.util.function.ToDoubleFunction;
-import java.util.stream.IntStream;
-import net.minecraft.SystemReport;
-import net.minecraft.util.profiling.ProfileCollector;
-import net.minecraft.util.profiling.metrics.MetricCategory;
-import net.minecraft.util.profiling.metrics.MetricSampler;
-import net.minecraft.util.profiling.metrics.MetricsRegistry;
-import net.minecraft.util.profiling.metrics.MetricsSamplerProvider;
-import org.slf4j.Logger;
-import oshi.SystemInfo;
-import oshi.hardware.CentralProcessor;
-
-public class ServerMetricsSamplersProvider implements MetricsSamplerProvider {
- private static final Logger LOGGER = LogUtils.getLogger();
- private final Set<MetricSampler> samplers = new ObjectOpenHashSet<>();
- private final ProfilerSamplerAdapter samplerFactory = new ProfilerSamplerAdapter();
-
- public ServerMetricsSamplersProvider(LongSupplier nanoTimeSupplier, boolean includeSystem) {
- this.samplers.add(tickTimeSampler(nanoTimeSupplier));
- if (includeSystem) {
- this.samplers.addAll(runtimeIndependentSamplers());
- }
- }
-
- public static Set<MetricSampler> runtimeIndependentSamplers() {
- Builder<MetricSampler> builder = ImmutableSet.builder();
-
- try {
- ServerMetricsSamplersProvider.CpuStats cpuStats = new ServerMetricsSamplersProvider.CpuStats();
- IntStream.range(0, cpuStats.nrOfCpus)
- .mapToObj(index -> MetricSampler.create("cpu#" + index, MetricCategory.CPU, () -> cpuStats.loadForCpu(index)))
- .forEach(builder::add);
- } catch (Throwable var2) {
- LOGGER.warn("Failed to query cpu, no cpu stats will be recorded", var2);
- }
-
- builder.add(
- MetricSampler.create(
- "heap MiB", MetricCategory.JVM, () -> (double)SystemReport.sizeInMiB(Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory())
- )
- );
- builder.addAll(MetricsRegistry.INSTANCE.getRegisteredSamplers());
- return builder.build();
- }
-
- @Override
- public Set<MetricSampler> samplers(Supplier<ProfileCollector> profilerSupplier) {
- this.samplers.addAll(this.samplerFactory.newSamplersFoundInProfiler(profilerSupplier));
- return this.samplers;
- }
-
- public static MetricSampler tickTimeSampler(LongSupplier nanoTimeSupplier) {
- Stopwatch stopwatch = Stopwatch.createUnstarted(new Ticker() {
- @Override
- public long read() {
- return nanoTimeSupplier.getAsLong();
- }
- });
- ToDoubleFunction<Stopwatch> toDoubleFunction = watch -> {
- if (watch.isRunning()) {
- watch.stop();
- }
-
- long l = watch.elapsed(TimeUnit.NANOSECONDS);
- watch.reset();
- return (double)l;
- };
- MetricSampler.ValueIncreasedByPercentage valueIncreasedByPercentage = new MetricSampler.ValueIncreasedByPercentage(2.0F);
- return MetricSampler.builder("ticktime", MetricCategory.TICK_LOOP, toDoubleFunction, stopwatch)
- .withBeforeTick(Stopwatch::start)
- .withThresholdAlert(valueIncreasedByPercentage)
- .build();
- }
-
- static class CpuStats {
- private final SystemInfo systemInfo = new SystemInfo();
- private final CentralProcessor processor = this.systemInfo.getHardware().getProcessor();
- public final int nrOfCpus = this.processor.getLogicalProcessorCount();
- private long[][] previousCpuLoadTick = this.processor.getProcessorCpuLoadTicks();
- private double[] currentLoad = this.processor.getProcessorCpuLoadBetweenTicks(this.previousCpuLoadTick);
- private long lastPollMs;
-
- public double loadForCpu(int index) {
- long l = System.currentTimeMillis();
- if (this.lastPollMs == 0L || this.lastPollMs + 501L < l) {
- this.currentLoad = this.processor.getProcessorCpuLoadBetweenTicks(this.previousCpuLoadTick);
- this.previousCpuLoadTick = this.processor.getProcessorCpuLoadTicks();
- this.lastPollMs = l;
- }
-
- return this.currentLoad[index] * 100.0;
- }
- }
-}
+@Deprecated(forRemoval = true) interface ServerMetricsSamplersProvider {} // Plazma - Completely remove Mojang's Profiler
diff --git a/src/main/java/net/minecraft/util/profiling/metrics/storage/MetricsPersister.java b/src/main/java/net/minecraft/util/profiling/metrics/storage/MetricsPersister.java
index 8579309bf1b6ad0e42aa9431a8d274ee810911fd..31638f0a0e5c0b7a6f22cb10dbfa861efde4c178 100644
--- a/src/main/java/net/minecraft/util/profiling/metrics/storage/MetricsPersister.java
+++ b/src/main/java/net/minecraft/util/profiling/metrics/storage/MetricsPersister.java
@@ -1,125 +1,3 @@
package net.minecraft.util.profiling.metrics.storage;
-import com.mojang.logging.LogUtils;
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.io.Writer;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import net.minecraft.Util;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.util.CsvOutput;
-import net.minecraft.util.profiling.ProfileResults;
-import net.minecraft.util.profiling.metrics.MetricCategory;
-import net.minecraft.util.profiling.metrics.MetricSampler;
-import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-
-public class MetricsPersister {
- public static final Path PROFILING_RESULTS_DIR = Paths.get("debug/profiling");
- public static final String METRICS_DIR_NAME = "metrics";
- public static final String DEVIATIONS_DIR_NAME = "deviations";
- public static final String PROFILING_RESULT_FILENAME = "profiling.txt";
- private static final Logger LOGGER = LogUtils.getLogger();
- private final String rootFolderName;
-
- public MetricsPersister(String type) {
- this.rootFolderName = type;
- }
-
- public Path saveReports(Set<MetricSampler> samplers, Map<MetricSampler, List<RecordedDeviation>> deviations, ProfileResults result) {
- try {
- Files.createDirectories(PROFILING_RESULTS_DIR);
- } catch (IOException var8) {
- throw new UncheckedIOException(var8);
- }
-
- try {
- Path path = Files.createTempDirectory("minecraft-profiling");
- path.toFile().deleteOnExit();
- Files.createDirectories(PROFILING_RESULTS_DIR);
- Path path2 = path.resolve(this.rootFolderName);
- Path path3 = path2.resolve("metrics");
- this.saveMetrics(samplers, path3);
- if (!deviations.isEmpty()) {
- this.saveDeviations(deviations, path2.resolve("deviations"));
- }
-
- this.saveProfilingTaskExecutionResult(result, path2);
- return path;
- } catch (IOException var7) {
- throw new UncheckedIOException(var7);
- }
- }
-
- private void saveMetrics(Set<MetricSampler> samplers, Path directory) {
- if (samplers.isEmpty()) {
- throw new IllegalArgumentException("Expected at least one sampler to persist");
- } else {
- Map<MetricCategory, List<MetricSampler>> map = samplers.stream().collect(Collectors.groupingBy(MetricSampler::getCategory));
- map.forEach((type, sampler) -> this.saveCategory(type, (List<MetricSampler>)sampler, directory));
- }
- }
-
- private void saveCategory(MetricCategory type, List<MetricSampler> samplers, Path directory) {
- Path path = directory.resolve(Util.sanitizeName(type.getDescription(), ResourceLocation::validPathChar) + ".csv");
- Writer writer = null;
-
- try {
- Files.createDirectories(path.getParent());
- writer = Files.newBufferedWriter(path, StandardCharsets.UTF_8);
- CsvOutput.Builder builder = CsvOutput.builder();
- builder.addColumn("@tick");
-
- for (MetricSampler metricSampler : samplers) {
- builder.addColumn(metricSampler.getName());
- }
-
- CsvOutput csvOutput = builder.build(writer);
- List<MetricSampler.SamplerResult> list = samplers.stream().map(MetricSampler::result).collect(Collectors.toList());
- int i = list.stream().mapToInt(MetricSampler.SamplerResult::getFirstTick).summaryStatistics().getMin();
- int j = list.stream().mapToInt(MetricSampler.SamplerResult::getLastTick).summaryStatistics().getMax();
-
- for (int k = i; k <= j; k++) {
- int l = k;
- Stream<String> stream = list.stream().map(data -> String.valueOf(data.valueAtTick(l)));
- Object[] objects = Stream.concat(Stream.of(String.valueOf(k)), stream).toArray(String[]::new);
- csvOutput.writeRow(objects);
- }
-
- LOGGER.info("Flushed metrics to {}", path);
- } catch (Exception var18) {
- LOGGER.error("Could not save profiler results to {}", path, var18);
- } finally {
- IOUtils.closeQuietly(writer);
- }
- }
-
- private void saveDeviations(Map<MetricSampler, List<RecordedDeviation>> deviations, Path deviationsDirectory) {
- DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd_HH.mm.ss.SSS", Locale.UK).withZone(ZoneId.systemDefault());
- deviations.forEach(
- (sampler, sampleDeviations) -> sampleDeviations.forEach(
- deviation -> {
- String string = dateTimeFormatter.format(deviation.timestamp);
- Path path2 = deviationsDirectory.resolve(Util.sanitizeName(sampler.getName(), ResourceLocation::validPathChar))
- .resolve(String.format(Locale.ROOT, "%d@%s.txt", deviation.tick, string));
- deviation.profilerResultAtTick.saveResults(path2);
- }
- )
- );
- }
-
- private void saveProfilingTaskExecutionResult(ProfileResults result, Path directory) {
- result.saveResults(directory.resolve("profiling.txt"));
- }
-}
+@Deprecated(forRemoval = true) interface MetricsPersister {} // Plazma - Completely remove Mojang's Profiler
diff --git a/src/main/java/net/minecraft/util/profiling/metrics/storage/RecordedDeviation.java b/src/main/java/net/minecraft/util/profiling/metrics/storage/RecordedDeviation.java
index f012d23b22b1a9d1acb6c020c66dc727f7fe9e1a..4ba8dd84105290674ee4c688f6912b5dd2e41f97 100644
--- a/src/main/java/net/minecraft/util/profiling/metrics/storage/RecordedDeviation.java
+++ b/src/main/java/net/minecraft/util/profiling/metrics/storage/RecordedDeviation.java
@@ -1,16 +1,3 @@
package net.minecraft.util.profiling.metrics.storage;
-import java.time.Instant;
-import net.minecraft.util.profiling.ProfileResults;
-
-public final class RecordedDeviation {
- public final Instant timestamp;
- public final int tick;
- public final ProfileResults profilerResultAtTick;
-
- public RecordedDeviation(Instant instant, int ticks, ProfileResults result) {
- this.timestamp = instant;
- this.tick = ticks;
- this.profilerResultAtTick = result;
- }
-}
+@Deprecated(forRemoval = true) interface RecordedDeviation {} // Plazma - Completely remove Mojang's Profiler
Reference in New Issue View Git Blame Copy Permalink