Thread now has only one terminating event: Thread.Exited

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@3131 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/RunningThreadsPad.cs

@@ -164,7 +164,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 			thread.NameChanged += delegate {
 				RefreshThread(thread);
 			};
-			thread.Expired += delegate {
+			thread.Exited += delegate {
 				RemoveThread(thread);
 			};
 		}

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Process-Threads.cs

@@ -39,7 +39,7 @@ namespace Debugger
 			get {
 				List<Thread> threads = new List<Thread>();
 				foreach(Thread thread in threadCollection) {
-					if (!thread.HasExpired) {
+					if (!thread.HasExited) {
 						threads.Add(thread);
 					}
 				}
@@ -64,7 +64,7 @@ namespace Debugger
 			threadCollection.Add(thread);
 			OnThreadStarted(thread);
 			
-			thread.NativeThreadExited += delegate {
+			thread.Exited += delegate {
 				threadCollection.Remove(thread);
 			};
 		}

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Thread.cs

@@ -21,41 +21,33 @@ namespace Debugger
 		
 		uint id;
 		ICorDebugThread corThread;
+		bool hasExited = false;
 		
 		List<Stepper> steppers = new List<Stepper>();
 		
+		StackFrame selectedStackFrame;
+		
 		Exception     currentException;
 		DebuggeeState currentException_DebuggeeState;
 		ExceptionType currentExceptionType;
 		bool          currentExceptionIsUnhandled;
 
-		bool hasExpired = false;
-		bool nativeThreadExited = false;
-
-		StackFrame selectedStackFrame;
-		
-		public event EventHandler Expired;
-		public event EventHandler<ThreadEventArgs> NativeThreadExited;
 		public event EventHandler<ThreadEventArgs> NameChanged;
-		
+		public event EventHandler<ThreadEventArgs> Exited;
-		public bool HasExpired {
-			get {
-				return hasExpired;
-			}
-		}
 		
 		[Debugger.Tests.Ignore]
 		public Process Process {
-			get {
+			get { return process; }
-				return process;
-			}
 		}
 
 		[Debugger.Tests.Ignore]
 		public uint ID { 
-			get{ 
+			get{ return id; } 
-				return id; 
+		}
-			} 
+		
+		public bool HasExited {
+			get { return hasExited; }
+			private set { hasExited = value; }
 		}
 		
 		/// <summary> From time to time the thread may be in invalid state. </summary>
@@ -76,8 +68,8 @@ namespace Debugger
 		
 		internal ICorDebugThread CorThread {
 			get {
-				if (nativeThreadExited) {
+				if (hasExited) {
-					throw new DebuggerException("Native thread has exited");
+					throw new DebuggerException("Thread has exited");
 				}
 				return corThread;
 			}
@@ -90,37 +82,23 @@ namespace Debugger
 			this.id = CorThread.ID;
 		}
 		
-		void Expire()
+		internal void NotifyExited()
 		{
-			System.Diagnostics.Debug.Assert(!this.hasExpired);
+			if (this.hasExited) throw new DebuggerException("Already exited");
 			
-			process.TraceMessage("Thread " + this.ID + " expired");
+			process.TraceMessage("Thread " + this.ID + " exited");
-			this.hasExpired = true;
-			OnExpired(new ThreadEventArgs(this));
 			if (process.SelectedThread == this) {
 				process.SelectedThread = null;
 			}
-		}
-		
-		protected virtual void OnExpired(EventArgs e)
-		{
-			if (Expired != null) {
-				Expired(this, e);
-			}
-		}
-		
-		internal void NotifyNativeThreadExited()
-		{
-			if (!this.hasExpired) Expire();
 			
-			nativeThreadExited = true;
+			this.HasExited = true;
-			OnNativeThreadExited(new ThreadEventArgs(this));
+			OnExited(new ThreadEventArgs(this));
 		}
 		
-		protected virtual void OnNativeThreadExited(ThreadEventArgs e)
+		protected virtual void OnExited(ThreadEventArgs e)
 		{
-			if (NativeThreadExited != null) {
+			if (Exited != null) {
-				NativeThreadExited(this, e);
+				Exited(this, e);
 			}
 		}
 		

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/ManagedCallback.cs

@@ -408,7 +408,7 @@ namespace Debugger
 			// It seems that ICorDebugThread is still not dead and can be used
 			EnterCallback(PausedReason.Other, "ExitThread " + pThread.ID, pThread);
 			
-			process.GetThread(pThread).NotifyNativeThreadExited();
+			process.GetThread(pThread).NotifyExited();
 			
 			try {
 				ExitCallback();

src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/MainThreadExit.cs

@@ -63,7 +63,7 @@ namespace Debugger.Tests {
         <CurrentException>null</CurrentException>
         <CurrentExceptionIsUnhandled>False</CurrentExceptionIsUnhandled>
         <CurrentExceptionType>0</CurrentExceptionType>
-        <HasExpired>False</HasExpired>
+        <HasExited>False</HasExited>
         <IsAtSafePoint>True</IsAtSafePoint>
         <IsInValidState>True</IsInValidState>
         <IsMostRecentStackFrameNative>False</IsMostRecentStackFrameNative>
@@ -73,25 +73,24 @@ namespace Debugger.Tests {
         </Name>
         <OldestStackFrame>Debugger.Tests.TestPrograms.MainThreadExit.Main</OldestStackFrame>
         <Priority>Normal</Priority>
-        <RuntimeValue exception="Thread has not started jet" />
+        <RuntimeValue>? = {System.Threading.Thread}</RuntimeValue>
         <SelectedStackFrame>Debugger.Tests.TestPrograms.MainThreadExit.Main</SelectedStackFrame>
         <Suspended>False</Suspended>
       </Item>
-      <Item Type="Thread" ToString="Thread Name =  Suspended = False">
+      <Item Type="Thread" ToString="Thread Name = Worker thread Suspended = False">
         <CurrentException>null</CurrentException>
         <CurrentExceptionIsUnhandled>False</CurrentExceptionIsUnhandled>
         <CurrentExceptionType>0</CurrentExceptionType>
-        <HasExpired>False</HasExpired>
+        <HasExited>False</HasExited>
         <IsAtSafePoint>False</IsAtSafePoint>
         <IsInValidState>True</IsInValidState>
         <IsMostRecentStackFrameNative>False</IsMostRecentStackFrameNative>
         <MostRecentStackFrame>System.Threading.ThreadHelper.ThreadStart</MostRecentStackFrame>
         <MostRecentStackFrameWithLoadedSymbols>null</MostRecentStackFrameWithLoadedSymbols>
-        <Name>
+        <Name>Worker thread</Name>
-        </Name>
         <OldestStackFrame>System.Threading.ThreadHelper.ThreadStart</OldestStackFrame>
         <Priority>Normal</Priority>
-        <RuntimeValue exception="Thread has not started jet" />
+        <RuntimeValue>? = {System.Threading.Thread}</RuntimeValue>
         <SelectedStackFrame>null</SelectedStackFrame>
         <Suspended>False</Suspended>
       </Item>
@@ -103,7 +102,7 @@ namespace Debugger.Tests {
         <CurrentException>null</CurrentException>
         <CurrentExceptionIsUnhandled>False</CurrentExceptionIsUnhandled>
         <CurrentExceptionType>0</CurrentExceptionType>
-        <HasExpired>False</HasExpired>
+        <HasExited>False</HasExited>
         <IsAtSafePoint>False</IsAtSafePoint>
         <IsInValidState>False</IsInValidState>
         <IsMostRecentStackFrameNative>False</IsMostRecentStackFrameNative>
@@ -113,25 +112,24 @@ namespace Debugger.Tests {
         </Name>
         <OldestStackFrame>null</OldestStackFrame>
         <Priority>Normal</Priority>
-        <RuntimeValue exception="Thread has not started jet" />
+        <RuntimeValue exception="The state of the thread is invalid. (Exception from HRESULT: 0x8013132D)" />
         <SelectedStackFrame>null</SelectedStackFrame>
         <Suspended>False</Suspended>
       </Item>
-      <Item Type="Thread" ToString="Thread Name =  Suspended = False">
+      <Item Type="Thread" ToString="Thread Name = Worker thread Suspended = False">
         <CurrentException>null</CurrentException>
         <CurrentExceptionIsUnhandled>False</CurrentExceptionIsUnhandled>
         <CurrentExceptionType>0</CurrentExceptionType>
-        <HasExpired>False</HasExpired>
+        <HasExited>False</HasExited>
         <IsAtSafePoint>True</IsAtSafePoint>
         <IsInValidState>True</IsInValidState>
         <IsMostRecentStackFrameNative>False</IsMostRecentStackFrameNative>
         <MostRecentStackFrame>System.Threading.WaitHandle.WaitOne</MostRecentStackFrame>
         <MostRecentStackFrameWithLoadedSymbols>Debugger.Tests.TestPrograms.MainThreadExit.WaitForALongTime</MostRecentStackFrameWithLoadedSymbols>
-        <Name>
+        <Name>Worker thread</Name>
-        </Name>
         <OldestStackFrame>System.Threading.ThreadHelper.ThreadStart</OldestStackFrame>
         <Priority>Normal</Priority>
-        <RuntimeValue exception="Thread has not started jet" />
+        <RuntimeValue>? = {System.Threading.Thread}</RuntimeValue>
         <SelectedStackFrame>Debugger.Tests.TestPrograms.MainThreadExit.WaitForALongTime</SelectedStackFrame>
         <Suspended>False</Suspended>
       </Item>