implab/ImplabNet Commit - r47:b181f7bcb259

refactoring, interactive tarce log almost complete

cin -

r47:b181f7bcb259 interactive logger

parent child

Context file:

r47:b181f7bcb259

Collapse all files

Implab.Diagnostics.Interactive/InteractiveListener.cs created 644 +107 0

@@ -0,0 +1,107
	1	using Implab.Parallels;
	2	using System;
	3	using System.Collections.Generic;
	4	using System.Linq;
	5	using System.Text;
	6	using System.Threading;
	7	using System.Threading.Tasks;
	8	using System.Windows.Forms;
	9
	10	namespace Implab.Diagnostics.Interactive
	11	{
	12	public class InteractiveListener: Disposable
	13	{
	14	TraceForm m_form;
	15
	16	SynchronizationContext m_syncGuiThread;
	17
	18	readonly IPromiseBase m_guiFinished;
	19	readonly Promise<object> m_guiStarted = new Promise<object>();
	20
	21	readonly IPromiseBase m_workerFinished = new Promise<object>();
	22
	23	readonly MTQueue<TraceViewItem> m_queue = new MTQueue<TraceViewItem>();
	24	readonly AutoResetEvent m_queueEvent = new AutoResetEvent(false);
	25
	26	int m_queueLength;
	27	bool m_exitPending;
	28
	29	readonly object m_pauseLock = new object();
	30	bool m_paused;
	31	readonly ManualResetEvent m_pauseEvent = new ManualResetEvent(true);
	32
	33	public InteractiveListener() {
	34	m_guiFinished = AsyncPool.InvokeNewThread(() => {
	35	GuiThread();
	36	return 0;
	37	});
	38
	39	m_guiStarted.Join();
	40	}
	41
	42	void GuiThread() {
	43	m_form = new TraceForm(); // will create SynchronizationContext
	44	m_syncGuiThread = SynchronizationContext.Current;
	45	m_guiStarted.Resolve();
	46	Application.Run();
	47	}
	48
	49	void QueueThread() {
	50	while (!m_exitPending) {
	51	if (m_paused)
	52	m_pauseEvent.WaitOne();
	53
	54	TraceViewItem item;
	55	if (m_queue.TryDequeue(out item)) {
	56	Interlocked.Decrement(ref m_queueLength);
	57
	58	m_syncGuiThread.Send(x => m_form.AddTraceEvent(item),null);
	59	} else {
	60	m_queueEvent.WaitOne();
	61	}
	62	}
	63	}
	64
	65	public void Pause() {
	66	// for consistency we need to set this properties atomically
	67	lock (m_pauseLock) {
	68	m_pauseEvent.Reset();
	69	m_paused = true;
	70	}
	71	}
	72
	73	public void Resume() {
	74	// for consistency we need to set this properties atomically
	75	lock (m_pauseLock) {
	76	m_paused = false;
	77	m_pauseEvent.Set();
	78	}
	79	}
	80
	81	void Enqueue(TraceViewItem item) {
	82	m_queue.Enqueue(item);
	83	if (Interlocked.Increment(ref m_queueLength) == 1)
	84	m_queueEvent.Set();
	85	}
	86
	87	public void ShowForm() {
	88	m_syncGuiThread.Post(x => m_form.Show(), null);
	89	}
	90
	91	public void HideForm() {
	92	m_syncGuiThread.Post(x => m_form.Hide(), null);
	93	}
	94
	95	void Terminate() {
	96	m_syncGuiThread.Post(x => Application.ExitThread(), null);
	97	}
	98
	99	protected override void Dispose(bool disposing) {
	100	if (disposing) {
	101	Terminate();
	102	m_guiFinished.Join();
	103	}
	104	base.Dispose(disposing);
	105	}
	106	}
	107	}

Implab.Diagnostics.Interactive/Properties/DataSources/TraceViewItem.datasource created 644 +10 0

