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

Better fix for MC-183518

Browse Source
This commit is contained in:
HaHaWTH 2024-10-22 01:50:32 +08:00
parent 5463ccc3e6
commit c7a2205cb2
2 changed files with 44 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/fix_loop_spin_waiting/BlockableEventLoopMixin.java
View File

@ -1,23 +0,0 @@
package org.embeddedt.modernfix.common.mixin.perf.fix_loop_spin_waiting;
import net.minecraft.util.thread.BlockableEventLoop;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.LockSupport;
// This should fix https://bugs.mojang.com/browse/MC-183518
@Mixin(value = BlockableEventLoop.class, priority = 500)
public class BlockableEventLoopMixin {
private static final long MFIX$TICK_WAIT_TIME = TimeUnit.MILLISECONDS.toNanos(2);
/**
* @author embeddedt
* @reason yielding the thread is pretty pointless if we're about to park anyway
*/
@Overwrite
public void waitForTasks() {
LockSupport.parkNanos("waiting for tasks", MFIX$TICK_WAIT_TIME);
}
}

44
common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/fix_loop_spin_waiting/MinecraftServerMixin.java Normal file
View File

@ -0,0 +1,44 @@
package org.embeddedt.modernfix.common.mixin.perf.fix_loop_spin_waiting;
import com.llamalad7.mixinextras.injector.WrapWithCondition;
import net.minecraft.Util;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.thread.ReentrantBlockableEventLoop;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.*;
import java.util.concurrent.locks.LockSupport;
import java.util.function.BooleanSupplier;
// This fixes https://bugs.mojang.com/browse/MC-183518
@Mixin(value = MinecraftServer.class, priority = 500)
public abstract class MinecraftServerMixin {
@Shadow private long nextTickTimeNanos;
@Unique
private boolean mfix$isWaitingForNextTick = false;
@WrapWithCondition(
method = "waitUntilNextTick",
at = @At(value = "INVOKE", target = "Lnet/minecraft/server/MinecraftServer;managedBlock(Ljava/util/function/BooleanSupplier;)V")
)
private boolean manageBlockWithCondition(MinecraftServer instance, BooleanSupplier booleanSupplier) {
try {
this.mfix$isWaitingForNextTick = true;
return true;
} finally {
this.mfix$isWaitingForNextTick = false;
}
}
@Redirect(
method = "waitForTasks",
at = @At(value = "INVOKE", target = "Lnet/minecraft/util/thread/ReentrantBlockableEventLoop;waitForTasks()V")
)
private void waitForTasks(ReentrantBlockableEventLoop instance) {
long i = this.mfix$isWaitingForNextTick ? this.nextTickTimeNanos - Util.getNanos() : 100_000L;
LockSupport.parkNanos("waiting for tasks", i);
}
}