From ecfb71b08f5ec8e6bd4b5f5e0a5711c202c96725 Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Sun, 8 Sep 2019 19:36:02 -0400
Subject: [PATCH] Changes made to GlobalBlockQueue to help diagnose lag.

---
 .../plot/util/block/GlobalBlockQueue.java     | 90 ++++++++++---------
 1 file changed, 46 insertions(+), 44 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java
index 3373f8e57..9725af48c 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java
@@ -8,6 +8,7 @@ import java.util.ArrayList;
 import java.util.ConcurrentModificationException;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Vector;
 import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -38,8 +39,7 @@ public class GlobalBlockQueue {
                         }
                         return;
                     }
-                } while (((GlobalBlockQueue.this.secondLast = System.currentTimeMillis())
-                    - GlobalBlockQueue.this.last) < free);
+                } while (((GlobalBlockQueue.this.secondLast = System.currentTimeMillis())- GlobalBlockQueue.this.last) < free);
             }
         };
 
@@ -81,50 +81,50 @@ public class GlobalBlockQueue {
             return false;
         }
         running.set(true);
-        TaskManager.runTaskRepeat(() -> {
-            if (inactiveQueues.isEmpty() && activeQueues.isEmpty()) {
-                lastSuccess = System.currentTimeMillis();
-                tasks();
-                return;
-            }
-            SET_TASK.value1 = 50 + Math.min(
-                (50 + GlobalBlockQueue.this.last) - (GlobalBlockQueue.this.last =
-                    System.currentTimeMillis()),
-                GlobalBlockQueue.this.secondLast - System.currentTimeMillis());
-            SET_TASK.value2 = getNextQueue();
-            if (SET_TASK.value2 == null) {
-                return;
-            }
-            if (!PlotSquared.get().isMainThread(Thread.currentThread())) {
-                throw new IllegalStateException(
-                    "This shouldn't be possible for placement to occur off the main thread");
-            }
-            // Disable the async catcher as it can't discern async vs parallel
-            SET_TASK.value2.startSet(true);
-            try {
-                if (PARALLEL_THREADS <= 1) {
-                    SET_TASK.run();
-                } else {
-                    ArrayList<Thread> threads = new ArrayList<>();
-                    for (int i = 0; i < PARALLEL_THREADS; i++) {
-                        threads.add(new Thread(SET_TASK));
-                    }
-                    for (Thread thread : threads) {
-                        thread.start();
-                    }
-                    for (Thread thread : threads) {
-                        try {
-                            thread.join();
-                        } catch (InterruptedException e) {
-                            e.printStackTrace();
+        TaskManager.runTaskRepeat(new Runnable() {
+            @Override public void run() {
+                if (inactiveQueues.isEmpty() && activeQueues.isEmpty()) {
+                    lastSuccess = System.currentTimeMillis();
+                    GlobalBlockQueue.this.tasks();
+                    return;
+                }
+                SET_TASK.value1 = 50 + Math.min((50 + GlobalBlockQueue.this.last) - (GlobalBlockQueue.this.last = System.currentTimeMillis()),
+                    GlobalBlockQueue.this.secondLast - System.currentTimeMillis());
+                SET_TASK.value2 = GlobalBlockQueue.this.getNextQueue();
+                if (SET_TASK.value2 == null) {
+                    return;
+                }
+                if (!PlotSquared.get().isMainThread(Thread.currentThread())) {
+                    throw new IllegalStateException(
+                        "This shouldn't be possible for placement to occur off the main thread");
+                }
+                // Disable the async catcher as it can't discern async vs parallel
+                SET_TASK.value2.startSet(true);
+                try {
+                    if (PARALLEL_THREADS <= 1) {
+                        SET_TASK.run();
+                    } else {
+                        ArrayList<Thread> threads = new ArrayList<>();
+                        for (int i = 0; i < PARALLEL_THREADS; i++) {
+                            threads.add(new Thread(SET_TASK));
+                        }
+                        for (Thread thread : threads) {
+                            thread.start();
+                        }
+                        for (Thread thread : threads) {
+                            try {
+                                thread.join();
+                            } catch (InterruptedException e) {
+                                e.printStackTrace();
+                            }
                         }
                     }
+                } catch (Throwable e) {
+                    e.printStackTrace();
+                } finally {
+                    // Enable it again (note that we are still on the main thread)
+                    SET_TASK.value2.endSet(true);
                 }
-            } catch (Throwable e) {
-                e.printStackTrace();
-            } finally {
-                // Enable it again (note that we are still on the main thread)
-                SET_TASK.value2.endSet(true);
             }
         }, 1);
         return true;
@@ -205,7 +205,9 @@ public class GlobalBlockQueue {
             } else {
                 ArrayList<Thread> threads = new ArrayList<>();
                 for (int i = 0; i < PARALLEL_THREADS; i++) {
-                    threads.add(new Thread(SET_TASK));
+                    Thread thread = new Thread(SET_TASK);
+                    thread.setName("PlotSquared Flush Task");
+                    threads.add(thread);
                 }
                 for (Thread thread : threads) {
                     thread.start();