From 566b84c2818ba56c2e5f27071428d0655276d31a Mon Sep 17 00:00:00 2001
From: Siegfried Pammer <siegfriedpammer@gmail.com>
Date: Thu, 3 Sep 2009 21:46:52 +0000
Subject: [PATCH] Profiler: - added translation for the profiler UI - added
 functionality to control data collection (only profile parts) - added new
 columns (Time spent (self); Time spent/call, Time spent (self)/call) - added
 hot path indicators - Top 20 tab is now sorted by TimeSpentSelf

* fixed bug in LocalizeExtension

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@4874 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
---
 .../Controller/Data/IProfilingDataSet.cs      |  5 +
 .../Data/ProfilingDataSQLiteProvider.cs       | 30 +++++-
 .../Data/ProfilingDataSQLiteWriter.cs         |  6 +-
 .../Controller/Data/TempFileDatabase.cs       | 13 +--
 .../Data/UnmanagedProfilingDataSet.cs         | 11 ++-
 .../Misc/Profiler/Controller/Profiler.cs      | 44 ++++++---
 .../Profiler/Controller/ProfilerOptions.cs    | 15 ++-
 .../Misc/Profiler/Frontend/AddIn/AddIn.csproj | 97 ++++++++++---------
 .../AddIn/ICSharpCode.Profiler.AddIn.addin    | 35 +++----
 .../AddIn/Src/Commands/CopyStacktrace.cs      |  7 --
 .../AddIn/Src/Commands/ProfileExecutable.cs   | 11 +--
 .../Src/Dialogs/ProfilerControlWindow.xaml    | 30 ++++++
 .../Src/Dialogs/ProfilerControlWindow.xaml.cs | 66 +++++++++++++
 .../AddIn/Src/OptionsPanels/General.cs        | 47 ++++++---
 .../OptionsPanels/GeneralOptionsPanel.xaml    | 65 ++++++++++---
 .../OptionsPanels/GeneralOptionsPanel.xaml.cs | 12 ++-
 .../Frontend/AddIn/Src/ProfilerRunner.cs      | 12 ++-
 .../AddIn/Src/Views/ProfilerView.xaml.cs      | 15 +--
 .../Controls/CallTreeNodeViewModel.cs         |  2 +-
 .../Frontend/Controls/Controls.csproj         |  2 +
 .../Frontend/Controls/ControlsTranslation.cs  | 22 +++++
 .../Frontend/Controls/QueryView.xaml.cs       |  6 +-
 .../Frontend/Controls/TimeLineControl.cs      | 31 +++++-
 .../LocalizeExtension.cs                      |  6 +-
 24 files changed, 427 insertions(+), 163 deletions(-)
 create mode 100644 src/AddIns/Misc/Profiler/Frontend/AddIn/Src/Dialogs/ProfilerControlWindow.xaml
 create mode 100644 src/AddIns/Misc/Profiler/Frontend/AddIn/Src/Dialogs/ProfilerControlWindow.xaml.cs
 create mode 100644 src/AddIns/Misc/Profiler/Frontend/Controls/ControlsTranslation.cs

diff --git a/src/AddIns/Misc/Profiler/Controller/Data/IProfilingDataSet.cs b/src/AddIns/Misc/Profiler/Controller/Data/IProfilingDataSet.cs
index 44b55970c3..b481fff5fd 100644
--- a/src/AddIns/Misc/Profiler/Controller/Data/IProfilingDataSet.cs
+++ b/src/AddIns/Misc/Profiler/Controller/Data/IProfilingDataSet.cs
@@ -27,6 +27,11 @@ namespace ICSharpCode.Profiler.Controller.Data
 		/// </summary>
 		double CpuUsage { get; }
 		
+		/// <summary>
+		/// Gets whether this dataset is the first dataset of a profiling run.
+		/// </summary>
+		bool IsFirst { get; }
+		
 		/// <summary>
 		/// Gets the root node of the dataset.
 		/// </summary>
diff --git a/src/AddIns/Misc/Profiler/Controller/Data/ProfilingDataSQLiteProvider.cs b/src/AddIns/Misc/Profiler/Controller/Data/ProfilingDataSQLiteProvider.cs
index 742a1ce07f..9df90fec69 100644
--- a/src/AddIns/Misc/Profiler/Controller/Data/ProfilingDataSQLiteProvider.cs
+++ b/src/AddIns/Misc/Profiler/Controller/Data/ProfilingDataSQLiteProvider.cs
@@ -173,14 +173,26 @@ namespace ICSharpCode.Profiler.Controller.Data
 					SQLiteCommand cmd;
 					
 					using (LockAndCreateCommand(out cmd)) {
-						cmd.CommandText = @"SELECT id, cpuusage
+						SQLiteDataReader reader;
+						bool isFirstAllowed = true;
+						try {
+							cmd.CommandText = @"SELECT id, cpuusage, isfirst
 											FROM DataSets
 											ORDER BY id;";
-						
-						SQLiteDataReader reader = cmd.ExecuteReader();
+							
+							reader = cmd.ExecuteReader();
+						} catch (SQLiteException) {
+							cmd.CommandText = @"SELECT id, cpuusage
+											FROM DataSets
+											ORDER BY id;";
+							
+							reader = cmd.ExecuteReader();
+							
+							isFirstAllowed = false;
+						}
 						
 						while (reader.Read()) {
-							list.Add(new SQLiteDataSet(this, reader.GetInt32(0), reader.GetDouble(1)));
+							list.Add(new SQLiteDataSet(this, reader.GetInt32(0), reader.GetDouble(1), isFirstAllowed ? reader.GetBoolean(2) : false));
 						}
 					}
 					
@@ -212,12 +224,14 @@ namespace ICSharpCode.Profiler.Controller.Data
 			ProfilingDataSQLiteProvider provider;
 			int index;
 			double cpuUsage;
+			bool isFirst;
 			
-			public SQLiteDataSet(ProfilingDataSQLiteProvider provider, int index, double cpuUsage)
+			public SQLiteDataSet(ProfilingDataSQLiteProvider provider, int index, double cpuUsage, bool isFirst)
 			{
 				this.provider = provider;
 				this.index = index;
 				this.cpuUsage = cpuUsage;
+				this.isFirst = isFirst;
 			}
 			
 			public double CpuUsage {
@@ -231,6 +245,12 @@ namespace ICSharpCode.Profiler.Controller.Data
 					return this.provider.GetRoot(index, index);
 				}
 			}
+			
+			public bool IsFirst {
+				get {
+					return isFirst;
+				}
+			}
 		}
 		
 		/// <summary>
diff --git a/src/AddIns/Misc/Profiler/Controller/Data/ProfilingDataSQLiteWriter.cs b/src/AddIns/Misc/Profiler/Controller/Data/ProfilingDataSQLiteWriter.cs
index ca4749a2e5..3834311b37 100644
--- a/src/AddIns/Misc/Profiler/Controller/Data/ProfilingDataSQLiteWriter.cs
+++ b/src/AddIns/Misc/Profiler/Controller/Data/ProfilingDataSQLiteWriter.cs
@@ -106,10 +106,11 @@ namespace ICSharpCode.Profiler.Controller.Data
 				
 				cmd.Parameters.Add(new SQLiteParameter("id", dataSetCount));
 				cmd.Parameters.Add(new SQLiteParameter("cpuuage", dataSet.CpuUsage.ToString(CultureInfo.InvariantCulture)));
