Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

unify profiling under the n/m/util/profiling package #656

Draft
wants to merge 4 commits into
base: 1.21.4-pre2
Choose a base branch
from
Draft

unify profiling under the n/m/util/profiling package #656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c6e0bf6
start refactoring profiling
ix0rai Oct 17, 2024
a42a632
Merge branch '1.21.2-rc1' into profiling
github-actions[bot] Oct 17, 2024
2dc71c3
Merge branch '1.21.2' into profiling
github-actions[bot] Oct 22, 2024
4f1732b
Merge branch '1.21.3' into profiling
github-actions[bot] Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...craft/util/profiler/DebugRecorder.mapping → ...raft/util/profiling/DebugRecorder.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_flupnwyk net/minecraft/util/profiler/DebugRecorder
CLASS net/minecraft/unmapped/C_flupnwyk net/minecraft/util/profiling/DebugRecorder
FIELD f_ehauhfkt samplers Ljava/util/Set;
FIELD f_fcahfgct ticks I
FIELD f_fnllcktc stopping Z
Expand Down
2 changes: 1 addition & 1 deletion ...minecraft/util/profiler/Deviation.mapping → ...inecraft/util/profiling/Deviation.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_xghvuxqt net/minecraft/util/profiler/Deviation
CLASS net/minecraft/unmapped/C_xghvuxqt net/minecraft/util/profiling/Deviation
FIELD f_dgezfeor result Lnet/minecraft/unmapped/C_dzczqjri;
FIELD f_jfjmsafz ticks I
FIELD f_snwzuwnp instant Ljava/time/Instant;
Expand Down
2 changes: 1 addition & 1 deletion ...craft/util/profiler/DummyProfiler.mapping → ...raft/util/profiling/DummyProfiler.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
CLASS net/minecraft/unmapped/C_ediwljws net/minecraft/util/profiler/DummyProfiler
CLASS net/minecraft/unmapped/C_ediwljws net/minecraft/util/profiling/DummyProfiler
FIELD f_okurmzgb INSTANCE Lnet/minecraft/unmapped/C_ediwljws;
2 changes: 1 addition & 1 deletion ...craft/util/profiler/DummyRecorder.mapping → ...raft/util/profiling/DummyRecorder.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
CLASS net/minecraft/unmapped/C_bvbflxdd net/minecraft/util/profiler/DummyRecorder
CLASS net/minecraft/unmapped/C_bvbflxdd net/minecraft/util/profiling/DummyRecorder
FIELD f_hczrmgox INSTANCE Lnet/minecraft/unmapped/C_owhdirgj;
2 changes: 1 addition & 1 deletion .../util/profiler/EmptyProfileResult.mapping → ...util/profiling/EmptyProfileResult.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
CLASS net/minecraft/unmapped/C_vnjcagdz net/minecraft/util/profiler/EmptyProfileResult
CLASS net/minecraft/unmapped/C_vnjcagdz net/minecraft/util/profiling/EmptyProfileResult
FIELD f_znbfvrln INSTANCE Lnet/minecraft/unmapped/C_vnjcagdz;
2 changes: 1 addition & 1 deletion ...util/profiler/ProfileLocationInfo.mapping → ...til/profiling/ProfileLocationInfo.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_jfixsjks net/minecraft/util/profiler/ProfileLocationInfo
CLASS net/minecraft/unmapped/C_jfixsjks net/minecraft/util/profiling/ProfileLocationInfo
COMMENT Profiling information on a specific profiler location.
METHOD m_ijgiuled getCounts ()Lit/unimi/dsi/fastutil/objects/Object2LongMap;
COMMENT Returns a marker to count map indicating the times each marker has been
Expand Down
2 changes: 1 addition & 1 deletion ...craft/util/profiler/ProfileResult.mapping → ...raft/util/profiling/ProfileResult.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_dzczqjri net/minecraft/util/profiler/ProfileResult
CLASS net/minecraft/unmapped/C_dzczqjri net/minecraft/util/profiling/ProfileResult
FIELD f_ezlvgzsa SPLITTER_CHAR C
METHOD m_dxeesszq getStartTick ()I
METHOD m_entfmbng getRootTimings ()Ljava/lang/String;
Expand Down
2 changes: 1 addition & 1 deletion ...t/util/profiler/ProfileResultImpl.mapping → .../util/profiling/ProfileResultImpl.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_jrmnitnf net/minecraft/util/profiler/ProfileResultImpl
CLASS net/minecraft/unmapped/C_jrmnitnf net/minecraft/util/profiling/ProfileResultImpl
FIELD f_aodcpdpg COMPARATOR Ljava/util/Comparator;
FIELD f_ascvybgc startTime J
FIELD f_gfxbnyom locationInfos Ljava/util/Map;
Expand Down
2 changes: 1 addition & 1 deletion .../minecraft/util/profiler/Profiler.mapping → ...minecraft/util/profiling/Profiler.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_eslcbfsq net/minecraft/util/profiler/Profiler
CLASS net/minecraft/unmapped/C_eslcbfsq net/minecraft/util/profiling/Profiler
FIELD f_hxbkuvru ROOT_NAME Ljava/lang/String;
METHOD m_habnlnco push (Ljava/util/function/Supplier;)V
ARG 1 locationGetter
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/util/profiling/ProfilerManager.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CLASS net/minecraft/unmapped/C_xuophqnt net/minecraft/util/profiling/ProfilerManager
CLASS C_gknixwqr Scope
2 changes: 1 addition & 1 deletion ...raft/util/profiler/ProfilerSystem.mapping → ...aft/util/profiling/ProfilerSystem.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_dmgffhnu net/minecraft/util/profiler/ProfilerSystem
CLASS net/minecraft/unmapped/C_dmgffhnu net/minecraft/util/profiling/ProfilerSystem
FIELD f_ayobskvm TIMEOUT_NANOSECONDS J
FIELD f_eoyabfsa tickStarted Z
FIELD f_gqtqaqyw startTick I
Expand Down
2 changes: 1 addition & 1 deletion ...raft/util/profiler/ProfilerTiming.mapping → ...aft/util/profiling/ProfilerTiming.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_uxxefqku net/minecraft/util/profiler/ProfilerTiming
CLASS net/minecraft/unmapped/C_uxxefqku net/minecraft/util/profiling/ProfilerTiming
FIELD f_dzjmlpxt totalUsagePercentage D
FIELD f_sjdcisnw visitCount J
FIELD f_tbizdich name Ljava/lang/String;
Expand Down
2 changes: 1 addition & 1 deletion ...ft/util/profiler/ReadableProfiler.mapping → ...t/util/profiling/ReadableProfiler.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_nvqxjbet net/minecraft/util/profiler/ReadableProfiler
CLASS net/minecraft/unmapped/C_nvqxjbet net/minecraft/util/profiling/ReadableProfiler
METHOD m_cjbnpkld getResult ()Lnet/minecraft/unmapped/C_dzczqjri;
METHOD m_dplpmkbo getInfo (Ljava/lang/String;)Lnet/minecraft/unmapped/C_dmgffhnu$C_mlnwkhwt;
ARG 1 name
Expand Down
2 changes: 1 addition & 1 deletion ...ecraft/util/profiler/RecordDumper.mapping → ...craft/util/profiling/RecordDumper.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_mxkrezql net/minecraft/util/profiler/RecordDumper
CLASS net/minecraft/unmapped/C_mxkrezql net/minecraft/util/profiling/RecordDumper
FIELD f_iqjhjixn METRICS_DIRECTORY Ljava/lang/String;
FIELD f_mbjlaqhe DEVIATIONS_DIRECTORY Ljava/lang/String;
FIELD f_ozdivxnb DEBUG_PROFILING_DIRECTORY Ljava/nio/file/Path;
Expand Down
2 changes: 1 addition & 1 deletion .../minecraft/util/profiler/Recorder.mapping → ...minecraft/util/profiling/Recorder.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_owhdirgj net/minecraft/util/profiler/Recorder
CLASS net/minecraft/unmapped/C_owhdirgj net/minecraft/util/profiling/Recorder
METHOD m_nmdwiiiv endTick ()V
METHOD m_ohtvfnza isActive ()Z
METHOD m_omqwrdxq stop ()V
Expand Down
2 changes: 1 addition & 1 deletion ...inecraft/util/profiler/SampleType.mapping → ...necraft/util/profiling/SampleType.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_oqsgkejx net/minecraft/util/profiler/SampleType
CLASS net/minecraft/unmapped/C_oqsgkejx net/minecraft/util/profiling/SampleType
FIELD f_iwrcwijq name Ljava/lang/String;
METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
ARG 3 name
Expand Down
2 changes: 1 addition & 1 deletion ...t/minecraft/util/profiler/Sampler.mapping → .../minecraft/util/profiling/Sampler.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_owhhojqn net/minecraft/util/profiler/Sampler
CLASS net/minecraft/unmapped/C_owhhojqn net/minecraft/util/profiling/Sampler
FIELD f_advtdgqc startAction Ljava/lang/Runnable;
FIELD f_bcrsdxez currentSample D
FIELD f_fgbmhebx deviationChecker Lnet/minecraft/unmapped/C_owhhojqn$C_nuurjoca;
Expand Down
2 changes: 1 addition & 1 deletion ...raft/util/profiler/SamplerFactory.mapping → ...aft/util/profiling/SamplerFactory.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_baucttzt net/minecraft/util/profiler/SamplerFactory
CLASS net/minecraft/unmapped/C_baucttzt net/minecraft/util/profiling/SamplerFactory
FIELD f_pfdchvqw sampledFullPaths Ljava/util/Set;
METHOD m_blfbxywj createSamplers (Ljava/util/function/Supplier;)Ljava/util/Set;
ARG 1 profilerSupplier
Expand Down
2 changes: 1 addition & 1 deletion ...craft/util/profiler/SamplerSource.mapping → ...raft/util/profiling/SamplerSource.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CLASS net/minecraft/unmapped/C_ttvdruyn net/minecraft/util/profiler/SamplerSource
CLASS net/minecraft/unmapped/C_ttvdruyn net/minecraft/util/profiling/SamplerSource
METHOD m_uhaewpbq getSamplers (Ljava/util/function/Supplier;)Ljava/util/Set;
ARG 1 profilerSupplier
2 changes: 1 addition & 1 deletion ...util/profiler/ServerSamplerSource.mapping → ...til/profiling/ServerSamplerSource.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_rghumcvt net/minecraft/util/profiler/ServerSamplerSource
CLASS net/minecraft/unmapped/C_rghumcvt net/minecraft/util/profiling/ServerSamplerSource
FIELD f_mkejpnli LOGGER Lorg/slf4j/Logger;
FIELD f_xtpondcq samplers Ljava/util/Set;
FIELD f_xznymisv factory Lnet/minecraft/unmapped/C_baucttzt;
Expand Down
2 changes: 1 addition & 1 deletion ...aft/util/profiler/TickTimeTracker.mapping → ...ft/util/profiling/TickTimeTracker.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_trqmdcbh net/minecraft/util/profiler/TickTimeTracker
CLASS net/minecraft/unmapped/C_trqmdcbh net/minecraft/util/profiling/TickTimeTracker
FIELD f_eadvbmaw profiler Lnet/minecraft/unmapped/C_nvqxjbet;
FIELD f_tjynfgrc tickGetter Ljava/util/function/IntSupplier;
FIELD f_xfjqouwb timeGetter Ljava/util/function/LongSupplier;
Expand Down