Cleaned up chunk locking code

Hilligans · Oct 10, 2023 · 3d1343f · 3d1343f
1 parent fea36dd
commit 3d1343f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 17 deletions.
diff --git a/src/main/java/dev/hilligans/ourcraft/Server/Concurrent/ChunkLocker.java b/src/main/java/dev/hilligans/ourcraft/Server/Concurrent/ChunkLocker.java
@@ -12,15 +12,9 @@ public class ChunkLocker {
 
     public IThreeDContainer<ChunkLock> chunkLocks = new EmptyContainer<>();
 
-    public int regionSize;
-
-    public ChunkLocker(int regionSize) {
-        this.regionSize = regionSize;
-    }
-
     public void release(Lock lock) {
         HashSet<Lock> locks = new HashSet<>();
-        lock.releaseLock();
+        lock.myLock.set(false);
         for(ChunkLock chunkLock : lock.chunkLocks) {
             locks.addAll(chunkLock.waitingLocks);
         }

diff --git a/src/main/java/dev/hilligans/ourcraft/Server/Concurrent/Lock.java b/src/main/java/dev/hilligans/ourcraft/Server/Concurrent/Lock.java
@@ -22,10 +22,11 @@ public class Lock {
     public AtomicInteger notifications = new AtomicInteger();
 
 
-    public Lock(ChunkPos... positions) {
+    public Lock(ChunkLocker chunkLocker, ChunkPos... positions) {
         this.chunkPositions = positions;
         Arrays.sort(this.chunkPositions, Comparator.comparingLong((ChunkPos o) -> o.chunkX).thenComparingLong(o -> o.chunkY).thenComparingLong(o -> o.chunkZ));
         chunkLocks = new ChunkLock[chunkPositions.length];
+        this.chunkLocker = chunkLocker;
     }
 
     public void notifyOfUnlock() {
@@ -40,19 +41,17 @@ public void notifyOfUnlock() {
         }
     }
 
-    public void releaseLock() {
-        myLock.set(false);
-    }
-
     public boolean hasAllLocks() {
         return hasAllLocks;
     }
 
-
     public void acquire(long... positions) {}
 
-    public void acquire() {}
-
-    public void release() {}
+    public void acquire() {
+        chunkLocker.acquire(this);
+    }
 
+    public void release() {
+        chunkLocker.release(this);
+    }
 }
diff --git a/src/main/java/dev/hilligans/ourcraft/Server/Tasks/ChunkTask.java b/src/main/java/dev/hilligans/ourcraft/Server/Tasks/ChunkTask.java
@@ -18,6 +18,11 @@ public ChunkTask(IChunk chunk) {
 
     @Override
     public void tick() {
-        chunkLocker.acquire(new Lock(new ChunkPos(chunk.getX(), chunk.getY(), chunk.getZ())));
+        //we make the lock with all the chunk positions we want
+        Lock lock = new Lock(chunkLocker, new ChunkPos(chunk.getX(), chunk.getY(), chunk.getZ()));
+        //we can then acquire it when we need it
+        lock.acquire();
+        //and release it when we no longer need it
+        lock.release();
     }
 }