+				cmd.Parameters.Add(new SQLiteParameter("isfirst", dataSet.IsFirst));
 				cmd.Parameters.Add(new SQLiteParameter("rootid", functionInfoCount));
 				
-				cmd.CommandText = "INSERT INTO DataSets(id, cpuusage, rootid)" +
-					"VALUES(?,?,?);";
+				cmd.CommandText = "INSERT INTO DataSets(id, cpuusage, isfirst, rootid)" +
+					"VALUES(?,?,?,?);";
 				
 				using (SQLiteCommand loopCommand = this.connection.CreateCommand()) {
 					CallTreeNode node = dataSet.RootNode;
@@ -208,6 +209,7 @@ namespace ICSharpCode.Profiler.Controller.Data
 				CREATE TABLE DataSets(
 					id INTEGER NOT NULL PRIMARY KEY,
 					cpuusage REAL NOT NULL,
+					isfirst INTEGER NOT NULL,
 					rootid INTEGER NOT NULL
 				);
 				
diff --git a/src/AddIns/Misc/Profiler/Controller/Data/TempFileDatabase.cs b/src/AddIns/Misc/Profiler/Controller/Data/TempFileDatabase.cs
index 411cddfd1f..fa6b63fe16 100644
--- a/src/AddIns/Misc/Profiler/Controller/Data/TempFileDatabase.cs
+++ b/src/AddIns/Misc/Profiler/Controller/Data/TempFileDatabase.cs
@@ -44,6 +44,7 @@ namespace ICSharpCode.Profiler.Controller.Data
 			public long StreamStartPosition { get; set; }
 			public long StreamLength { get; set; }
 			public double CpuUsage { get; set; }
+			public bool IsFirst { get; set; }
 		}
 		
 		#region TempFileDatabase DataSet and DataWriter implementation
@@ -54,8 +55,8 @@ namespace ICSharpCode.Profiler.Controller.Data
 			
 			public DataSet(TempFileDatabase database, UnmanagedMemory view,
 			               TargetProcessPointer nativeStartPosition, TargetProcessPointer nativeRootFuncInfoStartPosition,
-			               double cpuUsage)
-				: base(nativeStartPosition, nativeRootFuncInfoStartPosition, view.Pointer, view.Length, cpuUsage, database.is64Bit)
+			               double cpuUsage, bool isFirst)
+				: base(nativeStartPosition, nativeRootFuncInfoStartPosition, view.Pointer, view.Length, cpuUsage, isFirst, database.is64Bit)
 			{
 				this.database = database;
 				this.view = view;
@@ -116,7 +117,7 @@ namespace ICSharpCode.Profiler.Controller.Data
 				if (dataSet == null)
 					throw new InvalidOperationException("TempFileDatabase cannot write DataSets other than UnmanagedProfilingDataSet!");
 				
-				database.AddDataset((byte *)uDataSet.StartPtr.ToPointer(), uDataSet.Length, uDataSet.NativeStartPosition, uDataSet.NativeRootFuncInfoPosition, uDataSet.CpuUsage);
+				database.AddDataset((byte *)uDataSet.StartPtr.ToPointer(), uDataSet.Length, uDataSet.NativeStartPosition, uDataSet.NativeRootFuncInfoPosition, uDataSet.CpuUsage, uDataSet.IsFirst);
 				this.database.is64Bit = uDataSet.Is64Bit;
 			}
 			
@@ -149,14 +150,14 @@ namespace ICSharpCode.Profiler.Controller.Data
 			this.file = new FileStream(fileName, FileMode.Open, FileAccess.ReadWrite, FileShare.ReadWrite, 4096, FileOptions.Asynchronous | FileOptions.DeleteOnClose);
 		}
 		
-		unsafe void AddDataset(byte *ptr, long length, TargetProcessPointer nativeStartPosition, TargetProcessPointer nativeRootFuncInfoStartPosition, double cpuUsage)
+		unsafe void AddDataset(byte *ptr, long length, TargetProcessPointer nativeStartPosition, TargetProcessPointer nativeRootFuncInfoStartPosition, double cpuUsage, bool isFirst)
 		{
 			byte[] data = new byte[length];
 			Marshal.Copy(new IntPtr(ptr), data, 0, (int)length);
 			if (this.currentWrite != null)
 				this.file.EndWrite(this.currentWrite);
 			this.streamInfos.Add(new StreamInfo { NativeStartPosition = nativeStartPosition, NativeRootFuncInfoStartPosition = nativeRootFuncInfoStartPosition,
-			                     	StreamStartPosition = this.file.Length, StreamLength = length, CpuUsage = cpuUsage });
+			                     	StreamStartPosition = this.file.Length, StreamLength = length, CpuUsage = cpuUsage, IsFirst = isFirst });
 			this.currentWrite = this.file.BeginWrite(data, 0, (int)length, null, null);
 		}
 		
@@ -206,7 +207,7 @@ namespace ICSharpCode.Profiler.Controller.Data
 			
 			return new DataSet(this, mmf.MapView(streamInfos[index].StreamStartPosition, streamInfos[index].StreamLength), streamInfos[index].NativeStartPosition,
 			                   streamInfos[index].NativeRootFuncInfoStartPosition,
-			                   streamInfos[index].CpuUsage);
+			                   streamInfos[index].CpuUsage, streamInfos[index].IsFirst);
 		}
 		
 		/// <summary>
diff --git a/src/AddIns/Misc/Profiler/Controller/Data/UnmanagedProfilingDataSet.cs b/src/AddIns/Misc/Profiler/Controller/Data/UnmanagedProfilingDataSet.cs
index ee30a14d00..51c496c04b 100644
--- a/src/AddIns/Misc/Profiler/Controller/Data/UnmanagedProfilingDataSet.cs
+++ b/src/AddIns/Misc/Profiler/Controller/Data/UnmanagedProfilingDataSet.cs
@@ -24,6 +24,7 @@ namespace ICSharpCode.Profiler.Controller.Data
 		TargetProcessPointer nativeRootFuncInfoPosition;
 		bool isDisposed;
 		double cpuUsage;
+		bool isFirst;
 		bool is64Bit;
 		
 		/// <summary>
@@ -82,12 +83,13 @@ namespace ICSharpCode.Profiler.Controller.Data
 		public abstract NameMapping GetMapping(int nameId);
 		
 		internal UnmanagedProfilingDataSet(TargetProcessPointer nativeStartPosition, TargetProcessPointer nativeRootFuncInfoPosition,
-		                                   byte *startPtr, long length, double cpuUsage, bool is64Bit)
+		                                   byte *startPtr, long length, double cpuUsage, bool isFirst, bool is64Bit)
 		{
 			this.nativeStartPosition = nativeStartPosition;
 			this.cpuUsage = cpuUsage;
 			this.nativeRootFuncInfoPosition = nativeRootFuncInfoPosition;
 			this.is64Bit = is64Bit;
+			this.isFirst = isFirst;
 			this.startPtr = new IntPtr(startPtr);
 			this.length = length;
 		}
@@ -140,5 +142,12 @@ namespace ICSharpCode.Profiler.Controller.Data
 		{
 			isDisposed = true;
 		}
+		
+		/// <inheritdoc/>
+		public bool IsFirst {
+			get {
+				return isFirst;
+			}
+		}
 	}
 }
diff --git a/src/AddIns/Misc/Profiler/Controller/Profiler.cs b/src/AddIns/Misc/Profiler/Controller/Profiler.cs
index 0e6cfec793..7348df9f0c 100644
--- a/src/AddIns/Misc/Profiler/Controller/Profiler.cs
+++ b/src/AddIns/Misc/Profiler/Controller/Profiler.cs
@@ -48,6 +48,8 @@ namespace ICSharpCode.Profiler.Controller
 		bool is64Bit;
 		bool isRunning;
 		volatile bool stopDC;
