R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use same merge mode as default Spark

Browse Source
This commit is contained in:
embeddedt 2023-06-27 11:01:17 -04:00
parent 58eaf44d89
commit 922d0f26e1
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fabric/src/main/java/org/embeddedt/modernfix/fabric/spark/SparkLaunchProfiler.java
View File

@ -71,7 +71,7 @@ public class SparkLaunchProfiler {
private static void output(String key, Sampler sampler) { private static void output(String key, Sampler sampler) {
executor.execute(() -> { executor.execute(() -> {
ModernFixMixinPlugin.instance.logger.warn("Stage [{}] profiler has stopped! Uploading results...", key); ModernFixMixinPlugin.instance.logger.warn("Stage [{}] profiler has stopped! Uploading results...", key);
byte[] output = sampler.formCompressedDataPayload(new Sampler.ExportProps(platformInfo, commandSender, ThreadNodeOrder.BY_TIME, "Stage: " + key, MergeMode.separateParentCalls(new MethodDisambiguator()), platform.getClassSourceLookup())); byte[] output = sampler.formCompressedDataPayload(new Sampler.ExportProps(platformInfo, commandSender, ThreadNodeOrder.BY_TIME, "Stage: " + key, MergeMode.sameMethod(new MethodDisambiguator()), platform.getClassSourceLookup()));
try { try {
String urlKey = SparkPlatform.BYTEBIN_CLIENT.postContent(output, mediaType).key(); String urlKey = SparkPlatform.BYTEBIN_CLIENT.postContent(output, mediaType).key();
String url = "https://spark.lucko.me/" + urlKey; String url = "https://spark.lucko.me/" + urlKey;

2
forge/src/main/java/org/embeddedt/modernfix/forge/spark/SparkLaunchProfiler.java
View File

@ -72,7 +72,7 @@ public class SparkLaunchProfiler {
private static void output(String key, Sampler sampler) { private static void output(String key, Sampler sampler) {
executor.execute(() -> { executor.execute(() -> {
ModernFixMixinPlugin.instance.logger.warn("Stage [{}] profiler has stopped! Uploading results...", key); ModernFixMixinPlugin.instance.logger.warn("Stage [{}] profiler has stopped! Uploading results...", key);
SparkSamplerProtos.SamplerData output = sampler.toProto(platform, commandSender, ThreadNodeOrder.BY_TIME, "Stage: " + key, MergeMode.separateParentCalls(new MethodDisambiguator()), platform.createClassSourceLookup()); SparkSamplerProtos.SamplerData output = sampler.toProto(platform, commandSender, ThreadNodeOrder.BY_TIME, "Stage: " + key, MergeMode.sameMethod(new MethodDisambiguator()), platform.createClassSourceLookup());
try { try {
String urlKey = platform.getBytebinClient().postContent(output, mediaType).key(); String urlKey = platform.getBytebinClient().postContent(output, mediaType).key();
String url = "https://spark.lucko.me/" + urlKey; String url = "https://spark.lucko.me/" + urlKey;