@@ -0,0 +1,10
	1	<?xml version="1.0" encoding="utf-8"?>
	2	<!--
	3	This file is automatically generated by Visual Studio .Net. It is
	4	used to store generic object data source configuration information.
	5	Renaming the file extension or editing the content of this file may
	6	cause the file to be unrecognizable by the program.
	7	-->
	8	<GenericObjectDataSource DisplayName="TraceViewItem" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
	9	<TypeInfo>Implab.Diagnostics.Interactive.TraceViewItem, Implab.Diagnostics.Interactive</TypeInfo>
	10	</GenericObjectDataSource> No newline at end of file

Implab.Diagnostics.Interactive/Implab.Diagnostics.Interactive.csproj +5 -11

             <?xml version="1.0" encoding="utf-8"?>
             <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
               <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
               <PropertyGroup>
                 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
                 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
                 <ProjectGuid>{1DB7DB0C-8AA9-484B-A681-33AE94038391}</ProjectGuid>
                 <OutputType>Library</OutputType>
                 <AppDesignerFolder>Properties</AppDesignerFolder>
                 <RootNamespace>Implab.Diagnostics.Interactive</RootNamespace>
                 <AssemblyName>Implab.Diagnostics.Interactive</AssemblyName>
                 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
                 <FileAlignment>512</FileAlignment>
               </PropertyGroup>
               <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
                 <DebugSymbols>true</DebugSymbols>
                 <DebugType>full</DebugType>
                 <Optimize>false</Optimize>
                 <OutputPath>bin\Debug\</OutputPath>
                 <DefineConstants>DEBUG;TRACE</DefineConstants>
                 <ErrorReport>prompt</ErrorReport>
                 <WarningLevel>4</WarningLevel>
               </PropertyGroup>
               <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
                 <DebugType>pdbonly</DebugType>
                 <Optimize>true</Optimize>
                 <OutputPath>bin\Release\</OutputPath>
                 <DefineConstants>TRACE</DefineConstants>
                 <ErrorReport>prompt</ErrorReport>
                 <WarningLevel>4</WarningLevel>
               </PropertyGroup>
               <ItemGroup>
                 <Reference Include="System" />
                 <Reference Include="System.Core" />
                 <Reference Include="System.Drawing" />
                 <Reference Include="System.Windows.Forms" />
                 <Reference Include="System.Xml.Linq" />
                 <Reference Include="System.Data.DataSetExtensions" />
                 <Reference Include="Microsoft.CSharp" />
                 <Reference Include="System.Data" />
                 <Reference Include="System.Xml" />
               </ItemGroup>
               <ItemGroup>
-                <Compile Include="InteractiveTracer.cs" />
+                <Compile Include="InteractiveListener.cs" />
                 <Compile Include="Properties\AssemblyInfo.cs" />
                 <Compile Include="TextStyle.cs" />
                 <Compile Include="TraceForm.cs">
                   <SubType>Form</SubType>
                 </Compile>
                 <Compile Include="TraceForm.Designer.cs">
                   <DependentUpon>TraceForm.cs</DependentUpon>
                 </Compile>
-                <Compile Include="TraceViewControl.cs">
-                  <SubType>UserControl</SubType>
-                </Compile>
-                <Compile Include="TraceViewControl.Designer.cs">
-                  <DependentUpon>TraceViewControl.cs</DependentUpon>
-                </Compile>
                 <Compile Include="TraceViewItem.cs" />
               </ItemGroup>
               <ItemGroup>
-                <ProjectReference Include="..\external\Implab\Implab.csproj">
+                <ProjectReference Include="..\Implab\Implab.csproj">
                   <Project>{f550f1f8-8746-4ad0-9614-855f4c4b7f05}</Project>
                   <Name>Implab</Name>
                 </ProjectReference>
               </ItemGroup>
               <ItemGroup>
                 <EmbeddedResource Include="TraceForm.resx">
                   <DependentUpon>TraceForm.cs</DependentUpon>
                 </EmbeddedResource>
-                <EmbeddedResource Include="TraceViewControl.resx">
+              </ItemGroup>
-                  <DependentUpon>TraceViewControl.cs</DependentUpon>
+              <ItemGroup>
-                </EmbeddedResource>
+                <None Include="Properties\DataSources\TraceViewItem.datasource" />
               </ItemGroup>
               <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
               <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
                    Other similar extension points exist, see Microsoft.Common.targets.
               <Target Name="BeforeBuild">
               </Target>
               <Target Name="AfterBuild">
               </Target>
               -->
             </Project>