+		volatile bool enableDC;
+		volatile bool isFirstDC;
 		
 		/// <summary>
 		/// Gets whether the profiler is running inside a 64-bit profilee process or not.
@@ -198,6 +200,17 @@ namespace ICSharpCode.Profiler.Controller
 			get { return profilerOutput.ToString(); }
 		}
 		
+		public void EnableDataCollection()
+		{
+			this.enableDC = true;
+		}
+		
+		public void DisableDataCollection()
+		{
+			this.enableDC = false;
+			this.isFirstDC = true;
+		}
+		
 		/// <summary>
 		/// Creates a new profiler using the path to an executable to profile and a data writer.
 		/// </summary>
@@ -302,8 +315,6 @@ namespace ICSharpCode.Profiler.Controller
 				this.Pause();
 				this.threadListMutex.WaitOne();
 
-				Debug.Print("running DC " + (is64Bit ? "x64" : "x86"));
-
 				if (this.is64Bit)
 					CollectData64();
 				else
@@ -342,13 +353,16 @@ namespace ICSharpCode.Profiler.Controller
 
 				item = (ThreadLocalData32*)TranslatePointer(item->Predecessor);
 			}
-
-			this.AddDataset(fullView.Pointer,
-			                memHeader32->NativeAddress + memHeader32->HeapOffset,
-			                memHeader32->Allocator.startPos - memHeader32->NativeAddress,
-			                memHeader32->Allocator.pos - memHeader32->Allocator.startPos,
-			                (cpuUsageCounter == null) ? 0 : cpuUsageCounter.NextValue(),
-			                memHeader32->RootFuncInfoAddress);
+			if (this.enableDC) {
+				this.AddDataset(fullView.Pointer,
+				                memHeader32->NativeAddress + memHeader32->HeapOffset,
+				                memHeader32->Allocator.startPos - memHeader32->NativeAddress,
+				                memHeader32->Allocator.pos - memHeader32->Allocator.startPos,
+				                (cpuUsageCounter == null) ? 0 : cpuUsageCounter.NextValue(),
+				                isFirstDC,
+				                memHeader32->RootFuncInfoAddress);
+				isFirstDC = false;
+			}
 
 			ZeroMemory(new IntPtr(TranslatePointer(memHeader32->Allocator.startPos)), new IntPtr(memHeader32->Allocator.pos - memHeader32->Allocator.startPos));
 
@@ -388,9 +402,9 @@ namespace ICSharpCode.Profiler.Controller
 			}
 		}
 		
-		unsafe void AddDataset(byte *ptr, TargetProcessPointer nativeStartPosition, long offset, long length, double cpuUsage, TargetProcessPointer nativeRootFuncInfoPosition)
+		unsafe void AddDataset(byte *ptr, TargetProcessPointer nativeStartPosition, long offset, long length, double cpuUsage, bool isFirst, TargetProcessPointer nativeRootFuncInfoPosition)
 		{
-			using (DataSet dataSet = new DataSet(this, ptr + offset, length, nativeStartPosition, nativeRootFuncInfoPosition, cpuUsage, is64Bit)) {
+			using (DataSet dataSet = new DataSet(this, ptr + offset, length, nativeStartPosition, nativeRootFuncInfoPosition, cpuUsage, isFirst, is64Bit)) {
 				lock (this.dataWriter) {
 					this.dataWriter.WriteDataSet(dataSet);
 				}
@@ -492,6 +506,9 @@ namespace ICSharpCode.Profiler.Controller
 			this.profilee.StartInfo = this.psi;
 			this.profilee.Exited += new EventHandler(ProfileeExited);
 			
+			this.enableDC = this.profilerOptions.EnableDCAtStart;
+			this.isFirstDC = true;
+			
 			Debug.WriteLine("Launching profiler for " + this.psi.FileName + "...");
 			this.profilee.Start();
 			
@@ -578,6 +595,7 @@ namespace ICSharpCode.Profiler.Controller
 			// unload all counters to prevent exception during last collection!
 			this.cpuUsageCounter = null;
 			this.performanceCounters = null;
+			
 			// Take last shot
 			if (this.is64Bit)
 				CollectData64();
@@ -796,8 +814,8 @@ namespace ICSharpCode.Profiler.Controller
 			
 			public DataSet(Profiler profiler, byte *startPtr, long length, TargetProcessPointer nativeStartPosition,
 			               TargetProcessPointer nativeRootFuncInfoPosition,
-			               double cpuUsage, bool is64Bit)
-				: base(nativeStartPosition, nativeRootFuncInfoPosition, startPtr, length, cpuUsage, is64Bit)
+			               double cpuUsage, bool isFirst, bool is64Bit)
+				: base(nativeStartPosition, nativeRootFuncInfoPosition, startPtr, length, cpuUsage, isFirst, is64Bit)
 			{
 				this.profiler = profiler;
 			}
diff --git a/src/AddIns/Misc/Profiler/Controller/ProfilerOptions.cs b/src/AddIns/Misc/Profiler/Controller/ProfilerOptions.cs
index 0788b76973..adf0578b12 100644
--- a/src/AddIns/Misc/Profiler/Controller/ProfilerOptions.cs
+++ b/src/AddIns/Misc/Profiler/Controller/ProfilerOptions.cs
@@ -17,9 +17,10 @@ namespace ICSharpCode.Profiler.Controller
 		/// <summary>
 		/// Defines the default size of the shared memory.
 		/// </summary>
-		public const int SHARED_MEMORY_SIZE = 64 * 1024 * 1024; // 64 mb
+		public const int DefaultSharedMemorySize = 64 * 1024 * 1024; // 64 mb
 		
 		bool enableDC;
+		bool enableDCAtStart;
 		bool dotNotProfileDotNetInternals;
 		bool combineRecursiveFunction;
 		int sharedMemorySize;
@@ -45,6 +46,13 @@ namespace ICSharpCode.Profiler.Controller
 			get { return enableDC; }
 		}
 		
+		/// <summary>
+		/// Gets whether data collection is enabled at the start of the profiling session.
+		/// </summary>
+		public bool EnableDCAtStart {
+			get { return enableDCAtStart; }
+		}
+		
 		/// <summary>
 		/// Gets the size of the shared memory.
 		/// </summary>
@@ -55,19 +63,20 @@ namespace ICSharpCode.Profiler.Controller
 		/// <summary>
 		/// Creates new ProfilerOptions using the selected settings.
 		/// </summary>
-		public ProfilerOptions(bool enableDC, int sharedMemorySize, bool profileDotNetInternals, bool combineRecursiveFunction)
+		public ProfilerOptions(bool enableDC, int sharedMemorySize, bool profileDotNetInternals, bool combineRecursiveFunction, bool enableDCAtStart)
 		{
 			this.enableDC = enableDC;
 			this.sharedMemorySize = sharedMemorySize;
 			this.dotNotProfileDotNetInternals = profileDotNetInternals;
 			this.combineRecursiveFunction = combineRecursiveFunction;
+			this.enableDCAtStart = enableDCAtStart;
 		}
 		
 		/// <summary>
 		/// Creates default ProfilerOptions.
 		/// </summary>
 		public ProfilerOptions()
-			: this(true, SHARED_MEMORY_SIZE, false, false)
+			: this(true, DefaultSharedMemorySize, false, false, true)
 		{
 		}
 	}
