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

Update Spark integration

Browse Source
This commit is contained in:
embeddedt 2025-04-09 19:22:13 -04:00
parent f6683a77ce
commit c7c866fde5
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/src/main/java/org/embeddedt/modernfix/spark/SparkLaunchProfiler.java
View File

@ -41,14 +41,14 @@ public class SparkLaunchProfiler {
public static void start(String key) { public static void start(String key) {
if (!ongoingSamplers.containsKey(key)) { if (!ongoingSamplers.containsKey(key)) {
Sampler sampler; Sampler sampler;
SamplerSettings settings = new SamplerSettings(4000, ThreadDumper.ALL, ThreadGrouper.BY_NAME.get(), -1, false); SamplerSettings settings = new SamplerSettings(4000, ThreadDumper.ALL, ThreadGrouper.BY_NAME.get(), -1, false, true);
try { try {
if(USE_JAVA_SAMPLER_FOR_LAUNCH) { if(USE_JAVA_SAMPLER_FOR_LAUNCH) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
sampler = new AsyncSampler(platform, settings, new SampleCollector.Execution(4000)); sampler = new AsyncSampler(platform, settings, new SampleCollector.Execution(4000));
} catch (UnsupportedOperationException e) { } catch (UnsupportedOperationException e) {
sampler = new JavaSampler(platform, settings, true, true); sampler = new JavaSampler(platform, settings);
} }
ongoingSamplers.put(key, sampler); ongoingSamplers.put(key, sampler);
ModernFixMixinPlugin.instance.logger.warn("Profiler has started for stage [{}]...", key); ModernFixMixinPlugin.instance.logger.warn("Profiler has started for stage [{}]...", key);
@ -173,6 +173,11 @@ public class SparkLaunchProfiler {
ModernFixMixinPlugin.instance.logger.warn(s); ModernFixMixinPlugin.instance.logger.warn(s);
} }
@Override
public void log(Level level, String s, Throwable t) {
ModernFixMixinPlugin.instance.logger.warn(s, t);
}
@Override @Override
public PlatformInfo getPlatformInfo() { public PlatformInfo getPlatformInfo() {
return platformInfo; return platformInfo;

2
gradle.properties
View File

@ -27,7 +27,7 @@ continuity_version=3.0.0-beta.4+1.20.2
modmenu_version=7.0.0-beta.2 modmenu_version=7.0.0-beta.2
diagonal_fences_version=4558828 diagonal_fences_version=4558828
spark_version=5759671 spark_version=6225208
use_fabric_api_at_runtime=true use_fabric_api_at_runtime=true