Implab.Diagnostics.Interactive/TraceForm.Designer.cs +79 -9

@@ -1,52 +1,122
1	namespace Implab.Diagnostics.Interactive {	1	namespace Implab.Diagnostics.Interactive {
2	partial class TraceForm {	2	partial class TraceForm {
3	/// <summary>	3	/// <summary>
4	/// Required designer variable.	4	/// Required designer variable.
5	/// </summary>	5	/// </summary>
6	private System.ComponentModel.IContainer components = null;	6	private System.ComponentModel.IContainer components = null;
7		7
8	/// <summary>	8	/// <summary>
9	/// Clean up any resources being used.	9	/// Clean up any resources being used.
10	/// </summary>	10	/// </summary>
11	/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>	11	/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
12	protected override void Dispose(bool disposing) {	12	protected override void Dispose(bool disposing) {
13	if (disposing && (components != null)) {	13	if (disposing && (components != null)) {
14	components.Dispose();	14	components.Dispose();
15	}	15	}
16	base.Dispose(disposing);	16	base.Dispose(disposing);
17	}	17	}
18		18
19	#region Windows Form Designer generated code	19	#region Windows Form Designer generated code
20		20
21	/// <summary>	21	/// <summary>
22	/// Required method for Designer support - do not modify	22	/// Required method for Designer support - do not modify
23	/// the contents of this method with the code editor.	23	/// the contents of this method with the code editor.
24	/// </summary>	24	/// </summary>
25	private void InitializeComponent() {	25	private void InitializeComponent() {
26	this.traceViewControl1 = new Implab.Diagnostics.Interactive.TraceViewControl();	26	this.components = new System.ComponentModel.Container();
		27	System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
		28	System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
		29	System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
		30	this.eventsDataGrid = new System.Windows.Forms.DataGridView();
		31	this.traceViewItemBindingSource = new System.Windows.Forms.BindingSource(this.components);
		32	this.threadDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
		33	this.messageDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
		34	((System.ComponentModel.ISupportInitialize)(this.eventsDataGrid)).BeginInit();
		35	((System.ComponentModel.ISupportInitialize)(this.traceViewItemBindingSource)).BeginInit();
27	this.SuspendLayout();	36	this.SuspendLayout();
28	//	37	//
29	// ~~traceViewControl1~~	38	// eventsDataGrid
30	//	39	//
31	this.traceViewControl1.Location = new System.Drawing.Point(13, 13);	40	this.eventsDataGrid.AllowUserToAddRows = false;
32	this.traceViewControl1.Name = "traceViewControl1";	41	this.eventsDataGrid.AllowUserToDeleteRows = false;
33	this.traceViewControl1.Size = new System.Drawing.Size(267, 248);	42	this.eventsDataGrid.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top \| System.Windows.Forms.AnchorStyles.Bottom)
34	this.traceViewControl1.TabIndex = 0;	43	\| System.Windows.Forms.AnchorStyles.Left)
		44	\| System.Windows.Forms.AnchorStyles.Right)));
		45	this.eventsDataGrid.AutoGenerateColumns = false;
		46	this.eventsDataGrid.BackgroundColor = System.Drawing.SystemColors.Window;
		47	dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
		48	dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
		49	dataGridViewCellStyle1.Font = new System.Drawing.Font("Lucida Console", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
		50	dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
		51	dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
		52	dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
		53	dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
		54	this.eventsDataGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
		55	this.eventsDataGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
		56	this.eventsDataGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
		57	this.threadDataGridViewTextBoxColumn,
		58	this.messageDataGridViewTextBoxColumn});
		59	this.eventsDataGrid.DataSource = this.traceViewItemBindingSource;
		60	dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
		61	dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window;
		62	dataGridViewCellStyle3.Font = new System.Drawing.Font("Lucida Console", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
		63	dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText;
		64	dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
		65	dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
		66	dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
		67	this.eventsDataGrid.DefaultCellStyle = dataGridViewCellStyle3;
		68	this.eventsDataGrid.Location = new System.Drawing.Point(12, 12);
		69	this.eventsDataGrid.Name = "eventsDataGrid";
		70	this.eventsDataGrid.ReadOnly = true;
		71	this.eventsDataGrid.RowHeadersWidth = 17;
		72	this.eventsDataGrid.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False;
		73	this.eventsDataGrid.Size = new System.Drawing.Size(939, 480);
		74	this.eventsDataGrid.TabIndex = 1;
		75	this.eventsDataGrid.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.eventsDataGrid_CellFormatting);
		76	//
		77	// traceViewItemBindingSource
		78	//
		79	this.traceViewItemBindingSource.DataSource = typeof(Implab.Diagnostics.Interactive.TraceViewItem);
		80	//
		81	// threadDataGridViewTextBoxColumn
		82	//
		83	this.threadDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCellsExceptHeader;
		84	this.threadDataGridViewTextBoxColumn.DataPropertyName = "Thread";
		85	this.threadDataGridViewTextBoxColumn.HeaderText = "TID";
		86	this.threadDataGridViewTextBoxColumn.Name = "threadDataGridViewTextBoxColumn";
		87	this.threadDataGridViewTextBoxColumn.ReadOnly = true;
		88	this.threadDataGridViewTextBoxColumn.Width = 5;
		89	//
		90	// messageDataGridViewTextBoxColumn
		91	//
		92	this.messageDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
		93	this.messageDataGridViewTextBoxColumn.DataPropertyName = "FormattedMessage";
		94	dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
		95	this.messageDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle2;
		96	this.messageDataGridViewTextBoxColumn.HeaderText = "Message";
		97	this.messageDataGridViewTextBoxColumn.Name = "messageDataGridViewTextBoxColumn";
		98	this.messageDataGridViewTextBoxColumn.ReadOnly = true;
