Skip to content
Permalink
Browse files

Initial watchdog setup. Bukkit needs adapters, everything needs testing.

  • Loading branch information...
kenzierocks committed Sep 5, 2019
1 parent a515ed0 commit 8af68fc884a8a32ba19b74d7e95efc5e74457894
@@ -28,6 +28,8 @@
import com.sk89q.worldedit.extension.platform.Capability;
import com.sk89q.worldedit.extension.platform.MultiUserPlatform;
import com.sk89q.worldedit.extension.platform.Preference;
import com.sk89q.worldedit.extension.platform.Watchdog;
import com.sk89q.worldedit.util.concurrency.LazyReference;
import com.sk89q.worldedit.world.DataFixer;
import com.sk89q.worldedit.world.registry.Registries;
import org.bukkit.Bukkit;
@@ -52,6 +54,14 @@
public WorldEditPlugin plugin;
private CommandRegistration dynamicCommands;
private boolean hookingEvents;
private final LazyReference<Watchdog> watchdog = LazyReference.from(() -> {
if (plugin.getBukkitImplAdapter() != null) {
return plugin.getBukkitImplAdapter().supportsWatchdog()
? new BukkitWatchdog(plugin.getBukkitImplAdapter())
: null;
}
return null;
});

public BukkitServerInterface(WorldEditPlugin plugin, Server server) {
this.plugin = plugin;
@@ -103,6 +113,11 @@ public int schedule(long delay, long period, Runnable task) {
return Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, task, delay, period);
}

@Override
public Watchdog getWatchdog() {
return watchdog.getValue();
}

