Attempt to fix outstanding dead operations

BiglySoftware · Sep 28, 2023 · dbec3b5 · dbec3b5
1 parent 8e234de
commit dbec3b5
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 6 deletions.
diff --git a/core/src/com/biglybt/core/CoreOperation.java b/core/src/com/biglybt/core/CoreOperation.java
@@ -19,6 +19,8 @@
 
 package com.biglybt.core;
 
+import java.util.concurrent.atomic.AtomicBoolean;
+
 public interface
 CoreOperation
 {
@@ -36,4 +38,29 @@
 
 	public CoreOperationTask
 	getTask();
+
+	public boolean
+	isRemoved();
+
+	public void
+	setRemoved();
+
+	public static abstract class
+	CoreOperationAdapter
+		implements CoreOperation
+	{
+		private AtomicBoolean	removed = new AtomicBoolean();
+
+		public boolean
+		isRemoved()
+		{
+			return( removed.get());
+		}
+
+		public void
+		setRemoved()
+		{
+			removed.set( true );
+		}
+	}
 }
diff --git a/core/src/com/biglybt/core/disk/impl/DiskManagerAllocationScheduler.java b/core/src/com/biglybt/core/disk/impl/DiskManagerAllocationScheduler.java
@@ -189,7 +189,7 @@
 				};
 
 			operation = 
-				new CoreOperation()
+				new CoreOperation.CoreOperationAdapter()
 				{
 					public int
 					getOperationType()

diff --git a/core/src/com/biglybt/core/disk/impl/DiskManagerRecheckScheduler.java b/core/src/com/biglybt/core/disk/impl/DiskManagerRecheckScheduler.java
@@ -304,7 +304,7 @@
 				};
 
 			op = 
-				new CoreOperation()
+				new CoreOperation.CoreOperationAdapter()
 				{
 					public int
 					getOperationType()

diff --git a/core/src/com/biglybt/core/impl/CoreImpl.java b/core/src/com/biglybt/core/impl/CoreImpl.java
@@ -3226,7 +3226,7 @@ public void runSupport(){
 		CoreOperationTask 		task )
 	{
 		CoreOperation op =
-				new CoreOperation()
+				new CoreOperation.CoreOperationAdapter()
 				{
 					@Override
 					public int
@@ -3281,7 +3281,15 @@ public void runSupport(){
 	addOperation(
 		CoreOperation		op )
 	{
-		operations.add( op );
+		synchronized( operations ){
+
+			if ( op.isRemoved()){
+
+				return;
+			}
+
+			operations.add( op );
+		}
 
 		for ( CoreOperationListener l: operation_listeners ){
 
@@ -3300,7 +3308,16 @@ public void runSupport(){
 	removeOperation(
 		CoreOperation		op )
 	{
-		if ( operations.remove( op )){
+		boolean was_added;
+
+		synchronized( operations ){
+
+			was_added = operations.remove( op );
+
+			op.setRemoved();
+		}
+
+		if ( was_added ){
 
 			for ( CoreOperationListener l: operation_listeners ){
 

diff --git a/uis/src/com/biglybt/ui/swt/progress/ProgressWindow.java b/uis/src/com/biglybt/ui/swt/progress/ProgressWindow.java
@@ -77,6 +77,11 @@
 
 						for ( CoreOperation op: ops ){
 
+							if ( op.isRemoved()){
+
+								continue;
+							}
+
 							int type = op.getOperationType();
 
 							if (	type == CoreOperation.OP_DOWNLOAD_CHECKING ||
@@ -85,9 +90,21 @@
 									type == CoreOperation.OP_FILE_MOVE ){
 
 								CoreOperationTask task = op.getTask();
-
+															
 								if ( task != null ){
 
+									ProgressCallback cb = task.getProgressCallback();
+
+									if ( cb != null ){
+
+										int state = cb.getTaskState();
+
+										if ( state == ProgressCallback.ST_CANCEL ){
+
+											continue;
+										}
+									}
+
 									if ( active.length() > 128 ){
 
 										active += ", ...";