35	//	99	//
36	// TraceForm	100	// TraceForm
37	//	101	//
38	this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);	102	this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
39	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;	103	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
40	this.ClientSize = new System.Drawing.Size(292, ~~273~~);	104	this.ClientSize = new System.Drawing.Size(963, 504);
41	this.Controls.Add(this.~~traceViewControl1~~);	105	this.Controls.Add(this.eventsDataGrid);
42	this.Name = "TraceForm";	106	this.Name = "TraceForm";
43	this.Text = "TraceForm";	107	this.Text = "TraceForm";
		108	((System.ComponentModel.ISupportInitialize)(this.eventsDataGrid)).EndInit();
		109	((System.ComponentModel.ISupportInitialize)(this.traceViewItemBindingSource)).EndInit();
44	this.ResumeLayout(false);	110	this.ResumeLayout(false);
45		111
46	}	112	}
47		113
48	#endregion	114	#endregion
49		115
50	private TraceViewControl traceViewControl1;	116	private System.Windows.Forms.DataGridView eventsDataGrid;
		117	private System.Windows.Forms.BindingSource traceViewItemBindingSource;
		118	private System.Windows.Forms.DataGridViewTextBoxColumn threadDataGridViewTextBoxColumn;
		119	private System.Windows.Forms.DataGridViewTextBoxColumn messageDataGridViewTextBoxColumn;
		120
51	}	121	}
52	} No newline at end of file	122	}

