refactor: TicketType for external custom tickets

RelativityMC · Aug 9, 2024 · 3a1b849 · 3a1b849
1 parent bac4163
commit 3a1b849
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 9 deletions.
diff --git a/src/main/java/com/ishland/flowsched/scheduler/ItemHolder.java b/src/main/java/com/ishland/flowsched/scheduler/ItemHolder.java
@@ -300,7 +300,7 @@ public void addDependencyTicket(StatusAdvancingScheduler<K, V, Ctx, ?> scheduler
             if (info.refCnt[ordinal] == -1) {
                 info.refCnt[ordinal] = 0;
                 info.callbacks[ordinal] = new ObjectArrayList<>();
-                scheduler.addTicketWithSource(key, ItemTicket.TicketType.DEPENDENCY, this.getKey(), status, () -> {
+                scheduler.addTicket(key, ItemTicket.TicketType.DEPENDENCY, this.getKey(), status, () -> {
                     final ObjectArrayList<Runnable> list;
                     synchronized (this.dependencyInfos) {
                         list = info.callbacks[ordinal];
@@ -352,7 +352,7 @@ public void cleanupDependencies(StatusAdvancingScheduler<K, V, Ctx, ?> scheduler
                 boolean isEmpty = true;
                 for (int ordinal = 0, refCntLength = refCnt.length; ordinal < refCntLength; ordinal++) {
                     if (refCnt[ordinal] == 0) {
-                        scheduler.removeTicketWithSource(key, ItemTicket.TicketType.DEPENDENCY, this.getKey(), this.unloadedStatus.getAllStatuses()[ordinal]);
+                        scheduler.removeTicket(key, ItemTicket.TicketType.DEPENDENCY, this.getKey(), this.unloadedStatus.getAllStatuses()[ordinal]);
                         refCnt[ordinal] = -1;
                         info.callbacks[ordinal] = null;
                     }

diff --git a/src/main/java/com/ishland/flowsched/scheduler/ItemTicket.java b/src/main/java/com/ishland/flowsched/scheduler/ItemTicket.java
@@ -81,8 +81,21 @@ public int hashCode() {
 //        return hc;
 //    }
 
-    public enum TicketType {
-        EXTERNAL,
-        DEPENDENCY, // source: K
+    public static class TicketType {
+        public static TicketType DEPENDENCY = new TicketType("flowsched:dependency");
+        public static TicketType EXTERNAL = new TicketType("flowsched:external");
+
+        private final String description;
+
+        public TicketType(String description) {
+            this.description = description;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        // use default equals() and hashCode()
+
     }
 }
diff --git a/src/main/java/com/ishland/flowsched/scheduler/StatusAdvancingScheduler.java b/src/main/java/com/ishland/flowsched/scheduler/StatusAdvancingScheduler.java
@@ -383,10 +383,14 @@ private CancellationSignaller getDependencyFuture0(KeyStatusPair<K, V, Ctx>[] de
     }
 
     public ItemHolder<K, V, Ctx, UserData> addTicket(K key, ItemStatus<K, V, Ctx> targetStatus, Runnable callback) {
-        return this.addTicketWithSource(key, ItemTicket.TicketType.EXTERNAL, key, targetStatus, callback);
+        return this.addTicket(key, key, targetStatus, callback);
     }
 
-    ItemHolder<K, V, Ctx, UserData> addTicketWithSource(K key, ItemTicket.TicketType type, Object source, ItemStatus<K, V, Ctx> targetStatus, Runnable callback) {
+    public ItemHolder<K, V, Ctx, UserData> addTicket(K key, Object source, ItemStatus<K, V, Ctx> targetStatus, Runnable callback) {
+        return this.addTicket(key, ItemTicket.TicketType.EXTERNAL, source, targetStatus, callback);
+    }
+
+    public ItemHolder<K, V, Ctx, UserData> addTicket(K key, ItemTicket.TicketType type, Object source, ItemStatus<K, V, Ctx> targetStatus, Runnable callback) {
         return this.addTicket0(key, new ItemTicket<>(type, source, targetStatus, callback));
     }
 
@@ -428,10 +432,10 @@ private ItemHolder<K, V, Ctx, UserData> createHolder(K k) {
     }
 
     public void removeTicket(K key, ItemStatus<K, V, Ctx> targetStatus) {
-        this.removeTicketWithSource(key, ItemTicket.TicketType.EXTERNAL, key, targetStatus);
+        this.removeTicket(key, ItemTicket.TicketType.EXTERNAL, key, targetStatus);
     }
 
-    void removeTicketWithSource(K key, ItemTicket.TicketType type, Object source, ItemStatus<K, V, Ctx> targetStatus) {
+    public void removeTicket(K key, ItemTicket.TicketType type, Object source, ItemStatus<K, V, Ctx> targetStatus) {
         ItemHolder<K, V, Ctx, UserData> holder = this.getHolder(key);
         if (holder == null) {
             throw new IllegalStateException("No such item");