diff --git a/src/AddIns/Misc/Profiler/Frontend/AddIn/AddIn.csproj b/src/AddIns/Misc/Profiler/Frontend/AddIn/AddIn.csproj
index 12abd8136d..09e47da3f7 100644
--- a/src/AddIns/Misc/Profiler/Frontend/AddIn/AddIn.csproj
+++ b/src/AddIns/Misc/Profiler/Frontend/AddIn/AddIn.csproj
@@ -38,54 +38,6 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <FileAlignment>4096</FileAlignment>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="ICSharpCode.Core">
-      <HintPath>..\..\..\..\..\..\bin\ICSharpCode.Core.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="ICSharpCode.Core.Presentation">
-      <HintPath>..\..\..\..\..\..\bin\ICSharpCode.Core.Presentation.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="ICSharpCode.SharpDevelop">
-      <HintPath>..\..\..\..\..\..\bin\ICSharpCode.SharpDevelop.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="ICSharpCode.SharpDevelop.Dom">
-      <HintPath>..\..\..\..\..\..\bin\ICSharpCode.SharpDevelop.Dom.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.Build.Engine" />
-    <Reference Include="Microsoft.Build.Framework" />
-    <Reference Include="PresentationCore">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="PresentationFramework">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Management" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Windows.Presentation">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml" />
-    <Reference Include="UIAutomationProvider">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="UnitTesting">
-      <HintPath>..\..\..\..\..\..\AddIns\AddIns\Misc\UnitTesting\UnitTesting.dll</HintPath>
-    </Reference>
-    <Reference Include="WindowsBase">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsFormsIntegration" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="ICSharpCode.Profiler.AddIn.addin">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -106,6 +58,10 @@
     <Compile Include="Src\Dialogs\ProfileExecutableForm.xaml.cs">
       <DependentUpon>ProfileExecutableForm.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Src\Dialogs\ProfilerControlWindow.xaml.cs">
+      <DependentUpon>ProfilerControlWindow.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Src\Extensions.cs" />
     <Compile Include="Src\OptionsPanels\General.cs">
       <SubType>UserControl</SubType>
@@ -128,18 +84,63 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Src\Dialogs\ProfilerControlWindow.xaml" />
     <Page Include="Src\OptionsPanels\GeneralOptionsPanel.xaml" />
     <Page Include="Src\Views\ProfilerView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="ICSharpCode.Core">
+      <HintPath>..\..\..\..\..\..\bin\ICSharpCode.Core.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="ICSharpCode.Core.Presentation">
+      <HintPath>..\..\..\..\..\..\bin\ICSharpCode.Core.Presentation.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="ICSharpCode.SharpDevelop">
+      <HintPath>..\..\..\..\..\..\bin\ICSharpCode.SharpDevelop.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="ICSharpCode.SharpDevelop.Dom">
+      <HintPath>..\..\..\..\..\..\bin\ICSharpCode.SharpDevelop.Dom.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.Build" />
+    <Reference Include="PresentationCore">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="PresentationFramework">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="UnitTesting">
+      <HintPath>..\..\..\..\..\..\AddIns\AddIns\Misc\UnitTesting\UnitTesting.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="WindowsBase">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsFormsIntegration">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
     <ProjectReference Include="..\..\Controller\Controller.csproj">
       <Project>{72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F}</Project>
       <Name>Controller</Name>
+      <Private>True</Private>
     </ProjectReference>
     <ProjectReference Include="..\Controls\Controls.csproj">
       <Project>{BDA49550-5ED1-4C6B-B648-657B2CACD8E0}</Project>
       <Name>Controls</Name>
+      <Private>True</Private>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
diff --git a/src/AddIns/Misc/Profiler/Frontend/AddIn/ICSharpCode.Profiler.AddIn.addin b/src/AddIns/Misc/Profiler/Frontend/AddIn/ICSharpCode.Profiler.AddIn.addin
index e9e90d3bc1..58370088c8 100644
--- a/src/AddIns/Misc/Profiler/Frontend/AddIn/ICSharpCode.Profiler.AddIn.addin
+++ b/src/AddIns/Misc/Profiler/Frontend/AddIn/ICSharpCode.Profiler.AddIn.addin
@@ -22,13 +22,13 @@
 				<MenuItem
 					id="ProfileProject"
 					class="ICSharpCode.Profiler.AddIn.Commands.ProfileProject"
-					label="Profile current project"
+					label="${res:AddIns.Profiler.ProfileCurrentProject}"
 				/>
 			</ComplexCondition>
 			<MenuItem
 				id="ProfileExecutable"
 				class="ICSharpCode.Profiler.AddIn.Commands.ProfileExecutable"
-				label="Select executable to profile"
+				label="${res:AddIns.Profiler.ProfileExecutable}"
 			/>
 		</MenuItem>
 	</Path>
@@ -37,58 +37,55 @@
 		<DisplayBinding id = "ProfilerDisplayBinding"
 		                insertbefore="Text"
 		                fileNamePattern=".sdps"
-		                title = "Profiler View"
+		                title = "${res:AddIns.Profiler.ProfilingView.Title}"
 		                class = "ICSharpCode.Profiler.AddIn.Views.ProfilerDisplayBinding"/>
 	</Path>
 	
 	<Path name="/AddIns/Profiler/QueryView/ContextMenu">
 		<MenuItem
 			id="GoToDefinition"
-			label="Go to definition"
+			label="{res:AddIns.Profiler.ProfilingView.ContextMenu.GoToDefinition}"
 			class="ICSharpCode.Profiler.AddIn.Commands.GoToDefinition" />
 		<MenuItem
 			id="FindReferences"
-			label="Find references"
+			label="{res:SharpDevelop.Refactoring.FindReferences}"
 			class="ICSharpCode.Profiler.AddIn.Commands.FindReferences" />
 		<MenuItem type="Separator" id="Separator2" />
 		<MenuItem
 			id="SetAsRoot"
-			label="Set as root/Merge"
+			label="{res:AddIns.Profiler.ProfilingView.ContextMenu.SetAsRoot}"
 			class="ICSharpCode.Profiler.AddIn.Commands.SetAsRoot" />
 		<MenuItem
 			id="FindCallsOfSelected"
-			label="Find calls of selected functions"
+			label="{res:AddIns.Profiler.ProfilingView.ContextMenu.FindCallsOfSelected}"
 			class="ICSharpCode.Profiler.AddIn.Commands.FindCallsOfSelected" />
 		<MenuItem
 			id="ShowFunctions"
-			label="Show functions"
+			label="{res:AddIns.Profiler.ProfilingView.ContextMenu.ShowFunctions}"
 			class="ICSharpCode.Profiler.AddIn.Commands.ShowFunctions" />
 		<MenuItem type="Separator" id="Separator1" />
 		<MenuItem
-			id="CopyStackTrace"
-			label="Copy stacktrace"
+			id="CopyStacktrace"
+			label="{res:AddIns.Profiler.ProfilingView.ContextMenu.CopyStacktrace}"
 			class="ICSharpCode.Profiler.AddIn.Commands.CopyStacktrace" />
 		<MenuItem
 			id="CopySelectedData"
-			label="Copy selected data"
+			label="{res:AddIns.Profiler.ProfilingView.ContextMenu.CopySelectedData}"
 			class="ICSharpCode.Profiler.AddIn.Commands.CopySelectedData" />
 	</Path>
 	
 	<Path name="/SharpDevelop/Workbench/FileFilter">
 		<FileFilter id = "SharpDevelopProfingSession"
 		            insertbefore="AllFiles"
