21w37a JFR forwardport (#2682)

* 21w37a JFR forwardport

* Update mappings/net/minecraft/util/profiling/jfr/JfrProfiler.mapping

Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>

Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>
This commit is contained in:
apple502j 2021-09-18 00:18:41 +09:00 committed by GitHub
parent 54f0920bc0
commit 639f0163d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 200 additions and 20 deletions

View File

@ -1,7 +1,17 @@
CLASS net/minecraft/class_6607 net/minecraft/server/command/JfrCommand
FIELD field_34880 JFR_START_FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
FIELD field_34881 JFR_DUMP_FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
METHOD method_38612 register (Lcom/mojang/brigadier/CommandDispatcher;)V
ARG 0 dispatcher
METHOD method_38613 (Lcom/mojang/brigadier/context/CommandContext;)I
ARG 0 context
METHOD method_38614 executeStart (Lnet/minecraft/class_2168;)I
ARG 0 source
METHOD method_38615 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
ARG 0 message
METHOD method_38616 (Lcom/mojang/brigadier/context/CommandContext;)I
ARG 0 context
METHOD method_38617 executeStop (Lnet/minecraft/class_2168;)I
ARG 0 source
METHOD method_38618 (Lnet/minecraft/class_2168;)Z
ARG 0 source

View File

@ -1,10 +1,21 @@
CLASS net/minecraft/class_6608 net/minecraft/server/command/ResetChunksCommand
FIELD field_34882 LOGGER Lorg/apache/logging/log4j/Logger;
METHOD method_38620 (Lnet/minecraft/class_2791;)V
ARG 0 chunk
METHOD method_38621 (Lnet/minecraft/class_2806;Lnet/minecraft/class_3846;Lnet/minecraft/class_3218;Lnet/minecraft/class_3215;Ljava/util/List;Lcom/mojang/datafixers/util/Unit;)Ljava/util/concurrent/CompletionStage;
ARG 5 unit
METHOD method_38622 (Lnet/minecraft/class_2806;Lcom/mojang/datafixers/util/Either;)Lcom/mojang/datafixers/util/Unit;
ARG 1 either
METHOD method_38623 register (Lcom/mojang/brigadier/CommandDispatcher;)V
ARG 0 dispatcher
METHOD method_38624 (Lcom/mojang/brigadier/context/CommandContext;)I
ARG 0 context
METHOD method_38625 (Lnet/minecraft/class_2168;)Z
ARG 0 source
METHOD method_38626 executeResetChunks (Lnet/minecraft/class_2168;I)I
ARG 0 source
ARG 1 radius
METHOD method_38627 (Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture;
ARG 0 chunk
METHOD method_38628 (Lcom/mojang/brigadier/context/CommandContext;)I
ARG 0 context

View File

@ -2,6 +2,8 @@ CLASS net/minecraft/class_6508 net/minecraft/util/math/Quantiles
FIELD field_34418 QUANTILE_POINTS Lcom/google/common/math/Quantiles$ScaleAndIndexes;
METHOD method_37996 reverseMap (Ljava/util/Map;)Ljava/util/Map;
ARG 0 map
METHOD method_37997 (Ljava/util/Map;Lit/unimi/dsi/fastutil/ints/Int2DoubleRBTreeMap;)V
ARG 1 reversedMap
METHOD method_37998 create ([D)Ljava/util/Map;
ARG 0 values
METHOD method_37999 create ([J)Ljava/util/Map;

View File

@ -6,6 +6,9 @@ CLASS net/minecraft/class_6519 net/minecraft/util/profiling/jfr/JfrJsonReport
FIELD field_34441 TOTAL_BYTES Ljava/lang/String;
FIELD field_34442 COUNT_PER_SECOND Ljava/lang/String;
METHOD method_38010 toString (Lnet/minecraft/class_6517;)Ljava/lang/String;
ARG 1 profile
METHOD method_38011 (Lnet/minecraft/class_6521;)Lcom/google/gson/JsonElement;
ARG 0 sample
METHOD method_38012 collectFileIoSection (Lnet/minecraft/class_6523$class_6524;)Lcom/google/gson/JsonElement;
ARG 1 statistics
METHOD method_38013 collectHeapSection (Lnet/minecraft/class_6525$class_6526;)Lcom/google/gson/JsonElement;
@ -13,11 +16,35 @@ CLASS net/minecraft/class_6519 net/minecraft/util/profiling/jfr/JfrJsonReport
METHOD method_38014 collectPacketSection (Lnet/minecraft/class_6528$class_6529;)Lcom/google/gson/JsonElement;
ARG 1 statistics
METHOD method_38015 collectThreadAllocationSection (Lnet/minecraft/class_6530$class_6531;)Lcom/google/gson/JsonElement;
ARG 1 allocationMap
ARG 1 statistics
METHOD method_38016 (Lcom/google/gson/JsonArray;Lcom/mojang/datafixers/util/Pair;)V
ARG 1 pair
METHOD method_38017 (Lcom/google/gson/JsonArray;Ljava/lang/String;Ljava/lang/Double;)V
ARG 1 threadName
ARG 2 allocation
METHOD method_38018 (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonArray;)V
ARG 1 json
METHOD method_38019 (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonObject;)V
ARG 1 json
METHOD method_38020 (Lcom/google/gson/JsonObject;Ljava/lang/Integer;Ljava/lang/Double;)V
ARG 1 quantile
ARG 2 value
METHOD method_38021 (Lcom/mojang/datafixers/util/Pair;)D
ARG 0 pair
METHOD method_38022 (Ljava/lang/String;Ljava/lang/Double;Lcom/google/gson/JsonObject;)V
ARG 2 json
METHOD method_38023 collectChunkGenSection (Ljava/util/List;)Lcom/google/gson/JsonElement;
ARG 1 statistics
METHOD method_38024 (Ljava/util/List;Ljava/util/function/ToDoubleFunction;)Lcom/google/gson/JsonObject;
ARG 0 samples
ARG 1 valueGetter
METHOD method_38025 collectFileIoSection (Lnet/minecraft/class_6517;)Lcom/google/gson/JsonElement;
ARG 1 profile
METHOD method_38026 (Lcom/google/gson/JsonArray;Lcom/mojang/datafixers/util/Pair;)V
ARG 1 pair
METHOD method_38027 (Lcom/google/gson/JsonObject;Ljava/lang/Integer;Ljava/lang/Double;)V
ARG 1 quantile
ARG 2 value
METHOD method_38028 collectServerTickSection (Ljava/util/List;)Lcom/google/gson/JsonElement;
ARG 1 samples
METHOD method_38029 collectNetworkSection (Lnet/minecraft/class_6517;)Lcom/google/gson/JsonElement;

View File

@ -7,14 +7,11 @@ CLASS net/minecraft/class_6517 net/minecraft/util/profiling/jfr/JfrProfile
FIELD comp_15 chunkGenerationSamples Ljava/util/List;
FIELD comp_3 startTime Ljava/time/Instant;
FIELD comp_4 endTime Ljava/time/Instant;
FIELD comp_5 getDuration Ljava/time/Duration;
FIELD comp_6 getWorldGenDuration Ljava/time/Duration;
FIELD comp_5 duration Ljava/time/Duration;
FIELD comp_6 worldGenDuration Ljava/time/Duration;
FIELD comp_7 serverTickTimeSamples Ljava/util/List;
FIELD comp_8 cpuLoadSamples Ljava/util/List;
FIELD comp_9 gcHeapSummaryStatistics Lnet/minecraft/class_6525$class_6526;
METHOD <init> (Ljava/time/Instant;Ljava/time/Instant;Ljava/time/Duration;Ljava/time/Duration;Ljava/util/List;Ljava/util/List;Lnet/minecraft/class_6525$class_6526;Lnet/minecraft/class_6530$class_6531;Lnet/minecraft/class_6528$class_6529;Lnet/minecraft/class_6528$class_6529;Lnet/minecraft/class_6523$class_6524;Lnet/minecraft/class_6523$class_6524;Ljava/util/List;)V
ARG 1 startTime
ARG 2 endTime
METHOD comp_10 threadAllocationMap ()Lnet/minecraft/class_6530$class_6531;
METHOD comp_11 packetReadStatistics ()Lnet/minecraft/class_6528$class_6529;
METHOD comp_12 packetSentStatistics ()Lnet/minecraft/class_6528$class_6529;
@ -23,10 +20,16 @@ CLASS net/minecraft/class_6517 net/minecraft/util/profiling/jfr/JfrProfile
METHOD comp_15 chunkGenerationSamples ()Ljava/util/List;
METHOD comp_3 startTime ()Ljava/time/Instant;
METHOD comp_4 endTime ()Ljava/time/Instant;
METHOD comp_5 getDuration ()Ljava/time/Duration;
METHOD comp_6 getWorldGenDuration ()Ljava/time/Duration;
METHOD comp_5 duration ()Ljava/time/Duration;
METHOD comp_6 worldGenDuration ()Ljava/time/Duration;
METHOD comp_7 serverTickTimeSamples ()Ljava/util/List;
METHOD comp_8 cpuLoadSamples ()Ljava/util/List;
METHOD comp_9 gcHeapSummaryStatistics ()Lnet/minecraft/class_6525$class_6526;
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
METHOD method_38006 getChunkGenerationSampleStatistics ()Ljava/util/List;
METHOD method_38009 collectJson ()Ljava/lang/String;
METHOD method_38007 (Lcom/mojang/datafixers/util/Pair;)Ljava/time/Duration;
ARG 0 pair
METHOD method_38008 (Ljava/util/Map$Entry;)Lcom/mojang/datafixers/util/Pair;
ARG 0 entry
METHOD method_38009 toJson ()Ljava/lang/String;

View File

@ -6,13 +6,35 @@ CLASS net/minecraft/class_6505 net/minecraft/util/profiling/jfr/JfrProfiler
FIELD field_34407 EVENTS Ljava/util/List;
FIELD field_34408 LOGGER Lorg/apache/logging/log4j/Logger;
FIELD field_34409 CONFIG_PATH Ljava/lang/String;
FIELD field_34410 DATE_TIME_FORMAT Ljava/time/format/DateTimeFormatter;
FIELD field_34411 currentRecording Ljdk/jfr/Recording;
METHOD method_37980 stop ()Ljava/nio/file/Path;
METHOD method_37981 start (Lnet/minecraft/class_6505$class_6506;)Z
ARG 0 instanceType
METHOD method_37982 (Lnet/minecraft/class_6505$class_6506;Ljava/lang/String;Ljdk/jfr/Recording;)V
ARG 2 recording
METHOD method_37983 start (Ljava/io/Reader;Lnet/minecraft/class_6505$class_6506;)Z
ARG 0 reader
ARG 1 instanceType
METHOD method_37984 isProfiling ()Z
CLASS class_6506 InstanceType
FIELD field_34414 name Ljava/lang/String;
METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
ARG 3 name
METHOD method_37986 getName ()Ljava/lang/String;
METHOD method_37987 get (Lnet/minecraft/server/MinecraftServer;)Lnet/minecraft/class_6505$class_6506;
ARG 0 server
CLASS class_6507 Listener
FIELD field_34416 recording Ljdk/jfr/Recording;
FIELD field_34417 stopCallback Ljava/lang/Runnable;
METHOD <init> (Ljdk/jfr/Recording;Ljava/lang/Runnable;)V
ARG 1 recording
ARG 2 stopCallback
METHOD method_37989 shouldUseLogger ()Z
METHOD method_37991 log (Lorg/apache/logging/log4j/util/Supplier;)V
ARG 0 messageSupplier
METHOD method_37992 warn (Lorg/apache/logging/log4j/util/Supplier;Ljava/lang/Throwable;)V
ARG 0 messageSupplier
ARG 1 throwable
METHOD recordingStateChanged (Ljdk/jfr/Recording;)V
ARG 1 recording

View File

@ -0,0 +1,9 @@
CLASS net/minecraft/class_6509 net/minecraft/util/profiling/jfr/event/network/PacketEvent
METHOD <init> (Ljava/lang/String;Ljava/net/SocketAddress;I)V
ARG 1 packetName
ARG 2 remoteAddress
ARG 3 bytes
CLASS class_6510 Names
FIELD field_34419 REMOTE_ADDRESS Ljava/lang/String;
FIELD field_34420 PACKET_NAME Ljava/lang/String;
FIELD field_34421 BYTES Ljava/lang/String;

View File

@ -0,0 +1,5 @@
CLASS net/minecraft/util/profiling/jfr/event/ticking/ServerTickTimeEvent
METHOD <init> (F)V
ARG 1 averageTickMs
CLASS class_6601 Names
FIELD field_34854 AVERAGE_TICK_MS Ljava/lang/String;

View File

@ -0,0 +1,13 @@
CLASS net/minecraft/util/profiling/jfr/event/worldgen/ChunkGenerationEvent
METHOD <init> (Lnet/minecraft/class_1923;Lnet/minecraft/class_5321;Ljava/lang/String;)V
ARG 1 chunkPos
ARG 2 world
ARG 3 targetStatus
CLASS class_6602 Names
FIELD field_34855 WORLD_POS_X Ljava/lang/String;
FIELD field_34856 WORLD_POS_Z Ljava/lang/String;
FIELD field_34857 CHUNK_POS_X Ljava/lang/String;
FIELD field_34858 CHUNK_POS_Z Ljava/lang/String;
FIELD field_34859 STATUS Ljava/lang/String;
FIELD field_34860 SUCCESS Ljava/lang/String;
FIELD field_34861 LEVEL Ljava/lang/String;

View File

@ -5,8 +5,14 @@ CLASS net/minecraft/class_6521 net/minecraft/util/profiling/jfr/sample/ChunkGene
FIELD comp_19 chunkStatus Lnet/minecraft/class_2806;
FIELD comp_20 successful Z
FIELD comp_21 worldKey Ljava/lang/String;
METHOD <init> (Ljava/time/Duration;Lnet/minecraft/class_1923;Lnet/minecraft/class_2265;Lnet/minecraft/class_2806;ZLjava/lang/String;)V
ARG 1 duration
METHOD comp_17 chunkPos ()Lnet/minecraft/class_1923;
METHOD comp_18 centerPos ()Lnet/minecraft/class_2265;
METHOD comp_19 chunkStatus ()Lnet/minecraft/class_2806;
METHOD comp_20 successful ()Z
METHOD comp_21 worldKey ()Ljava/lang/String;
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
METHOD method_38031 fromEvent (Ljdk/jfr/consumer/RecordedEvent;)Lnet/minecraft/class_6521;
ARG 0 event

View File

@ -5,3 +5,7 @@ CLASS net/minecraft/class_6522 net/minecraft/util/profiling/jfr/sample/CpuLoadSa
METHOD comp_22 jvm ()D
METHOD comp_23 userJvm ()D
METHOD comp_24 system ()D
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
METHOD method_38032 fromEvent (Ljdk/jfr/consumer/RecordedEvent;)Lnet/minecraft/class_6522;
ARG 0 event

View File

@ -5,16 +5,33 @@ CLASS net/minecraft/class_6523 net/minecraft/util/profiling/jfr/sample/FileIoSam
METHOD comp_25 duration ()Ljava/time/Duration;
METHOD comp_26 path ()Ljava/lang/String;
METHOD comp_27 bytes ()J
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
METHOD method_38033 (Lnet/minecraft/class_6523;)J
ARG 0 sample
METHOD method_38034 toStatistics (Ljava/time/Duration;Ljava/util/List;)Lnet/minecraft/class_6523$class_6524;
ARG 0 duration
ARG 1 samples
METHOD method_38035 (Ljava/util/Map$Entry;)Lcom/mojang/datafixers/util/Pair;
ARG 0 entry
METHOD method_38036 (Lnet/minecraft/class_6523;)Ljava/lang/String;
ARG 0 sample
METHOD method_38037 (Lnet/minecraft/class_6523;)Z
ARG 0 sample
METHOD method_38038 (Lnet/minecraft/class_6523;)J
ARG 0 sample
CLASS class_6524 Statistics
FIELD comp_28 totalBytes J
FIELD comp_29 getBytesPerSecond D
FIELD comp_29 bytesPerSecond D
FIELD comp_30 count J
FIELD comp_31 getCountPerSecond D
FIELD comp_32 getTotalDuration Ljava/time/Duration;
FIELD comp_33 getTopContributors Ljava/util/List;
FIELD comp_31 countPerSecond D
FIELD comp_32 totalDuration Ljava/time/Duration;
FIELD comp_33 topContributors Ljava/util/List;
METHOD comp_28 totalBytes ()J
METHOD comp_29 getBytesPerSecond ()D
METHOD comp_29 bytesPerSecond ()D
METHOD comp_30 count ()J
METHOD comp_31 getCountPerSecond ()D
METHOD comp_32 getTotalDuration ()Ljava/time/Duration;
METHOD comp_33 getTopContributors ()Ljava/util/List;
METHOD comp_31 countPerSecond ()D
METHOD comp_32 totalDuration ()Ljava/time/Duration;
METHOD comp_33 topContributors ()Ljava/util/List;
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o

View File

@ -5,16 +5,27 @@ CLASS net/minecraft/class_6525 net/minecraft/util/profiling/jfr/sample/GcHeapSum
METHOD comp_34 time ()Ljava/time/Instant;
METHOD comp_35 heapUsed ()J
METHOD comp_36 summaryType ()Lnet/minecraft/class_6525$class_6527;
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
METHOD method_38040 toStatistics (Ljava/time/Duration;Ljava/util/List;Ljava/time/Duration;I)Lnet/minecraft/class_6525$class_6526;
ARG 0 duration
ARG 1 samples
ARG 2 gcDuration
ARG 3 count
METHOD method_38041 getAllocatedBytesPerSecond (Ljava/util/List;)D
ARG 0 samples
METHOD method_38042 fromEvent (Ljdk/jfr/consumer/RecordedEvent;)Lnet/minecraft/class_6525;
ARG 0 event
CLASS class_6526 Statistics
FIELD comp_37 duration Ljava/time/Duration;
FIELD comp_38 gcDuration Ljava/time/Duration;
FIELD comp_39 count I
FIELD comp_40 allocatedBytesPerSecond D
METHOD <init> (Ljava/time/Duration;Ljava/time/Duration;ID)V
ARG 1 duration
METHOD comp_37 duration ()Ljava/time/Duration;
METHOD comp_38 gcDuration ()Ljava/time/Duration;
METHOD comp_39 count ()I
METHOD comp_40 allocatedBytesPerSecond ()D
METHOD method_38043 gcDurationRatio ()F
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
METHOD method_38043 getGcDurationRatio ()F
CLASS class_6527 SummaryType

View File

@ -11,3 +11,9 @@ CLASS net/minecraft/class_6535 net/minecraft/util/profiling/jfr/sample/LongRunni
METHOD comp_57 count ()I
METHOD comp_58 quantiles ()Ljava/util/Map;
METHOD comp_59 totalDuration ()Ljava/time/Duration;
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
METHOD method_38059 (Lnet/minecraft/class_6534;)J
ARG 0 sample
METHOD method_38060 fromSamples (Ljava/util/List;)Lnet/minecraft/class_6535;
ARG 0 samples

View File

@ -5,6 +5,21 @@ CLASS net/minecraft/class_6528 net/minecraft/util/profiling/jfr/sample/PacketSam
METHOD comp_41 time ()Ljava/time/Instant;
METHOD comp_42 packetName ()Ljava/lang/String;
METHOD comp_43 bytes ()I
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
METHOD method_38046 (Lnet/minecraft/class_6528;)J
ARG 0 sample
METHOD method_38047 toStatistics (Ljava/time/Duration;Ljava/util/List;)Lnet/minecraft/class_6528$class_6529;
ARG 0 duration
ARG 1 samples
METHOD method_38048 (Ljava/util/Map$Entry;)Lcom/mojang/datafixers/util/Pair;
ARG 0 entry
METHOD method_38049 fromEvent (Ljdk/jfr/consumer/RecordedEvent;)Lnet/minecraft/class_6528;
ARG 0 event
METHOD method_38050 (Lnet/minecraft/class_6528;)Ljava/lang/String;
ARG 0 sample
METHOD method_38051 (Lnet/minecraft/class_6528;)I
ARG 0 sample
CLASS class_6529 Statistics
FIELD comp_44 count J
FIELD comp_45 totalBytes J
@ -14,5 +29,7 @@ CLASS net/minecraft/class_6528 net/minecraft/util/profiling/jfr/sample/PacketSam
METHOD comp_45 totalBytes ()J
METHOD comp_46 topContributors ()Ljava/util/List;
METHOD comp_47 duration ()Ljava/time/Duration;
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
METHOD method_38052 getCountPerSecond ()D
METHOD method_38053 getBytesPerSecond ()D

View File

@ -3,3 +3,7 @@ CLASS net/minecraft/class_6532 net/minecraft/util/profiling/jfr/sample/ServerTic
FIELD comp_53 averageTickMs F
METHOD comp_52 time ()Ljava/time/Instant;
METHOD comp_53 averageTickMs ()F
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
METHOD method_38058 fromEvent (Ljdk/jfr/consumer/RecordedEvent;)Lnet/minecraft/class_6532;
ARG 0 event

View File

@ -6,6 +6,19 @@ CLASS net/minecraft/class_6530 net/minecraft/util/profiling/jfr/sample/ThreadAll
METHOD comp_48 time ()Ljava/time/Instant;
METHOD comp_49 threadName ()Ljava/lang/String;
METHOD comp_50 allocated ()J
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
METHOD method_38054 (Lnet/minecraft/class_6530;)Ljava/lang/String;
ARG 0 sample
METHOD method_38055 toAllocationMap (Ljava/util/List;)Lnet/minecraft/class_6530$class_6531;
ARG 0 samples
METHOD method_38056 (Ljava/util/Map;Ljava/lang/String;Ljava/util/List;)V
ARG 1 threadName
ARG 2 groupedSamples
METHOD method_38057 fromEvent (Ljdk/jfr/consumer/RecordedEvent;)Lnet/minecraft/class_6530;
ARG 0 event
CLASS class_6531 AllocationMap
FIELD comp_51 allocations Ljava/util/Map;
METHOD comp_51 allocations ()Ljava/util/Map;
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o