Implab.Diagnostics.Interactive/TraceForm.cs +33 0

             using System;
             using System.Collections.Generic;
             using System.ComponentModel;
             using System.Data;
             using System.Drawing;
             using System.Linq;
             using System.Text;
             using System.Threading.Tasks;
             using System.Windows.Forms;
             namespace Implab.Diagnostics.Interactive {
                 public partial class TraceForm : Form {
+                    readonly Dictionary<int, Color> m_threadColors = new Dictionary<int,Color>();
+                    readonly Random m_rand = new Random();
                     public TraceForm() {
                         InitializeComponent();
                     }
                     protected override void OnFormClosing(FormClosingEventArgs e) {
                         base.OnFormClosing(e);
                         if (!e.Cancel && e.CloseReason == CloseReason.UserClosing) {
                             e.Cancel = true;
                             Hide();
                         }
                     }
+                    public void AddTraceEvent(int indent, int thread, string message) {
+                        traceViewItemBindingSource.Add(new TraceViewItem {
+                            Indent = indent,
+                            Thread = thread,
+                            Message = message,
+                            Timestamp = Environment.TickCount
+                        });
+                    }
+                    public void AddTraceEvent(TraceViewItem item) {
+                        traceViewItemBindingSource.Add(item);
+                    }
+                    Color GetThreadColor(int thread) {
+                        Color result;
+                        if (!m_threadColors.TryGetValue(thread, out result)) {
+                            result = Color.FromArgb(m_rand.Next(4)*64, m_rand.Next(4)*64, m_rand.Next(4)*64);
+                            m_threadColors[thread] = result;
+                        }
+                        return result;
+                    }
+                    private void eventsDataGrid_CellFormatting(object sender, DataGridViewCellFormattingEventArgs e) {
+                        var data = (TraceViewItem)traceViewItemBindingSource[e.RowIndex];
+                        e.CellStyle.Padding = new Padding(data.Indent * 10,0,0,0);
+                        e.CellStyle.ForeColor = GetThreadColor(data.Thread);
+                    }
                 }
             }

Implab.Diagnostics.Interactive/TraceForm.resx +3 0

             <?xml version="1.0" encoding="utf-8"?>
             <root>
               <!--
                 Microsoft ResX Schema
                 Version 2.0
                 The primary goals of this format is to allow a simple XML format
                 that is mostly human readable. The generation and parsing of the
                 various data types are done through the TypeConverter classes
                 associated with the data types.
                 Example:
                 ... ado.net/XML headers & schema ...
                 <resheader name="resmimetype">text/microsoft-resx</resheader>
                 <resheader name="version">2.0</resheader>
                 <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
                 <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
                 <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
                 <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
                 <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
                     <value>[base64 mime encoded serialized .NET Framework object]</value>
                 </data>
                 <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
                     <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
                     <comment>This is a comment</comment>
                 </data>
                 There are any number of "resheader" rows that contain simple
                 name/value pairs.
                 Each data row contains a name, and value. The row also contains a
                 type or mimetype. Type corresponds to a .NET class that support
                 text/value conversion through the TypeConverter architecture.
                 Classes that don't support this are serialized and stored with the
                 mimetype set.
                 The mimetype is used for serialized objects, and tells the
                 ResXResourceReader how to depersist the object. This is currently not
                 extensible. For a given mimetype the value must be set accordingly:
                 Note - application/x-microsoft.net.object.binary.base64 is the format
                 that the ResXResourceWriter will generate, however the reader can
                 read any of the formats listed below.
                 mimetype: application/x-microsoft.net.object.binary.base64
                 value   : The object must be serialized with
                         : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
                         : and then encoded with base64 encoding.
                 mimetype: application/x-microsoft.net.object.soap.base64
                 value   : The object must be serialized with
                         : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
                         : and then encoded with base64 encoding.
                 mimetype: application/x-microsoft.net.object.bytearray.base64
                 value   : The object must be serialized into a byte array
                         : using a System.ComponentModel.TypeConverter
                         : and then encoded with base64 encoding.
                 -->
               <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
                 <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
                 <xsd:element name="root" msdata:IsDataSet="true">
                   <xsd:complexType>
                     <xsd:choice maxOccurs="unbounded">
                       <xsd:element name="metadata">
                         <xsd:complexType>
                           <xsd:sequence>
                             <xsd:element name="value" type="xsd:string" minOccurs="0" />
                           </xsd:sequence>
                           <xsd:attribute name="name" use="required" type="xsd:string" />
                           <xsd:attribute name="type" type="xsd:string" />
                           <xsd:attribute name="mimetype" type="xsd:string" />
                           <xsd:attribute ref="xml:space" />
                         </xsd:complexType>
                       </xsd:element>
                       <xsd:element name="assembly">
                         <xsd:complexType>
                           <xsd:attribute name="alias" type="xsd:string" />
                           <xsd:attribute name="name" type="xsd:string" />
                         </xsd:complexType>
                       </xsd:element>
                       <xsd:element name="data">
                         <xsd:complexType>
                           <xsd:sequence>
                             <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                             <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
                           </xsd:sequence>
                           <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
                           <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
                           <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
                           <xsd:attribute ref="xml:space" />
                         </xsd:complexType>
                       </xsd:element>
                       <xsd:element name="resheader">
                         <xsd:complexType>
                           <xsd:sequence>
                             <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                           </xsd:sequence>
                           <xsd:attribute name="name" type="xsd:string" use="required" />
                         </xsd:complexType>
                       </xsd:element>
                     </xsd:choice>
                   </xsd:complexType>
                 </xsd:element>
               </xsd:schema>
               <resheader name="resmimetype">
                 <value>text/microsoft-resx</value>
               </resheader>
               <resheader name="version">
                 <value>2.0</value>
               </resheader>
               <resheader name="reader">
                 <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
               </resheader>
               <resheader name="writer">
                 <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
               </resheader>