-		            name = "SharpDevelop Profiling Session"
+		            name = "{res:AddIns.Profiler.FileExtensionDescription}"
 		            extensions = "*.sdps"/>
 	</Path>
 	
 	<Path name="/SharpDevelop/Dialogs/OptionsDialog">
 		<DialogPanel id    = "Profiling"
-		             label = "Profiling"
-		             insertbefore = "TextEditorOptions">
-			<DialogPanel id    = "General"
-			             label = "General"
-			             class = "ICSharpCode.Profiler.AddIn.OptionsPanels.General"/>
-		</DialogPanel>
+		             label = "{res:AddIns.Profiler.Options.Title}"
+		             class = "ICSharpCode.Profiler.AddIn.OptionsPanels.General"
+		             insertbefore = "TextEditorOptions" />
 	</Path>
 
 	<Path name = "/SharpDevelop/Pads/UnitTestsPad/CommonTestCommands">
@@ -100,7 +97,7 @@
 				</Not>
 			</And>
 			<MenuItem id    = "RunWithProfiler"
-			          label = "Run with profiler"
+			          label = "{res:AddIns.Profiler.UnitTests.RunWithProfiler}"
 			          class = "ICSharpCode.Profiler.AddIn.Commands.RunTestWithProfilerCommand"/>
 		</ComplexCondition>
 	</Path>
