From 785a5d19134bd23a570b72b8e7b4e86c35618f38 Mon Sep 17 00:00:00 2001
From: Anton Leherbauer <anton.leherbauer@windriver.com>
Date: Tue, 31 Aug 2010 14:01:38 +0000
Subject: [PATCH] Bug 323826 - Need a way to control the half second delay in
 SteppingControler

---
 .../ui/viewmodel/SteppingController.java      | 43 +++++++++++++++----
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/SteppingController.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/SteppingController.java
index c48e014390c..d6721dabc02 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/SteppingController.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/SteppingController.java
@@ -19,8 +19,6 @@ import java.util.Map;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-
 import org.eclipse.cdt.dsf.concurrent.ConfinedToDsfExecutor;
 import org.eclipse.cdt.dsf.concurrent.DataRequestMonitor;
 import org.eclipse.cdt.dsf.concurrent.DsfExecutor;
@@ -59,9 +57,11 @@ import org.eclipse.jface.util.PropertyChangeEvent;
 @ConfinedToDsfExecutor("#getExecutor()")
 public final class SteppingController {
     /**
-     * Amount of time in milliseconds, that it takes the SteppingTimedOutEvent 
+     * Default delay in milliseconds, that it takes the SteppingTimedOutEvent 
      * event to be issued after a step is started. 
-     * @see SteppingTimedOutEvent  
+     * @see SteppingTimedOutEvent
+     * @see #setStepTimeout(int)
+     * @see #getStepTimeout()
      */
     public final static int STEPPING_TIMEOUT = 500;
     
@@ -135,7 +135,12 @@ public final class SteppingController {
 	/**
 	 * Minimum step interval in milliseconds.
 	 */
-	private AtomicInteger fMinStepInterval= new AtomicInteger(0);
+	private volatile int fMinStepInterval;
+
+    /**
+     * Step timeout in milliseconds.
+     */
+    private volatile int fStepTimeout = STEPPING_TIMEOUT;
 
 	/**
 	 * Map of execution contexts for which a step is in progress.
@@ -194,7 +199,29 @@ public final class SteppingController {
      */
     @ThreadSafe
     public void setMinimumStepInterval(int interval) {
-    	fMinStepInterval.set(interval);
+    	fMinStepInterval = interval;
+    }
+
+    /**
+     * Configure the step timeout value. This controls the delay how long it takes
+     * to send out the {@link SteppingTimedOutEvent} after a step has been issued.
+     * 
+     * @param timeout  The timeout value in milliseconds (must be non-negative).
+     * @since 2.2
+     */
+    @ThreadSafe
+    public void setStepTimeout(int timeout) {
+        assert timeout >= 0;
+        fStepTimeout = timeout;
+    }
+    
+    /**
+     * @return the currently configured step timeout value
+     * @since 2.2
+     */
+    @ThreadSafe
+    public int getStepTimeout() {
+        return fStepTimeout;
     }
 
 	/**
@@ -315,7 +342,7 @@ public final class SteppingController {
 	 * @return  the number of milliseconds before the next possible step
 	 */
 	private int getStepDelay(IExecutionDMContext execCtx) {
-	    int minStepInterval = fMinStepInterval.get();
+	    int minStepInterval = fMinStepInterval;
 		if (minStepInterval > 0) {
 	        for (IExecutionDMContext lastStepCtx : fLastStepTimes.keySet()) {
 	            if (execCtx.equals(lastStepCtx) || DMContexts.isAncestorOf(execCtx, lastStepCtx)) {
@@ -588,7 +615,7 @@ public final class SteppingController {
                                 null);
                         }
                     }},
-                    STEPPING_TIMEOUT, TimeUnit.MILLISECONDS)
+                    fStepTimeout, TimeUnit.MILLISECONDS)
                 );
             
         }