+              <metadata name="traceViewItemBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+                <value>17, 17</value>
+              </metadata>
             </root>

Implab.Diagnostics.Interactive/TraceViewItem.cs +16 -5

@@ -1,14 +1,25
1	using System;	1	using System;
2	using System.Collections.Generic;	2	using System.Collections.Generic;
3	using System.Linq;	3	using System.Linq;
4	using System.Text;	4	using System.Text;
5	using System.Threading.Tasks;	5	using System.Threading.Tasks;
6		6
7	namespace Implab.Diagnostics.Interactive {	7	namespace Implab.Diagnostics.Interactive {
8	public ~~struct~~ TraceViewItem {	8	public class TraceViewItem {
9	~~public~~ string m~~essag~~e;	9	string m_formattedValue;
10	public int timestamp;	10
11	public ~~int~~ ~~inden~~t;	11	public string Message { get; set; }
12	public int ~~thread~~;	12	public int Timestamp { get; set; }
		13	public int Indent { get; set; }
		14	public int Thread { get; set; }
		15
		16	public string FormattedMessage {
		17	get {
		18	if (m_formattedValue == null) {
		19	m_formattedValue = Message.Replace("\r",String.Empty).Replace("\n", " \| ");
		20	}
		21	return m_formattedValue;
		22	}
		23	}
13	}	24	}
14	}	25	}

Implab/Diagnostics/TextFileListener.cs +2 0

             using System;
             using System.Collections.Generic;
             using System.IO;
             using System.Linq;
             using System.Text;
             namespace Implab.Diagnostics {
                 public class TextFileListener: TextListenerBase {
                     readonly TextWriter m_textWriter;
                     public TextFileListener(string fileName, bool local) : base(local) {
                         m_textWriter = File.CreateText(fileName);
                         m_textWriter.WriteLine("LOG {0}", DateTime.Now);
                         Register(this);
                     }
                     protected override void WriteEntry(TraceContext context, EventText text) {
                         var msg = new StringBuilder();
                         for (int i = 0; i < text.indent; i++)
                             msg.Append("  ");
                         msg.AppendFormat("[{0}]: {1}", context.ThreadId, text.content);
                         lock (m_textWriter) {
                             if (!IsDisposed) {
+                                // тут гарантировано еще не освобожден m_textWriter
                                 m_textWriter.WriteLine(msg.ToString());
                                 m_textWriter.Flush();
                             }
                         }
                     }
                     protected override void Dispose(bool disposing) {
                         base.Dispose(disposing);
                         if (disposing) {
+                            // IsDisposed = true
                             lock (m_textWriter) {
                                 Safe.Dispose(m_textWriter);
                             }
                         }
                     }
                 }
             }