diff --git a/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/Commands/CopyStacktrace.cs b/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/Commands/CopyStacktrace.cs
index d70c76302d..7700ded6d7 100644
--- a/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/Commands/CopyStacktrace.cs
+++ b/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/Commands/CopyStacktrace.cs
@@ -6,16 +6,9 @@
 // </file>
 
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;
-using System.Windows.Shapes;
-
-using ICSharpCode.Core;
-using ICSharpCode.Profiler.Controller.Queries;
-using ICSharpCode.Profiler.Controls;
 
 namespace ICSharpCode.Profiler.AddIn.Commands
 {
diff --git a/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/Commands/ProfileExecutable.cs b/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/Commands/ProfileExecutable.cs
index eaccea7dd2..2629bcd192 100644
--- a/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/Commands/ProfileExecutable.cs
+++ b/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/Commands/ProfileExecutable.cs
@@ -6,17 +6,8 @@
 // </file>
 
 using System;
-using System.IO;
-using System.Windows.Forms;
-
-using ICSharpCode.Core;
-using ICSharpCode.Profiler.AddIn.Views;
-using ICSharpCode.Profiler.Controller.Data;
-using ICSharpCode.SharpDevelop;
-using ICSharpCode.SharpDevelop.Gui;
-using ICSharpCode.SharpDevelop.Project;
-using Microsoft.Build.BuildEngine;
 using System.Windows.Interop;
+using ICSharpCode.SharpDevelop.Gui;
 
 namespace ICSharpCode.Profiler.AddIn.Commands
 {
diff --git a/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/Dialogs/ProfilerControlWindow.xaml b/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/Dialogs/ProfilerControlWindow.xaml
new file mode 100644
index 0000000000..e454473407
--- /dev/null
+++ b/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/Dialogs/ProfilerControlWindow.xaml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Window
+  x:Class="ICSharpCode.Profiler.AddIn.Dialogs.ProfilerControlWindow" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sd="http://icsharpcode.net/sharpdevelop/core"
+  Title="{sd:Localize AddIns.Profiler.ProfilerControlWindow.Title}"
+  WindowStyle="ToolWindow" Closing="WindowClosing"
+  Topmost="True"
+  Height="60"
+  Width="170">
+  <Grid>
+    <Grid.RowDefinitions>
+      <RowDefinition
+        Height="*" />
+    </Grid.RowDefinitions>
+    <ToolBar
+      Grid.Column="0"
+      Grid.Row="0"
+      HorizontalAlignment="Left"
+      VerticalAlignment="Stretch">
+      <ToggleButton
+        Content="CollectData"
+        x:Name="collectData"
+        Checked="CollectDataChecked"
+        Unchecked="CollectDataUnchecked" />
+      <Button
+        Content="Shutdown"
+        x:Name="shutdown"
+        Click="ShutdownClick" />
+    </ToolBar>
+  </Grid>
+</Window>
\ No newline at end of file
diff --git a/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/Dialogs/ProfilerControlWindow.xaml.cs b/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/Dialogs/ProfilerControlWindow.xaml.cs
new file mode 100644
index 0000000000..e61928d14d
--- /dev/null
+++ b/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/Dialogs/ProfilerControlWindow.xaml.cs
@@ -0,0 +1,66 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="Siegfried Pammer" email="siegfriedpammer@gmail.com"/>
+//     <version>$Revision$</version>
+// </file>
+using ICSharpCode.Core;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using ICSharpCode.Profiler.Controller;
+
+namespace ICSharpCode.Profiler.AddIn.Dialogs
+{
+	/// <summary>
+	/// Interaction logic for ProfilerControlWindow.xaml
+	/// </summary>
+	public partial class ProfilerControlWindow : Window
+	{
+		ProfilerRunner runner;
+		public bool AllowClose { get; set; }
+		
+		public ProfilerControlWindow(ProfilerRunner runner)
+		{
+			InitializeComponent();
+			
+			this.runner = runner;
+			this.collectData.IsChecked = runner.Profiler.ProfilerOptions.EnableDCAtStart;
+		}
+		
+		void CollectDataChecked(object sender, RoutedEventArgs e)
+		{
+			try {
+				this.runner.Profiler.EnableDataCollection();
+			} catch (Exception ex) {
+				MessageService.ShowError(ex);
+			}
+		}
+		
+		void CollectDataUnchecked(object sender, RoutedEventArgs e)
+		{
+			try {
+				this.runner.Profiler.DisableDataCollection();
+			} catch (Exception ex) {
+				MessageService.ShowError(ex);
+			}
+		}
+		
+		void ShutdownClick(object sender, RoutedEventArgs e)
+		{
+			this.AllowClose = true;
+			this.runner.Stop();
+		}
+		
+		void WindowClosing(object sender, System.ComponentModel.CancelEventArgs e)
+		{
+			e.Cancel = !AllowClose;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/OptionsPanels/General.cs b/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/OptionsPanels/General.cs
index 78ca657a0b..1e6d4e8956 100644
--- a/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/OptionsPanels/General.cs
+++ b/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/OptionsPanels/General.cs
@@ -14,6 +14,7 @@ using ICSharpCode.Core;
 using ICSharpCode.Profiler.Controller;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Gui;
+using System.Windows.Threading;
 
 namespace ICSharpCode.Profiler.AddIn.OptionsPanels
 {
@@ -36,29 +37,43 @@ namespace ICSharpCode.Profiler.AddIn.OptionsPanels
 		
 		public override void LoadPanelContents()
 		{
-			panel.SetOptionValue<bool>("EnableDC", !properties.Get("EnableDC", true));
-			panel.SetOptionValue<double>("SharedMemorySize", properties.Get("SharedMemorySize", ProfilerOptions.SHARED_MEMORY_SIZE) / 1024 / 1024);
-			panel.SetOptionValue<bool>("DoNotProfileNetInternals", properties.Get("DoNotProfileNetInternals", false));
-			panel.SetOptionValue<bool>("CombineRecursiveFunction", properties.Get("CombineRecursiveFunction", false));
-			base.LoadPanelContents();
+			try {
+				panel.SetOptionValue("EnableDC", !properties.Get("EnableDC", true));
+				panel.SetOptionValue("SharedMemorySize", properties.Get("SharedMemorySize", ProfilerOptions.DefaultSharedMemorySize) / 1024 / 1024);
+				panel.SetOptionValue("DoNotProfileNetInternals", properties.Get("DoNotProfileNetInternals", false));
+				panel.SetOptionValue("CombineRecursiveFunction", properties.Get("CombineRecursiveFunction", false));
+				panel.SetOptionValue("EnableDCAtStart", properties.Get("EnableDCAtStart", true));
+				base.LoadPanelContents();
+			} catch (Exception e) {
+				MessageService.ShowError(e);
+			}
 		}
 		
 		public override bool StorePanelContents()
 		{
-			properties.Set("EnableDC", !panel.GetOptionValue<bool>("EnableDC"));
-			properties.Set("SharedMemorySize", (int)panel.GetOptionValue<double>("SharedMemorySize") * 1024 * 1024);
-			properties.Set("DoNotProfileNetInternals", panel.GetOptionValue<bool>("DoNotProfileNetInternals"));
-			properties.Set("CombineRecursiveFunction", panel.GetOptionValue<bool>("CombineRecursiveFunction"));
-			return base.StorePanelContents();
-		}
+			try {
+				properties.Set("EnableDC", !panel.GetOptionValue<bool>("EnableDC"));
+				properties.Set("SharedMemorySize", (int)panel.GetOptionValue<double>("SharedMemorySize") * 1024 * 1024);
+				properties.Set("DoNotProfileNetInternals", panel.GetOptionValue<bool>("DoNotProfileNetInternals"));
+				properties.Set("CombineRecursiveFunction", panel.GetOptionValue<bool>("CombineRecursiveFunction"));
+				properties.Set("EnableDCAtStart", panel.GetOptionValue<bool>("EnableDCAtStart"));
+				return base.StorePanelContents();
+			} catch (Exception e) {
+				MessageService.ShowError(e);
+			}
 			
+			return false;
+		}
+		
 		public static ProfilerOptions CreateProfilerOptions()
 		{
-			return new ProfilerOptions(properties.Get("EnableDC", true),
-			                           properties.Get("SharedMemorySize", ProfilerOptions.SHARED_MEMORY_SIZE),
-			                           properties.Get("DoNotProfileNetInternals", false),
-			                           properties.Get("CombineRecursiveFunction", false)
-			                          );
+			return new ProfilerOptions(
+				properties.Get("EnableDC", true),
+				properties.Get("SharedMemorySize", ProfilerOptions.DefaultSharedMemorySize),
+				properties.Get("DoNotProfileNetInternals", false),
+				properties.Get("CombineRecursiveFunction", false),
+				properties.Get("EnableDCAtStart", true)
+			);
 		}
 	}
 }
diff --git a/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/OptionsPanels/GeneralOptionsPanel.xaml b/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/OptionsPanels/GeneralOptionsPanel.xaml
index 00626a61fa..6244981977 100644
--- a/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/OptionsPanels/GeneralOptionsPanel.xaml
+++ b/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/OptionsPanels/GeneralOptionsPanel.xaml
@@ -1,16 +1,51 @@
-<UserControl x:Class="ICSharpCode.Profiler.AddIn.OptionsPanels.GeneralOptionsPanel"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Width="418" Height="300">
-    <Grid>
-        <GroupBox Header="Data Collection" Margin="0,0,0,0" Name="groupBox1">
-            <Grid>
-                <CheckBox Height="14" Margin="6,6,6,0" Name="chkEnableDC" VerticalAlignment="Top">Only collect data at the end of the session.</CheckBox>
-                <Slider Margin="170,26,94,0" Name="slSharedMemorySize" IsDirectionReversed="False" TickPlacement="Both" Minimum="64" Maximum="512" TickFrequency="64" SmallChange="64" LargeChange="128" IsSnapToTickEnabled="True" Height="34" VerticalAlignment="Top" />
-                <Label Margin="1,26,0,0" Name="label1" Height="24" HorizontalAlignment="Left" VerticalAlignment="Top" Width="163">Size of temporary storage file:</Label>
-                <TextBlock HorizontalAlignment="Right" Margin="0,34,38,0" Width="50" Text="{Binding Value, ElementName=slSharedMemorySize, StringFormat=\{0\} MB}" Height="16" VerticalAlignment="Top" />
-                <CheckBox Margin="6,66,6,0" Name="chkDoNotProfileNetInternals" Height="15" VerticalAlignment="Top">Do not profile .NET internal calls.</CheckBox>
-                <CheckBox Margin="6,87,6,0" Name="chkCombineRecursiveCalls" Height="16.723" VerticalAlignment="Top">Combine recursive calls.</CheckBox>
-            </Grid>
-        </GroupBox>
-    </Grid>
+<?xml version="1.0" encoding="utf-8"?>
+<UserControl
+  x:Class="ICSharpCode.Profiler.AddIn.OptionsPanels.GeneralOptionsPanel" xmlns:sd="http://icsharpcode.net/sharpdevelop/core" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <StackPanel
+    Orientation="Vertical">
+    <GroupBox
+      Header="{sd:Localize AddIns.Profiler.Options.General.DataCollection.Header}">
+      <StackPanel
+        Orientation="Vertical">
+        <CheckBox Margin="3"
+          Name="chkEnableDC"
+          VerticalAlignment="Top"
+          Content="{sd:Localize AddIns.Profiler.Options.General.DataCollection.EnableDC}" />
+        <CheckBox Margin="3"
+          Name="chkEnableDCAtStartup"
+          VerticalAlignment="Top"
+          Content="{sd:Localize AddIns.Profiler.Options.General.DataCollection.EnableDCAtStartup}" />
+        <StackPanel Margin="3"
+          Orientation="Horizontal">
+      	   <Label Margin="3"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Top"
+            Content="{sd:Localize AddIns.Profiler.Options.General.DataCollection.SizeOfStorageDescription}" />
+          <Slider Margin="3" Width="150"
+            Name="slSharedMemorySize"
+            IsDirectionReversed="False"
+            TickPlacement="Both"
+            Minimum="64"
+            Maximum="512"
+            TickFrequency="64"
+            SmallChange="64"
+            LargeChange="128"
+            IsSnapToTickEnabled="True"
+            VerticalAlignment="Top" />
+          <TextBlock Margin="3"
+            HorizontalAlignment="Right"
+            Text="{Binding Value, ElementName=slSharedMemorySize, StringFormat=\{0\} MB}"
+            VerticalAlignment="Top" />
+        </StackPanel>
+        <CheckBox Margin="3"
+          Name="chkDoNotProfileNetInternals"
+          VerticalAlignment="Top"
+          Content="{sd:Localize AddIns.Profiler.Options.General.DataCollection.DoNotProfileNetInternals}" />
+        <CheckBox Margin="3"
+          Name="chkCombineRecursiveCalls"
+          VerticalAlignment="Top"
+          Content="{sd:Localize AddIns.Profiler.Options.General.DataCollection.CombineRecursiveCalls}" />
+      </StackPanel>
+    </GroupBox>
+  </StackPanel>
 </UserControl>
\ No newline at end of file
diff --git a/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/OptionsPanels/GeneralOptionsPanel.xaml.cs b/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/OptionsPanels/GeneralOptionsPanel.xaml.cs
index 0fd7d4911c..11e942bfbe 100644
--- a/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/OptionsPanels/GeneralOptionsPanel.xaml.cs
+++ b/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/OptionsPanels/GeneralOptionsPanel.xaml.cs
@@ -28,7 +28,7 @@ namespace ICSharpCode.Profiler.AddIn.OptionsPanels
 		
 		public T GetOptionValue<T>(string name)
 		{
-			object o;
+			object o = null;
 			
 			switch (name) {
 				case "SharedMemorySize":
@@ -43,6 +43,9 @@ namespace ICSharpCode.Profiler.AddIn.OptionsPanels
 				case "CombineRecursiveFunction":
 					o = this.chkCombineRecursiveCalls.IsChecked;
 					break;
+				case "EnableDCAtStart":
+					o = this.chkEnableDCAtStartup.IsChecked;
+					break;
 				default:
 					throw new NotSupportedException("value '" + name + "' is not supported!");
 			}
@@ -53,10 +56,10 @@ namespace ICSharpCode.Profiler.AddIn.OptionsPanels
 		public void SetOptionValue<T>(string name, T value)
 		{
 			object o = value;
-
+			
 			switch (name) {
 				case "SharedMemorySize":
-					this.slSharedMemorySize.Value = (double)o;
+					this.slSharedMemorySize.Value = (int)o;
 					break;
 				case "EnableDC":
 					this.chkEnableDC.IsChecked = (bool)o;
@@ -67,6 +70,9 @@ namespace ICSharpCode.Profiler.AddIn.OptionsPanels
 				case "CombineRecursiveFunction":
 					this.chkCombineRecursiveCalls.IsChecked = (bool)o;
 					break;
+				case "EnableDCAtStart":
+					this.chkEnableDCAtStartup.IsChecked = (bool)o;
+					break;
 				default:
 					throw new NotSupportedException("value '" + name + "' is not supported!");
 			}
diff --git a/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/ProfilerRunner.cs b/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/ProfilerRunner.cs
index 9923535139..0b37f643ef 100644
--- a/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/ProfilerRunner.cs
+++ b/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/ProfilerRunner.cs
@@ -7,12 +7,17 @@
 
 using System;
 using System.Diagnostics;
+using System.IO;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+
 using ICSharpCode.Core;
+using ICSharpCode.Profiler.AddIn.Dialogs;
 using ICSharpCode.Profiler.AddIn.OptionsPanels;
 using ICSharpCode.Profiler.Controller.Data;
 using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Project;
-using System.IO;
 
 namespace ICSharpCode.Profiler.AddIn
 {
@@ -22,6 +27,7 @@ namespace ICSharpCode.Profiler.AddIn
 	public class ProfilerRunner
 	{
 		public event EventHandler RunFinished;
+		ProfilerControlWindow controlWindow;
 		
 		protected virtual void OnRunFinished(EventArgs e)
 		{
@@ -80,6 +86,8 @@ namespace ICSharpCode.Profiler.AddIn
 		{
 			using (AsynchronousWaitDialog dlg = AsynchronousWaitDialog.ShowWaitDialog("Preparing for analysis", true)) {
 				profiler.Dispose();
+
+				WorkbenchSingleton.SafeThreadAsyncCall(() => { controlWindow.AllowClose = true; this.controlWindow.Close(); });
 				if (database != null) {
 					database.WriteTo(writer, progress => !dlg.IsCancelled);
 					writer.Close();
@@ -96,7 +104,9 @@ namespace ICSharpCode.Profiler.AddIn
 		public void Run()
 		{
 			WorkbenchSingleton.Workbench.GetPad(typeof(CompilerMessageView)).BringPadToFront();
+			this.controlWindow = new ProfilerControlWindow(this);
 			profiler.Start();
+			this.controlWindow.Show();
 		}
 		
 		public void Stop()
diff --git a/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/Views/ProfilerView.xaml.cs b/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/Views/ProfilerView.xaml.cs
index 4758dc3f90..0a2bdd0414 100644
--- a/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/Views/ProfilerView.xaml.cs
+++ b/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/Views/ProfilerView.xaml.cs
@@ -29,7 +29,7 @@ namespace ICSharpCode.Profiler.AddIn.Views
 			
 			this.timeLine.IsEnabled = true;
 			this.timeLine.ValuesList.Clear();
-			this.timeLine.ValuesList.AddRange(this.provider.DataSets.Select(i => i.CpuUsage / 100));
+			this.timeLine.ValuesList.AddRange(this.provider.DataSets.Select(i => new TimeLineInfo() { value = i.CpuUsage / 100, displayMarker = i.IsFirst }));
 			this.timeLine.SelectedStartIndex = 0;
 			this.timeLine.SelectedEndIndex = this.timeLine.ValuesList.Count;
 			
@@ -98,11 +98,14 @@ namespace ICSharpCode.Profiler.AddIn.Views
 		void UpdateErrorList(IEnumerable<CompilerError> errors)
 		{
 			Dispatcher.Invoke(
-				() => {
-					WorkbenchSingleton.Workbench.GetPad(typeof(ErrorListPad)).BringPadToFront();
-					TaskService.ClearExceptCommentTasks();
-					TaskService.AddRange(errors.Select(error => new Task("", error.ErrorText, error.Column, error.Line, (error.IsWarning) ? TaskType.Warning : TaskType.Error)));
-				});
+				(Action)(
+					() => {
+						WorkbenchSingleton.Workbench.GetPad(typeof(ErrorListPad)).BringPadToFront();
+						TaskService.ClearExceptCommentTasks();
+						TaskService.AddRange(errors.Select(error => new Task("", error.ErrorText, error.Column, error.Line, (error.IsWarning) ? TaskType.Warning : TaskType.Error)));
+					}
+				)
+			);
 		}
 		
 		void tabView_SelectionChanged(object sender, SelectionChangedEventArgs e)
diff --git a/src/AddIns/Misc/Profiler/Frontend/Controls/CallTreeNodeViewModel.cs b/src/AddIns/Misc/Profiler/Frontend/Controls/CallTreeNodeViewModel.cs
index e7a5acc2ad..ead483394f 100644
--- a/src/AddIns/Misc/Profiler/Frontend/Controls/CallTreeNodeViewModel.cs
+++ b/src/AddIns/Misc/Profiler/Frontend/Controls/CallTreeNodeViewModel.cs
@@ -135,7 +135,7 @@ namespace ICSharpCode.Profiler.Controls
 		{
 			if (level == 0)
 				return null; // no tooltip for root
-			if (level == 1)
+			if (node.IsThread)
 				return Name;
 
 			TextBlock text = new TextBlock {
diff --git a/src/AddIns/Misc/Profiler/Frontend/Controls/Controls.csproj b/src/AddIns/Misc/Profiler/Frontend/Controls/Controls.csproj
index 6b72e24eb7..05984bffae 100644
--- a/src/AddIns/Misc/Profiler/Frontend/Controls/Controls.csproj
+++ b/src/AddIns/Misc/Profiler/Frontend/Controls/Controls.csproj
@@ -61,6 +61,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CallTreeNodeViewModel.cs" />
+    <Compile Include="ControlsTranslation.cs" />
     <Compile Include="EventLine.cs" />
     <Compile Include="ExtendedTimeLineControl.xaml.cs">
       <DependentUpon>ExtendedTimeLineControl.xaml</DependentUpon>
@@ -98,6 +99,7 @@
     <ProjectReference Include="..\..\Controller\Controller.csproj">
       <Project>{72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F}</Project>
       <Name>Controller</Name>
+      <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/AddIns/Misc/Profiler/Frontend/Controls/ControlsTranslation.cs b/src/AddIns/Misc/Profiler/Frontend/Controls/ControlsTranslation.cs
new file mode 100644
index 0000000000..8ddbf8783f
--- /dev/null
+++ b/src/AddIns/Misc/Profiler/Frontend/Controls/ControlsTranslation.cs
@@ -0,0 +1,22 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="Siegfried Pammer" email="siegfriedpammer@gmail.com"/>
+//     <version>$Revision$</version>
+// </file>
+using System;
+
+namespace ICSharpCode.Profiler.Controls
+{
+	/// <summary>
+	/// Description of ControlsTranslation.
+	/// </summary>
+	public class ControlsTranslation
+	{
+		public virtual string WaitBarText {
+			get {
+				return "Refreshing view, please wait ...";
+			}
+		}
+	}
+}
diff --git a/src/AddIns/Misc/Profiler/Frontend/Controls/QueryView.xaml.cs b/src/AddIns/Misc/Profiler/Frontend/Controls/QueryView.xaml.cs
index 8db95da07c..34ec7a600e 100644
--- a/src/AddIns/Misc/Profiler/Frontend/Controls/QueryView.xaml.cs
+++ b/src/AddIns/Misc/Profiler/Frontend/Controls/QueryView.xaml.cs
@@ -69,6 +69,8 @@ namespace ICSharpCode.Profiler.Controls
 			set { SetValue(ShowQueryItemsProperty, value); }
 			get { return (bool)GetValue(ShowQueryItemsProperty); }
 		}
+		
+		public ControlsTranslation Translation { get; set; }
 		#endregion
 
 		void txtSearchKeyDown(object sender, KeyEventArgs e)
@@ -82,7 +84,7 @@ namespace ICSharpCode.Profiler.Controls
 				
 				AdornerLayer layer = AdornerLayer.GetAdornerLayer(this);
 				OverlayAdorner ad = new OverlayAdorner(this);
-				WaitBar bar = new WaitBar("Refreshing view, please wait ...");
+				WaitBar bar = new WaitBar();
 				ad.Child = bar;
 				layer.Add(ad);
 				
@@ -155,6 +157,8 @@ namespace ICSharpCode.Profiler.Controls
 			this.task = new SingleTask(this.Dispatcher);
 			this.searchTask = new SingleTask(this.Dispatcher);
 			
+			this.Translation = new ControlsTranslation();
+			
 			this.treeView.SizeChanged += delegate(object sender, SizeChangedEventArgs e) {
 				if (e.NewSize.Width > 0 && e.PreviousSize.Width > 0 &&
 				    (nameColumn.Width + (e.NewSize.Width - e.PreviousSize.Width)) > 0) {
diff --git a/src/AddIns/Misc/Profiler/Frontend/Controls/TimeLineControl.cs b/src/AddIns/Misc/Profiler/Frontend/Controls/TimeLineControl.cs
index f4b2b71249..e925d2a103 100644
--- a/src/AddIns/Misc/Profiler/Frontend/Controls/TimeLineControl.cs
+++ b/src/AddIns/Misc/Profiler/Frontend/Controls/TimeLineControl.cs
@@ -16,9 +16,14 @@ using System.Windows.Media;
 
 namespace ICSharpCode.Profiler.Controls
 {
+	public struct TimeLineInfo {
+		public double value;
+		public bool displayMarker;
+	}
+	
 	public class TimeLineControl : FrameworkElement
 	{
-		ObservableCollection<double> valuesList;
+		ObservableCollection<TimeLineInfo> valuesList;
 		int selectedStartIndex, selectedEndIndex;
 		double pieceWidth;
 
@@ -54,14 +59,14 @@ namespace ICSharpCode.Profiler.Controls
 			}
 		}
 
-		public ObservableCollection<double> ValuesList
+		public ObservableCollection<TimeLineInfo> ValuesList
 		{
 			get { return valuesList; }
 		}
 
 		public TimeLineControl()
 		{
-			this.valuesList = new ObservableCollection<double>();
+			this.valuesList = new ObservableCollection<TimeLineInfo>();
 			this.valuesList.CollectionChanged += delegate { this.InvalidateMeasure(); this.InvalidateVisual(); };
 		}
 
@@ -94,7 +99,7 @@ namespace ICSharpCode.Profiler.Controls
 				for (int i = 0; i < this.valuesList.Count; i++)
 				{
 					double x = this.pieceWidth / 2.0 + this.pieceWidth * i + offset;
-					double y = this.RenderSize.Height - this.valuesList[i] * (this.RenderSize.Height - offset) - offset;
+					double y = this.RenderSize.Height - this.valuesList[i].value * (this.RenderSize.Height - offset) - offset;
 
 					points.Add(new Point(x, y));
 
@@ -115,12 +120,28 @@ namespace ICSharpCode.Profiler.Controls
 			drawingContext.DrawLine(new Pen(Brushes.Black, 1), new Point(offset / 2, this.RenderSize.Height - offset / 2), new Point(this.RenderSize.Width - offset, this.RenderSize.Height - offset / 2));
 			drawingContext.DrawLine(new Pen(Brushes.Black, 1), new Point(offset / 2, 0), new Point(offset / 2, this.RenderSize.Height - offset / 2));
 			
-			for (int i = 0; i < this.valuesList.Count; i++)
+			var p = new Pen(Brushes.DarkRed, 2);
+			
+			for (int i = 0; i < this.valuesList.Count; i++) {
 				drawingContext.DrawLine(new Pen(Brushes.Black, 1),
 				                        new Point(offset + pieceWidth / 2 + pieceWidth * i, this.RenderSize.Height - offset / 4),
 				                        new Point(offset + pieceWidth / 2 + pieceWidth * i, this.RenderSize.Height - (offset / 4 * 3 + 3)));
+				
+				if (this.valuesList[i].displayMarker) {
+					drawingContext.DrawLine(p, new Point(offset + pieceWidth * i, 0),
+					                        new Point(offset + pieceWidth * i, this.RenderSize.Height - offset));
+				}
+
+			}
 			
 			drawingContext.DrawGeometry(b, new Pen(b, 3), geometry);
+			
+			for (int i = 0; i < this.valuesList.Count; i++) {
+				if (this.valuesList[i].displayMarker)
+					drawingContext.DrawLine(p, new Point(offset + pieceWidth * i, 0),
+					                        new Point(offset + pieceWidth * i, this.RenderSize.Height - offset));
+			}
+			
 			drawingContext.DrawRectangle(
 				new SolidColorBrush(Color.FromArgb(64, Colors.CornflowerBlue.R,
 				                                   Colors.CornflowerBlue.G, Colors.CornflowerBlue.B)),
diff --git a/src/Main/ICSharpCode.Core.Presentation/LocalizeExtension.cs b/src/Main/ICSharpCode.Core.Presentation/LocalizeExtension.cs
index 28187281c6..a79d3ba9f9 100644
--- a/src/Main/ICSharpCode.Core.Presentation/LocalizeExtension.cs
+++ b/src/Main/ICSharpCode.Core.Presentation/LocalizeExtension.cs
@@ -24,7 +24,11 @@ namespace ICSharpCode.Core.Presentation
 		
 		public override object ProvideValue(IServiceProvider serviceProvider)
 		{
-			return ResourceService.GetString(key);
+			try {
+				return ResourceService.GetString(key);
+			} catch (ResourceNotFoundException) {
+				return "{Localize:" + key + "}";
+			}
 		}
 	}
 }