Skip to content
This repository has been archived by the owner on Jul 9, 2023. It is now read-only.

Commit

Permalink
Improved synchronisation between internal and server-facing chunks
Browse files Browse the repository at this point in the history 
Fixes IntellectualSites/FastAsyncWorldEdit#1266
  • Loading branch information
@dordsor21
dordsor21 committed Sep 2, 2021
1 parent 8f8288a commit 5016d6d
Show file tree
Hide file tree
Showing 4 changed files with 316 additions and 256 deletions.
152 changes: 80 additions & 72 deletions ...R2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/BukkitGetBlocks_1_15_2.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@
import java.util.UUID;
import java.util.concurrent.Callable;
import java.util.concurrent.Future;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.function.Function;

public class BukkitGetBlocks_1_15_2 extends CharGetBlocks implements BukkitGetBlocks {
Expand All @@ -80,13 +82,14 @@ public class BukkitGetBlocks_1_15_2 extends CharGetBlocks implements BukkitGetBl
private static final Function<TileEntity, CompoundTag> nmsTile2We = tileEntity -> new LazyCompoundTag_1_15_2(Suppliers.memoize(
() -> tileEntity.save(new NBTTagCompound())));
private final FAWE_Spigot_v1_15_R2 adapter = ((FAWE_Spigot_v1_15_R2) WorldEditPlugin.getInstance().getBukkitImplAdapter());
public ChunkSection[] sections;
public Chunk nmsChunk;
public WorldServer world;
public int chunkX;
public int chunkZ;
public NibbleArray[] blockLight = new NibbleArray[16];
public NibbleArray[] skyLight = new NibbleArray[16];
private final ReadWriteLock sectionLock = new ReentrantReadWriteLock();
private final WorldServer world;
private final int chunkX;
private final int chunkZ;
private ChunkSection[] sections;
private Chunk nmsChunk;
private NibbleArray[] blockLight = new NibbleArray[16];
private NibbleArray[] skyLight = new NibbleArray[16];
private boolean createCopy = false;
private BukkitGetBlocks_1_15_2_Copy copy = null;
private boolean forceLoadSections = true;
Expand All @@ -107,6 +110,10 @@ public int getChunkX() {
return chunkX;
}

public int getChunkZ() {
return chunkZ;
}

@Override
public boolean isCreateCopy() {
return createCopy;
Expand Down Expand Up @@ -173,10 +180,6 @@ public int getMinSectionIndex() {
return 0;
}

public int getChunkZ() {
return chunkZ;
}

@Override
public BiomeType getBiomeType(int x, int y, int z) {
BiomeStorage index = getChunk().getBiomeIndex();
Expand Down Expand Up @@ -372,33 +375,6 @@ public CompoundTag apply(@Nullable Entity input) {
};
}

private void updateGet(
BukkitGetBlocks_1_15_2 get,
Chunk nmsChunk,
ChunkSection[] chunkSections,
ChunkSection section,
char[] arr,
int layer
) {
synchronized (get) {
if (this.getChunk() != nmsChunk) {
this.nmsChunk = nmsChunk;
this.sections = new ChunkSection[chunkSections.length];
System.arraycopy(chunkSections, 0, this.sections, 0, chunkSections.length);
this.reset();
}
if (this.sections == null) {
this.sections = new ChunkSection[chunkSections.length];
System.arraycopy(chunkSections, 0, this.sections, 0, chunkSections.length);
}
if (this.sections[layer] != section) {
// Not sure why it's funky, but it's what I did in commit fda7d00747abe97d7891b80ed8bb88d97e1c70d1 and I don't want to touch it >dords
this.sections[layer] = new ChunkSection[]{section}.clone()[0];
}
this.blocks[layer] = arr;
}
}

private void removeEntity(Entity entity) {
entity.die();
}
Expand Down Expand Up @@ -469,7 +445,7 @@ public synchronized <T extends Future<T>> T call(IChunkSet set, Runnable finaliz
if (existingSection == null) {
newSection = BukkitAdapter_1_15_2.newChunkSection(layer, setArr, fastmode, adapter);
if (BukkitAdapter_1_15_2.setSectionAtomic(sections, null, newSection, layer)) {
updateGet(this, nmsChunk, sections, newSection, setArr, layer);
updateGet(nmsChunk, sections, newSection, setArr, layer);
continue;
} else {
existingSection = sections[layer];
Expand All @@ -485,32 +461,34 @@ public synchronized <T extends Future<T>> T call(IChunkSet set, Runnable finaliz
//ensure that the server doesn't try to tick the chunksection while we're editing it.
DelegateLock lock = BukkitAdapter_1_15_2.applyLock(existingSection);

synchronized (this) {
// synchronise on internal section to avoid circular locking with a continuing edit if the chunk was
// submitted to keep loaded internal chunks to queue target size.
synchronized (super.sections[layer]) {
synchronized (lock) {
lock.untilFree();
if (this.getChunk() != nmsChunk) {
this.nmsChunk = nmsChunk;
this.sections = null;
this.reset();
} else if (existingSection != getSections(false)[layer]) {
this.sections[layer] = existingSection;
this.reset();
} else if (!Arrays.equals(update(layer, new char[4096], true), loadPrivately(layer))) {
this.reset(layer);
} else if (lock.isModified()) {
this.reset(layer);
try {
sectionLock.writeLock().lock();
if (this.getChunk() != nmsChunk) {
this.nmsChunk = nmsChunk;
this.sections = null;
this.reset();
} else if (existingSection != getSections(false)[layer]) {
this.sections[layer] = existingSection;
this.reset();
} else if (!Arrays.equals(update(layer, new char[4096], true), loadPrivately(layer))) {
this.reset(layer);
} else if (lock.isModified()) {
this.reset(layer);
}
} finally {
sectionLock.writeLock().unlock();
}
newSection = BukkitAdapter_1_15_2.newChunkSection(
layer,
this::loadPrivately,
setArr,
fastmode,
adapter
);
newSection =
BukkitAdapter_1_15_2.newChunkSection(layer, this::loadPrivately, setArr, fastmode, adapter);
if (!BukkitAdapter_1_15_2.setSectionAtomic(sections, existingSection, newSection, layer)) {
LOGGER.error("Failed to set chunk section:" + chunkX + "," + chunkZ + " layer: " + layer);
} else {
updateGet(this, nmsChunk, sections, newSection, setArr, layer);
updateGet(nmsChunk, sections, newSection, setArr, layer);
}
}
}
Expand Down Expand Up @@ -720,10 +698,38 @@ public synchronized <T extends Future<T>> T call(IChunkSet set, Runnable finaliz
}
}

private void updateGet(
Chunk nmsChunk,
ChunkSection[] chunkSections,
ChunkSection section,
char[] arr,
int layer
) {
try {
sectionLock.writeLock().lock();
if (this.getChunk() != nmsChunk) {
this.nmsChunk = nmsChunk;
this.sections = new ChunkSection[chunkSections.length];
System.arraycopy(chunkSections, 0, this.sections, 0, chunkSections.length);
this.reset();
}
if (this.sections == null) {
this.sections = new ChunkSection[chunkSections.length];
System.arraycopy(chunkSections, 0, this.sections, 0, chunkSections.length);
}
if (this.sections[layer] != section) {
// Not sure why it's funky, but it's what I did in commit fda7d00747abe97d7891b80ed8bb88d97e1c70d1 and I don't want to touch it >dords
this.sections[layer] = new ChunkSection[]{section}.clone()[0];
}
} finally {
sectionLock.writeLock().unlock();
}
this.blocks[layer] = arr;
}

private char[] loadPrivately(int layer) {
Section section = super.sections[layer];
if (super.sections[layer] != null) {
synchronized (section) {
synchronized (super.sections[layer]) {
if (super.sections[layer].isFull() && super.blocks[layer] != null) {
char[] blocks = new char[4096];
System.arraycopy(super.blocks[layer], 0, blocks, 0, 4096);
Expand All @@ -740,7 +746,7 @@ public synchronized void send(int mask, boolean lighting) {
}

@Override
public synchronized char[] update(int layer, char[] data, boolean aggressive) {
public char[] update(int layer, char[] data, boolean aggressive) {
ChunkSection section = getSections(aggressive)[layer];
// Section is null, return empty array
if (section == null) {
Expand Down Expand Up @@ -823,7 +829,7 @@ public synchronized char[] update(int layer, char[] data, boolean aggressive) {
}
}

private final char ordinal(IBlockData ibd, FAWE_Spigot_v1_15_R2 adapter) {
private char ordinal(IBlockData ibd, FAWE_Spigot_v1_15_R2 adapter) {
if (ibd == null) {
return BlockTypes.AIR.getDefaultState().getOrdinalChar();
} else {
Expand All @@ -832,22 +838,22 @@ private final char ordinal(IBlockData ibd, FAWE_Spigot_v1_15_R2 adapter) {
}

public ChunkSection[] getSections(boolean force) {
if (force && forceLoadSections) {
ChunkSection[] sections = getChunk().getSections();
ChunkSection[] copy = new ChunkSection[sections.length];
System.arraycopy(sections, 0, copy, 0, sections.length);
return copy;
}
force &= forceLoadSections;
sectionLock.readLock().lock();
ChunkSection[] tmp = sections;
if (tmp == null) {
synchronized (this) {
sectionLock.readLock().unlock();
if (tmp == null || force) {
try {
sectionLock.writeLock().lock();
tmp = sections;
if (tmp == null) {
if (tmp == null || force) {
ChunkSection[] chunkSections = getChunk().getSections();
tmp = new ChunkSection[chunkSections.length];
System.arraycopy(chunkSections, 0, tmp, 0, chunkSections.length);
sections = tmp;
}
} finally {
sectionLock.writeLock().unlock();
}
}
return tmp;
Expand Down Expand Up @@ -899,8 +905,10 @@ public boolean trim(boolean aggressive) {
skyLight = new NibbleArray[16];
blockLight = new NibbleArray[16];
if (aggressive) {
sectionLock.writeLock().lock();
sections = null;
nmsChunk = null;
sectionLock.writeLock().unlock();
return super.trim(true);
} else {
for (int i = 0; i < 16; i++) {
Expand Down

0 comments on commit 5016d6d

Please sign in to comment.