@Override
public List<com.sk89q.worldedit.world.World> getWorlds() {
List<World> worlds = server.getWorlds();
@@ -0,0 +1,38 @@
/*
* WorldEdit, a Minecraft world manipulation toolkit
* Copyright (C) sk89q <http://www.sk89q.com>
* Copyright (C) WorldEdit team and contributors
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by the
* Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
* for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

package com.sk89q.worldedit.bukkit;

import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
import com.sk89q.worldedit.extension.platform.Watchdog;

class BukkitWatchdog implements Watchdog {

private final BukkitImplAdapter adapter;

BukkitWatchdog(BukkitImplAdapter adapter) {
this.adapter = adapter;
}

@Override
public void tick() {
adapter.tickWatchdog();
}

}
@@ -62,6 +62,19 @@
@Nullable
DataFixer getDataFixer();

/**
* @return {@code true} if {@link #tickWatchdog()} is implemented
*/
default boolean supportsWatchdog() {
return false;
}

/**
* Tick the server watchdog, if possible.
*/
default void tickWatchdog() {
}

/**
* Get the block at the given location.
*
@@ -22,6 +22,8 @@
import com.sk89q.worldedit.entity.BaseEntity;
import com.sk89q.worldedit.entity.Entity;
import com.sk89q.worldedit.event.extent.EditSessionEvent;
import com.sk89q.worldedit.extension.platform.Capability;
import com.sk89q.worldedit.extension.platform.Watchdog;
import com.sk89q.worldedit.extent.ChangeSetExtent;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.extent.MaskingExtent;
@@ -38,6 +40,7 @@
import com.sk89q.worldedit.extent.world.ChunkLoadingExtent;
import com.sk89q.worldedit.extent.world.FastModeExtent;
import com.sk89q.worldedit.extent.world.SurvivalModeExtent;
import com.sk89q.worldedit.extent.world.WatchdogTickingExtent;
import com.sk89q.worldedit.function.GroundFunction;
import com.sk89q.worldedit.function.RegionMaskingFilter;
import com.sk89q.worldedit.function.biome.BiomeReplace;
@@ -214,10 +217,16 @@ public String getDisplayName() {
this.world = world;

if (world != null) {
Watchdog watchdog = WorldEdit.getInstance().getPlatformManager()
.queryCapability(Capability.GAME_HOOKS).getWatchdog();
Extent extent;

// These extents are ALWAYS used
extent = fastModeExtent = new FastModeExtent(world, false);
if (watchdog != null) {
// Reset watchdog before world placement
extent = new WatchdogTickingExtent(extent, watchdog);
}
extent = survivalExtent = new SurvivalModeExtent(extent, world);
extent = new BlockQuirkExtent(extent, world);
extent = new ChunkLoadingExtent(extent, world);
@@ -230,6 +239,11 @@ public String getDisplayName() {
extent = reorderExtent = new MultiStageReorder(extent, false);
extent = chunkBatchingExtent = new ChunkBatchingExtent(extent);
extent = wrapExtent(extent, eventBus, event, Stage.BEFORE_REORDER);
if (watchdog != null) {
// reset before buffering extents, since they may buffer all changes
// before the world-placement reset can happen, and still cause halts
extent = new WatchdogTickingExtent(extent, watchdog);
}
this.bypassHistory = new DataValidatorExtent(extent, world);

// These extents can be skipped by calling smartSetBlock()
@@ -83,6 +83,15 @@
*/
int schedule(long delay, long period, Runnable task);

/**
* Get the watchdog service.
*
* @return the watchdog service, or {@code null} if none
*/
default @Nullable Watchdog getWatchdog() {
return null;
}

/**
* Get a list of available or loaded worlds.
*
@@ -0,0 +1,29 @@
/*
* WorldEdit, a Minecraft world manipulation toolkit
* Copyright (C) sk89q <http://www.sk89q.com>
* Copyright (C) WorldEdit team and contributors
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by the
* Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
* for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

package com.sk89q.worldedit.extension.platform;

/**
* Interface to a {@link Platform}'s watchdog service.
*/
public interface Watchdog {

void tick();

}
@@ -0,0 +1,72 @@
/*
* WorldEdit, a Minecraft world manipulation toolkit
* Copyright (C) sk89q <http://www.sk89q.com>
* Copyright (C) WorldEdit team and contributors
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by the
* Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
* for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

package com.sk89q.worldedit.extent.world;

import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.entity.BaseEntity;
import com.sk89q.worldedit.entity.Entity;
import com.sk89q.worldedit.extension.platform.Watchdog;
import com.sk89q.worldedit.extent.AbstractDelegateExtent;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.math.BlockVector2;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.world.biome.BiomeType;
import com.sk89q.worldedit.world.block.BlockStateHolder;

import javax.annotation.Nullable;

/**
* Extent that ticks the watchdog before every world-affecting action.
*/
public class WatchdogTickingExtent extends AbstractDelegateExtent {

private final Watchdog watchdog;

/**
* Create a new instance.
*
* @param extent the extent
* @param watchdog the watchdog to reset
*/
public WatchdogTickingExtent(Extent extent, Watchdog watchdog) {
super(extent);
this.watchdog = watchdog;
}

@Override
public <T extends BlockStateHolder<T>> boolean setBlock(BlockVector3 location, T block) throws WorldEditException {
watchdog.tick();
return super.setBlock(location, block);
}

@Nullable
@Override
public Entity createEntity(Location location, BaseEntity entity) {
watchdog.tick();
return super.createEntity(location, entity);
}

@Override
public boolean setBiome(BlockVector2 position, BiomeType biome) {
watchdog.tick();
return super.setBiome(position, biome);
}
}
@@ -26,12 +26,14 @@
import com.sk89q.worldedit.extension.platform.Capability;
import com.sk89q.worldedit.extension.platform.MultiUserPlatform;
import com.sk89q.worldedit.extension.platform.Preference;
import com.sk89q.worldedit.fabric.mixin.MixinMinecraftServer;
import com.sk89q.worldedit.world.DataFixer;
import com.sk89q.worldedit.world.World;
import com.sk89q.worldedit.world.registry.Registries;
import net.minecraft.SharedConstants;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.PlayerManager;
import net.minecraft.server.dedicated.DedicatedServer;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.util.Identifier;
@@ -55,12 +57,15 @@
private final FabricWorldEdit mod;
private final MinecraftServer server;
private final FabricDataFixer dataFixer;
private final @Nullable FabricWatchdog watchdog;
private boolean hookingEvents = false;

FabricPlatform(FabricWorldEdit mod, MinecraftServer server) {
this.mod = mod;
this.server = server;
this.dataFixer = new FabricDataFixer(getDataVersion());
this.watchdog = server instanceof DedicatedServer
? new FabricWatchdog((MixinMinecraftServer) (Object) server) : null;
}

boolean isHookingEvents() {
@@ -97,6 +102,12 @@ public int schedule(long delay, long period, Runnable task) {
return -1;
}

@Override
@Nullable
public FabricWatchdog getWatchdog() {
return watchdog;
}

@Override
public List<? extends World> getWorlds() {
Iterable<ServerWorld> worlds = server.getWorlds();
@@ -0,0 +1,19 @@
package com.sk89q.worldedit.fabric;

import com.sk89q.worldedit.extension.platform.Watchdog;
import com.sk89q.worldedit.fabric.mixin.MixinMinecraftServer;
import net.minecraft.util.SystemUtil;

class FabricWatchdog implements Watchdog {

private final MixinMinecraftServer server;

FabricWatchdog(MixinMinecraftServer server) {
this.server = server;
}

@Override
public void tick() {
server.timeReference = SystemUtil.getMeasuringTimeMs();
}
}
@@ -0,0 +1,20 @@
package com.sk89q.worldedit.fabric.mixin;

import net.minecraft.server.MinecraftServer;
import net.minecraft.server.ServerTask;
import net.minecraft.server.command.CommandOutput;
import net.minecraft.util.NonBlockingThreadExecutor;
import net.minecraft.util.snooper.SnooperListener;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;

@Mixin(MinecraftServer.class)
public abstract class MixinMinecraftServer extends NonBlockingThreadExecutor<ServerTask> implements SnooperListener, CommandOutput, AutoCloseable, Runnable {

public MixinMinecraftServer(String string_1) {
super(string_1);
}

@Shadow
public long timeReference;
}
@@ -3,7 +3,8 @@
"package": "com.sk89q.worldedit.fabric.mixin",
"compatibilityLevel": "JAVA_8",
"mixins": [
"MixinServerPlayerEntity"
"MixinServerPlayerEntity",
"MixinMinecraftServer"
],
"server": [
],
@@ -34,6 +34,8 @@ configure<UserDevExtension> {
"version" to "20190913-$mappingsMinecraftVersion"
))

accessTransformer(file("src/main/resources/META-INF/accesstransformer.cfg"))

runs {
val runConfig = Action<RunConfig> {
properties(mapOf(

0 comments on commit 8af68fc

Please sign in to comment.
You can’t perform that action at this time.