Implab/Diagnostics/TextListenerBase.cs +10 -1

             using System;
             using System.Collections.Generic;
             using System.Linq;
             using System.Text;
             namespace Implab.Diagnostics {
                 public abstract class TextListenerBase : ServiceLocator, IEventTextFormatter<object>, IEventTextFormatter<TraceEvent> {
                     readonly Dictionary<object, Action> m_subscriptions = new Dictionary<object, Action>();
                     readonly LogicalOperation m_boundOperation;
                     readonly int m_baseIndent;
                     protected TextListenerBase(bool local) {
                         Register(this);
                         if (local) {
                             m_boundOperation = TraceContext.Current.CurrentOperation;
                             m_baseIndent = Math.Max(0, m_boundOperation.Level - 1);
                         }
                     }
                     public void Subscribe(Type eventType) {
                         if (eventType == null)
                             throw new ArgumentNullException("eventType");
                         GetType().GetMethod("Subscribe", new Type[0]).MakeGenericMethod(eventType).Invoke(this, null);
                     }
                     public void Subscribe<TEvent>() {
                         Subscribe<TEvent>(LogChannel<TEvent>.Default);
                     }
                     public void Subscribe<TEvent>(LogChannel<TEvent> channel) {
                         if (channel == null)
                             throw new ArgumentNullException("channel");
                         lock (m_subscriptions) {
                             AssertNotDisposed();
                             var formatter = GetService<IEventTextFormatter<TEvent>>();
                             EventHandler<ValueEventArgs<TEvent>> handler = (sender, args) => {
                                 TraceContext context = (TraceContext)sender;
                                 var text = formatter.Format(context, args.Value);
                                 text.indent -= m_baseIndent;
                                 if (IsRelated(context.CurrentOperation))
                                     WriteEntry(context, text);
                             };
                             if (m_subscriptions.ContainsKey(channel))
                                 return;
                             channel.Events += handler;
                             Action unsubscribe = () => {
                                 channel.Events -= handler;
                             };
                             m_subscriptions.Add(channel, unsubscribe);
                         }
                     }
                     public bool IsRelated(LogicalOperation op) {
                         if (m_boundOperation == null)
                             return true;
                         while (op != m_boundOperation && op.Level > m_boundOperation.Level)
                             op = op.Parent;
                         return op == m_boundOperation;
                     }
                     public void Unsubscribe<TEvent>(LogChannel<TEvent> channel) {
                         if (channel == null)
                             throw new ArgumentNullException("channel");
                         lock (m_subscriptions) {
                             Action subscription;
                             if (m_subscriptions.TryGetValue(channel, out subscription)) {
                                 subscription();
                                 m_subscriptions.Remove(channel);
                             }
                         }
                     }
                     public void UnsubscribeAll() {
                         lock (m_subscriptions) {
                             foreach (var subscription in m_subscriptions.Values)
                                 subscription();
                             m_subscriptions.Clear();
                         }
                     }
+                    /// <summary>
+                    /// Вызывается для записи текста сообщения, в журнал.
+                    /// </summary>
+                    /// <remarks>
+                    /// Данный метод может вызваться из разных потоков одновременно. Возможна ситуация, когда
+                    /// данный метод вызывается уже после освобождения ообъекта методом <see cref="Dispose()"/>.
+                    /// </remarks>
+                    /// <param name="context">Контекст трассировки.</param>
+                    /// <param name="text">Текст сообщения.</param>
                     protected abstract void WriteEntry(TraceContext context, EventText text);
                     public EventText Format(TraceContext context, object data) {
                         return new EventText {
                             indent = context.CurrentOperation.Level,
                             content = data.ToString()
                         };
                     }
                     public EventText Format(TraceContext context, TraceEvent data) {
                         var level = context.CurrentOperation.Level;
                         if (data.EventType == TraceEventType.OperationCompleted || data.EventType == TraceEventType.OperationStarted)
                             level--;
                         return new EventText {
                             indent = level,
                             content = data.ToString()
                         };
                     }
                     protected override void Dispose(bool disposing) {
+                        base.Dispose(disposing);
                         if (disposing) {
                             UnsubscribeAll();
                         }
-                        base.Dispose(disposing);
                     }
                 }
             }

Implab.Diagnostics.Interactive/InteractiveTracer.cs removed 0 -55

NO CONTENT: file was removed

Implab.Diagnostics.Interactive/TraceViewControl.Designer.cs removed 0 -40

NO CONTENT: file was removed

Implab.Diagnostics.Interactive/TraceViewControl.cs removed 0 -55

NO CONTENT: file was removed

Implab.Diagnostics.Interactive/TraceViewControl.resx removed 0 -120

NO CONTENT: file was removed

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages