implab/ImplabNet Commit - r50:f8cbe84cfdb1

Слияние с interactive logger

cin -

r50:f8cbe84cfdb1 default

parent child

Context file:

r50:f8cbe84cfdb1

Expand all files

Implab.Diagnostics.Interactive/Implab.Diagnostics.Interactive.csproj created 644 +77 0

@@ -0,0 +1,77
	1	<?xml version="1.0" encoding="utf-8"?>
	2	<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
	3	<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
	4	<PropertyGroup>
	5	<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
	6	<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
	7	<ProjectGuid>{1DB7DB0C-8AA9-484B-A681-33AE94038391}</ProjectGuid>
	8	<OutputType>Library</OutputType>
	9	<AppDesignerFolder>Properties</AppDesignerFolder>
	10	<RootNamespace>Implab.Diagnostics.Interactive</RootNamespace>
	11	<AssemblyName>Implab.Diagnostics.Interactive</AssemblyName>
	12	<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
	13	<FileAlignment>512</FileAlignment>
	14	</PropertyGroup>
	15	<PropertyGroup Condition=" '$(Configuration)\|$(Platform)' == 'Debug\|AnyCPU' ">
	16	<DebugSymbols>true</DebugSymbols>
	17	<DebugType>full</DebugType>
	18	<Optimize>false</Optimize>
	19	<OutputPath>bin\Debug\</OutputPath>
	20	<DefineConstants>DEBUG;TRACE</DefineConstants>
	21	<ErrorReport>prompt</ErrorReport>
	22	<WarningLevel>4</WarningLevel>
	23	</PropertyGroup>
	24	<PropertyGroup Condition=" '$(Configuration)\|$(Platform)' == 'Release\|AnyCPU' ">
	25	<DebugType>pdbonly</DebugType>
	26	<Optimize>true</Optimize>
	27	<OutputPath>bin\Release\</OutputPath>
	28	<DefineConstants>TRACE</DefineConstants>
	29	<ErrorReport>prompt</ErrorReport>
	30	<WarningLevel>4</WarningLevel>
	31	</PropertyGroup>
	32	<ItemGroup>
	33	<Reference Include="System" />
	34	<Reference Include="System.Core" />
	35	<Reference Include="System.Drawing" />
	36	<Reference Include="System.Windows.Forms" />
	37	<Reference Include="System.Xml.Linq" />
	38	<Reference Include="System.Data.DataSetExtensions" />
	39	<Reference Include="Microsoft.CSharp" />
	40	<Reference Include="System.Data" />
	41	<Reference Include="System.Xml" />
	42	</ItemGroup>
	43	<ItemGroup>
	44	<Compile Include="InteractiveListener.cs" />
	45	<Compile Include="Properties\AssemblyInfo.cs" />
	46	<Compile Include="TextStyle.cs" />
	47	<Compile Include="TraceForm.cs">
	48	<SubType>Form</SubType>
	49	</Compile>
	50	<Compile Include="TraceForm.Designer.cs">
	51	<DependentUpon>TraceForm.cs</DependentUpon>
	52	</Compile>
	53	<Compile Include="TraceViewItem.cs" />
	54	</ItemGroup>
	55	<ItemGroup>
	56	<ProjectReference Include="..\Implab\Implab.csproj">
	57	<Project>{f550f1f8-8746-4ad0-9614-855f4c4b7f05}</Project>
	58	<Name>Implab</Name>
	59	</ProjectReference>
	60	</ItemGroup>
	61	<ItemGroup>
	62	<EmbeddedResource Include="TraceForm.resx">
	63	<DependentUpon>TraceForm.cs</DependentUpon>
	64	</EmbeddedResource>
	65	</ItemGroup>
	66	<ItemGroup>
	67	<None Include="Properties\DataSources\TraceViewItem.datasource" />
	68	</ItemGroup>
	69	<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
	70	<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
	71	Other similar extension points exist, see Microsoft.Common.targets.
	72	<Target Name="BeforeBuild">
	73	</Target>
	74	<Target Name="AfterBuild">
	75	</Target>
	76	-->
	77	</Project> No newline at end of file

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

@@ -0,0 +1,122
	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: TextListenerBase
	13	{
	14	TraceForm m_form;
	15
	16	SynchronizationContext m_syncGuiThread;
	17	readonly Promise<object> m_guiStarted = new Promise<object>();
	18
	19	readonly IPromiseBase m_guiFinished;
	20	readonly IPromiseBase m_workerFinished = new Promise<object>();
	21
	22	readonly MTQueue<TraceViewItem> m_queue = new MTQueue<TraceViewItem>();
	23	readonly AutoResetEvent m_queueEvent = new AutoResetEvent(false);
	24
	25	int m_queueLength;
	26	bool m_exitPending;
	27
	28	readonly object m_pauseLock = new object();
	29	bool m_paused;
	30	readonly ManualResetEvent m_pauseEvent = new ManualResetEvent(true);
	31
	32	public InteractiveListener(bool global) : base(global) {
	33	m_guiFinished = AsyncPool.InvokeNewThread(GuiThread);
	34	m_workerFinished = AsyncPool.InvokeNewThread(QueueThread);
	35
	36	m_guiStarted.Join();
	37	}
	38
	39	void GuiThread() {
	40	m_form = new TraceForm(); // will create SynchronizationContext
	41
	42	m_form.PauseEvents += (s,a) => Pause();
	43	m_form.ResumeEvents += (s, a) => Resume();
	44
	45	m_syncGuiThread = SynchronizationContext.Current;
	46	m_guiStarted.Resolve();
	47	Application.Run();
	48	}
	49
	50	void QueueThread() {
	51	while (!m_exitPending) {
	52	if (m_paused)
	53	m_pauseEvent.WaitOne();
	54
	55	TraceViewItem item;
	56	if (m_queue.TryDequeue(out item)) {
	57	Interlocked.Decrement(ref m_queueLength);
	58
	59	m_syncGuiThread.Send(x => m_form.AddTraceEvent(item),null);
	60	} else {
	61	m_queueEvent.WaitOne();
	62	}
	63	}
	64	}
	65
	66	public void Pause() {
	67	// for consistency we need to set this properties atomically
	68	lock (m_pauseLock) {
	69	m_pauseEvent.Reset();
	70	m_paused = true;
	71	}
	72	}
	73
	74	public void Resume() {
	75	// for consistency we need to set this properties atomically
	76	lock (m_pauseLock) {
	77	m_paused = false;
	78	m_pauseEvent.Set();
	79	}
	80	}
	81
	82	void Enqueue(TraceViewItem item) {
	83	m_queue.Enqueue(item);
	84	if (Interlocked.Increment(ref m_queueLength) == 1)
	85	m_queueEvent.Set();
	86	}
	87
	88	public void ShowForm() {
	89	m_syncGuiThread.Post(x => m_form.Show(), null);
	90	}
	91
	92	public void HideForm() {
	93	m_syncGuiThread.Post(x => m_form.Hide(), null);
	94	}
	95
	96	void Terminate() {
	97	m_exitPending = true;
	98	Resume();
	99	m_syncGuiThread.Post(x => Application.ExitThread(), null);
	100	}
	101
	102	protected override void Dispose(bool disposing) {
	103	if (disposing) {
	104	Terminate();
	105	m_guiFinished.Join();
	106	}
	107	base.Dispose(disposing);
	108	}
	109
	110	protected override void WriteEntry(TraceContext context, EventText text, string channel) {
	111	var item = new TraceViewItem {
	112	Indent = text.indent,
	113	Message = text.content,
	114	Thread = context.ThreadId,
	115	Channel = channel,
	116	Timestamp = Environment.TickCount
	117	};
	118
	119	Enqueue(item);
	120	}
	121	}
	122	}

Implab.Diagnostics.Interactive/Properties/AssemblyInfo.cs created 644 +36 0

@@ -0,0 +1,36
	1	using System.Reflection;
	2	using System.Runtime.CompilerServices;
	3	using System.Runtime.InteropServices;
	4
	5	// General Information about an assembly is controlled through the following
	6	// set of attributes. Change these attribute values to modify the information
	7	// associated with an assembly.
	8	[assembly: AssemblyTitle("Implab.Diagnostics.Interactive")]
	9	[assembly: AssemblyDescription("")]
	10	[assembly: AssemblyConfiguration("")]
	11	[assembly: AssemblyCompany("")]
	12	[assembly: AssemblyProduct("Implab.Diagnostics.Interactive")]
	13	[assembly: AssemblyCopyright("Copyright © 2014")]
	14	[assembly: AssemblyTrademark("")]
	15	[assembly: AssemblyCulture("")]
	16
	17	// Setting ComVisible to false makes the types in this assembly not visible
	18	// to COM components. If you need to access a type in this assembly from
	19	// COM, set the ComVisible attribute to true on that type.
	20	[assembly: ComVisible(false)]
	21
	22	// The following GUID is for the ID of the typelib if this project is exposed to COM
	23	[assembly: Guid("1c156c51-4884-43b2-a823-d86313872e82")]
	24
	25	// Version information for an assembly consists of the following four values:
	26	//
	27	// Major Version
	28	// Minor Version
	29	// Build Number
	30	// Revision
	31	//
	32	// You can specify all the values or you can default the Build and Revision Numbers
	33	// by using the '*' as shown below:
	34	// [assembly: AssemblyVersion("1.0.*")]
	35	[assembly: AssemblyVersion("1.0.0.0")]
	36	[assembly: AssemblyFileVersion("1.0.0.0")]

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/TextStyle.cs created 644 +25 0

@@ -0,0 +1,25
	1	using System;
	2	using System.Collections.Generic;
	3	using System.Drawing;
	4	using System.Linq;
	5	using System.Text;
	6	using System.Threading.Tasks;
	7
	8	namespace Implab.Diagnostics.Interactive {
	9	class TextStyle {
	10	public Color TextColor {
	11	get;
	12	set;
	13	}
	14
	15	public FontStyle FontStyle {
	16	get;
	17	set;
	18	}
	19
	20	public int PaddingLeft {
	21	get;
	22	set;
	23	}
	24	}
	25	}

Implab.Diagnostics.Interactive/TraceForm.Designer.cs created 644 +134 0

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

Implab.Diagnostics.Interactive/TraceForm.cs created 644 +53 0

@@ -0,0 +1,53
	1	using System;
	2	using System.Collections.Generic;
	3	using System.ComponentModel;
	4	using System.Data;
	5	using System.Drawing;
	6	using System.Linq;
	7	using System.Text;
	8	using System.Threading.Tasks;
	9	using System.Windows.Forms;
	10
	11	namespace Implab.Diagnostics.Interactive {
	12	public partial class TraceForm : Form {
	13	readonly Dictionary<int, Color> m_threadColors = new Dictionary<int,Color>();
	14	readonly Random m_rand = new Random();
	15
	16	public event EventHandler PauseEvents;
	17
	18	public event EventHandler ResumeEvents;
	19
	20	public TraceForm() {
	21	InitializeComponent();
	22	}
	23
	24	protected override void OnFormClosing(FormClosingEventArgs e) {
	25	base.OnFormClosing(e);
	26	if (!e.Cancel && e.CloseReason == CloseReason.UserClosing) {
	27	e.Cancel = true;
	28	Hide();
	29	}
	30	}
	31
	32	public void AddTraceEvent(TraceViewItem item) {
	33	traceViewItemBindingSource.Add(item);
	34	eventsDataGrid.FirstDisplayedScrollingRowIndex = eventsDataGrid.RowCount - 1;
	35	}
	36
	37	Color GetThreadColor(int thread) {
	38	Color result;
	39	if (!m_threadColors.TryGetValue(thread, out result)) {
	40	result = Color.FromArgb(m_rand.Next(4)64, m_rand.Next(4)64, m_rand.Next(4)*64);
	41	m_threadColors[thread] = result;
	42	}
	43	return result;
	44	}
	45
	46	private void eventsDataGrid_CellFormatting(object sender, DataGridViewCellFormattingEventArgs e) {
	47	var data = (TraceViewItem)traceViewItemBindingSource[e.RowIndex];
	48	if (e.ColumnIndex == messageDataGridViewTextBoxColumn.Index)
	49	e.CellStyle.Padding = new Padding(data.Indent * 10,0,0,0);
	50	e.CellStyle.ForeColor = GetThreadColor(data.Thread);
	51	}
	52	}
	53	}

Implab.Diagnostics.Interactive/TraceForm.resx created 644 +126 0

@@ -0,0 +1,126
	1	<?xml version="1.0" encoding="utf-8"?>
	2	<root>
	3	<!--
	4	Microsoft ResX Schema
	5
	6	Version 2.0
	7
	8	The primary goals of this format is to allow a simple XML format
	9	that is mostly human readable. The generation and parsing of the
	10	various data types are done through the TypeConverter classes
	11	associated with the data types.
	12
	13	Example:
	14
	15	... ado.net/XML headers & schema ...
	16	<resheader name="resmimetype">text/microsoft-resx</resheader>
	17	<resheader name="version">2.0</resheader>
	18	<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
	19	<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
	20	<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
	21	<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
	22	<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
	23	<value>[base64 mime encoded serialized .NET Framework object]</value>
	24	</data>
	25	<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
	26	<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
	27	<comment>This is a comment</comment>
	28	</data>
	29
	30	There are any number of "resheader" rows that contain simple
	31	name/value pairs.
	32
	33	Each data row contains a name, and value. The row also contains a
	34	type or mimetype. Type corresponds to a .NET class that support
	35	text/value conversion through the TypeConverter architecture.
	36	Classes that don't support this are serialized and stored with the
	37	mimetype set.
	38
	39	The mimetype is used for serialized objects, and tells the
	40	ResXResourceReader how to depersist the object. This is currently not
	41	extensible. For a given mimetype the value must be set accordingly:
	42
	43	Note - application/x-microsoft.net.object.binary.base64 is the format
	44	that the ResXResourceWriter will generate, however the reader can
	45	read any of the formats listed below.
	46
	47	mimetype: application/x-microsoft.net.object.binary.base64
	48	value : The object must be serialized with
	49	: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
	50	: and then encoded with base64 encoding.
	51
	52	mimetype: application/x-microsoft.net.object.soap.base64
	53	value : The object must be serialized with
	54	: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
	55	: and then encoded with base64 encoding.
	56
	57	mimetype: application/x-microsoft.net.object.bytearray.base64
	58	value : The object must be serialized into a byte array
	59	: using a System.ComponentModel.TypeConverter
	60	: and then encoded with base64 encoding.
	61	-->
	62	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
	63	<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
	64	<xsd:element name="root" msdata:IsDataSet="true">
	65	<xsd:complexType>
	66	<xsd:choice maxOccurs="unbounded">
	67	<xsd:element name="metadata">
	68	<xsd:complexType>
	69	<xsd:sequence>
	70	<xsd:element name="value" type="xsd:string" minOccurs="0" />
	71	</xsd:sequence>
	72	<xsd:attribute name="name" use="required" type="xsd:string" />
	73	<xsd:attribute name="type" type="xsd:string" />
	74	<xsd:attribute name="mimetype" type="xsd:string" />
	75	<xsd:attribute ref="xml:space" />
	76	</xsd:complexType>
	77	</xsd:element>
	78	<xsd:element name="assembly">
	79	<xsd:complexType>
	80	<xsd:attribute name="alias" type="xsd:string" />
	81	<xsd:attribute name="name" type="xsd:string" />
	82	</xsd:complexType>
	83	</xsd:element>
	84	<xsd:element name="data">
	85	<xsd:complexType>
	86	<xsd:sequence>
	87	<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
	88	<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
	89	</xsd:sequence>
	90	<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
	91	<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
	92	<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
	93	<xsd:attribute ref="xml:space" />
	94	</xsd:complexType>
	95	</xsd:element>
	96	<xsd:element name="resheader">
	97	<xsd:complexType>
	98	<xsd:sequence>
	99	<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
	100	</xsd:sequence>
	101	<xsd:attribute name="name" type="xsd:string" use="required" />
	102	</xsd:complexType>
	103	</xsd:element>
	104	</xsd:choice>
	105	</xsd:complexType>
	106	</xsd:element>
	107	</xsd:schema>
	108	<resheader name="resmimetype">
	109	<value>text/microsoft-resx</value>
	110	</resheader>
	111	<resheader name="version">
	112	<value>2.0</value>
	113	</resheader>
	114	<resheader name="reader">
	115	<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
	116	</resheader>
	117	<resheader name="writer">
	118	<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
	119	</resheader>
	120	<metadata name="Channel.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
	121	<value>True</value>
	122	</metadata>
	123	<metadata name="traceViewItemBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
	124	<value>17, 17</value>
	125	</metadata>
	126	</root> No newline at end of file

Implab.Diagnostics.Interactive/TraceViewItem.cs created 644 +26 0

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

.hgignore +2 0

             syntax: glob
             Implab.Test/bin/
             *.user
             Implab.Test/obj/
             *.userprefs
             Implab/bin/
             Implab/obj/
             TestResults/
             Implab.Fx/obj/
             Implab.Fx/bin/
             Implab.Fx.Test/bin/
             Implab.Fx.Test/obj/
             _ReSharper.Implab/
+            Implab.Diagnostics.Interactive/bin/
+            Implab.Diagnostics.Interactive/obj/

Implab/Diagnostics/ConsoleTraceListener.cs +4 -4

             using System;
             using System.Collections.Generic;
             using System.Linq;
             using System.Text;
             namespace Implab.Diagnostics {
                 public class ConsoleTraceListener: TextListenerBase {
                     static readonly object _consoleLock = new object();
                     public ConsoleTraceListener()
                         : base(true) {
                     }
-                    public ConsoleTraceListener(bool local)
+                    public ConsoleTraceListener(bool global)
-                        : base(local) {
+                        : base(global) {
                     }
-                    protected override void WriteEntry(TraceContext context, EventText text) {
+                    protected override void WriteEntry(TraceContext context, EventText text, string channel) {
                         var msg = new StringBuilder();
                         for (int i = 0; i < text.indent; i++)
                             msg.Append("  ");
-                        msg.AppendFormat("[{0}]: {1}", context.ThreadId, text.content);
+                        msg.AppendFormat("[{0}]:{1}: {2}", context.ThreadId, channel, text.content);
                         lock (_consoleLock) {
                             Console.ForegroundColor = (ConsoleColor)(context.ThreadId % 15 + 1);
                             Console.WriteLine(msg.ToString());
                         }
                     }
                 }
             }

Implab/Diagnostics/LogChannel.cs +51 0

@@ -1,30 +1,81
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		5
6	namespace Implab.Diagnostics {	6	namespace Implab.Diagnostics {
		7	/// <summary>
		8	/// Канал, через который публикуются события журнала.
		9	/// </summary>
		10	/// <typeparam name="TEvent">Тип событий в канале</typeparam>
		11	/// <remarks>
		12	/// Событиями журнала могут быть любые типы, например строки, в которых будет передаваться
		13	/// информация, или структуры с набором полей, описывающих важность, текст и другую информацию.
		14	/// </remarks>
7	public class LogChannel<TEvent> {	15	public class LogChannel<TEvent> {
8	static LogChannel<TEvent> _default = new LogChannel<TEvent>();	16	static LogChannel<TEvent> _default = new LogChannel<TEvent>();
9		17
		18	/// <summary>
		19	/// Канал по-умолчанию для событий типа <typeparam name="TEvent"/>.
		20	/// </summary>
10	public static LogChannel<TEvent> Default {	21	public static LogChannel<TEvent> Default {
11	get {	22	get {
12	return _default;	23	return _default;
13	}	24	}
14	}	25	}
15		26
		27	/// <summary>
		28	/// Событие появление новой записи в журнале, на это событие подписываются слушатели.
		29	/// </summary>
16	public event EventHandler<ValueEventArgs<TEvent>> Events;	30	public event EventHandler<ValueEventArgs<TEvent>> Events;
17		31
		32	/// <summary>
		33	/// Имя канала, полезно для отображения в журнале
		34	/// </summary>
		35	public string Name {
		36	get;
		37	private set;
		38	}
		39
		40	/// <summary>
		41	/// Создает журнал, имя типа событий назначается в качетве имени канала.
		42	/// </summary>
		43	public LogChannel()
		44	: this(null) {
		45	}
		46
		47	/// <summary>
		48	/// Содает канал с указанным именем.
		49	/// </summary>
		50	/// <param name="name">Имя канала.</param>
		51	public LogChannel(string name) {
		52	if (String.IsNullOrEmpty(name))
		53	name = typeof(TEvent).Name;
		54	Name = name;
		55	}
		56
		57	/// <summary>
		58	/// Отправляет запись журнала через канал подписчикам.
		59	/// </summary>
		60	/// <param name="data">Запись журнала.</param>
		61	/// <remarks>
		62	/// Контекст трассировки от которого рассылается сообщение определяется автоматически из текущего потока.
		63	/// </remarks>
18	public void LogEvent(TEvent data) {	64	public void LogEvent(TEvent data) {
19	var t = Events;	65	var t = Events;
20	if (t!= null)	66	if (t!= null)
21	t(TraceContext.Current,new ValueEventArgs<TEvent>(data));	67	t(TraceContext.Current,new ValueEventArgs<TEvent>(data));
22	}	68	}
23		69
		70	/// <summary>
		71	/// Отправляет запись журнала через канал подписчикам.
		72	/// </summary>
		73	/// <param name="data">Запись журнала.</param>
		74	/// <param name="context">Контекст трассировки от которого рассылается сообщение/</param>
24	public void LogEvent(TraceContext context,TEvent data) {	75	public void LogEvent(TraceContext context,TEvent data) {
25	var t = Events;	76	var t = Events;
26	if (t != null)	77	if (t != null)
27	t(context, new ValueEventArgs<TEvent>(data));	78	t(context, new ValueEventArgs<TEvent>(data));
28	}	79	}
29	}	80	}
30	}	81	}

Implab/Diagnostics/TextFileListener.cs +6 -3

             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) {
+                    public TextFileListener(string fileName, bool global)
+                        : base(global) {
                         m_textWriter = File.CreateText(fileName);
                         m_textWriter.WriteLine("LOG {0}", DateTime.Now);
                         Register(this);
                     }
-                    protected override void WriteEntry(TraceContext context, EventText text) {
+                    protected override void WriteEntry(TraceContext context, EventText text, string channel) {
                         var msg = new StringBuilder();
                         for (int i = 0; i < text.indent; i++)
                             msg.Append("  ");
-                        msg.AppendFormat("[{0}]: {1}", context.ThreadId, text.content);
+                        msg.AppendFormat("[{0}]:{1}: {2}", context.ThreadId, channel, 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 +15 -5

             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) {
+                    protected TextListenerBase(bool global) {
                         Register(this);
-                        if (local) {
+                        if (!global) {
                             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>>();
+                            var channelName = channel.Name;
                             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);
+                                    WriteEntry(context, text, channelName);
                             };
                             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();
                         }
                     }
-                    protected abstract void WriteEntry(TraceContext context, EventText text);
+                    /// <summary>
+                    /// Вызывается для записи текста сообщения, в журнал.
+                    /// </summary>
+                    /// <remarks>
+                    /// Данный метод может вызваться из разных потоков одновременно. Возможна ситуация, когда
+                    /// данный метод вызывается уже после освобождения ообъекта методом <see cref="Dispose()"/>.
+                    /// </remarks>
+                    /// <param name="context">Контекст трассировки.</param>
+                    /// <param name="text">Текст сообщения.</param>
+                    protected abstract void WriteEntry(TraceContext context, EventText text, string channel);
                     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/TraceContext.cs +47 -8

             using System;
             using System.Collections.Generic;
             using System.Linq;
             using System.Text;
             using System.Threading;
             using System.Threading.Tasks;
             namespace Implab.Diagnostics {
                 /// <summary>
                 /// Контекст трассировки, привязывается к потоку и содержит в себе информацию о стеке логических операций.
                 /// </summary>
                 /// <remarks>
                 /// Контекст трассировки передается слушателям событий для определения места, где возникло событие.
                 /// </remarks>
                 public class TraceContext {
                     LogicalOperation m_currentOperation;
                     readonly LogicalOperation m_bound;
                     readonly int m_threadId;
                     [ThreadStatic]
                     static TraceContext _current;
                     /// <summary>
                     /// Текущий контекст трассировки для потока, создается астоматически при первом обращении.
                     /// </summary>
                     public static TraceContext Current {
                         get {
-                            if (_current == null)
+                            if (_current == null) {
                                 _current = new TraceContext();
+                                _current.LogEvent(TraceEventType.Created,"[{0}]", _current.ThreadId);
+                            }
                             return _current;
                         }
                     }
-                    TraceContext(TraceContext context) {
+                    TraceContext(TraceContext context)
+                        : this(context, false) {
+                    }
+                    TraceContext(TraceContext context, bool attach) {
                         if (context == null)
                             throw new ArgumentNullException("context");
                         m_currentOperation = context.CurrentOperation;
-                        m_bound = context.CurrentOperation;
+                        m_bound = attach ? context.BoundOperation : context.CurrentOperation;
                         m_threadId = Thread.CurrentThread.ManagedThreadId;
                     }
                     TraceContext() {
                         m_currentOperation = new LogicalOperation();
                         m_bound = m_currentOperation;
                         m_threadId = Thread.CurrentThread.ManagedThreadId;
                     }
                     /// <summary>
                     /// При необходимости копирует состояние контекста трассивровки в текущий поток.
                     /// </summary>
                     /// <param name="from">Исходный контекст трассировки, который передается.</param>
                     /// <remarks>
                     /// <para>
                     /// Копирование происходит за счет создания нового контекста трассировки и заполнением его
                     /// состояния из переданного контекста. При этом копируется стек операций, однако в новом
                     /// контексте ранее начатые логические операции не могут быть завершены.
                     /// </para>
                     /// <para>
-                    /// Если передача состояния состоялась, то вызывается событие трассировки <see cref="TraceEventType.Transfer"/>.
+                    /// Если передача состояния состоялась, то вызывается событие трассировки <see cref="TraceEventType.Fork"/>.
                     /// </para>
                     /// </remarks>
-                    public static void Transfer(TraceContext from) {
+                    public static void Fork(TraceContext from) {
                         if (_current == from)
                             return;
                         if (from != null) {
                             var context = new TraceContext(from);
-                            context.LogEvent(TraceEventType.Transfer, "[{0}]-->[{1}]",from.ThreadId, context.ThreadId);
+                            context.LogEvent(TraceEventType.Fork, "[{0}]-->[{1}]",from.ThreadId, context.ThreadId);
                             _current = context;
                         } else {
                             _current = new TraceContext();
                         }
                     }
                     /// <summary>
-                    /// Создает постоянную копию текущего контекста, данную копию можно хранить и использовать для передачи через <see cref="Transfer(TraceContext)"/>
+                    /// Задает текущему потоку указанный контекст, текущей поток может заканчивать ранее начатые
+                    /// логические операции в указанном контексте.
+                    /// </summary>
+                    /// <param name="source"></param>
+                    public static void Attach(TraceContext source) {
+                        if (_current == source)
+                            return;
+                        if (source != null) {
+                            var context = new TraceContext(source, true);
+                            context.LogEvent(TraceEventType.Attach, "[{0}]-->[{1}]", source.ThreadId, context.ThreadId);
+                            _current = context;
+                        } else {
+                            _current = new TraceContext();
+                        }
+                    }
+                    /// <summary>
+                    /// Отсоединяет текущий контекст трассировки от потока, для дальнейшей его передачи другому потоку
+                    /// <see cref="Attach(TraceContext)"/>.
+                    /// </summary>
+                    /// <returns>Контекст трассировки потока</returns>
+                    /// <remarks>
+                    /// После отсоединения контекста трассировки от потока, при первом обращении к трассировке в этом
+                    /// потоке будет создан новый контекст.
+                    /// </remarks>
+                    public static TraceContext Detach() {
+                        var context = Current;
+                        context.LogEvent(TraceEventType.Detach, null);
+                        _current = null;
+                        return context;
+                    }
+                    /// <summary>
+                    /// Создает постоянную копию текущего контекста, данную копию можно хранить и использовать для передачи через <see cref="Fork(TraceContext)"/>
                     /// </summary>
                     /// <returns>Копия текущего контекста трассировки.</returns>
                     public static TraceContext Snapshot() {
                         return _current == null ? new TraceContext() : new TraceContext(_current);
                     }
                     /// <summary>
                     /// Выполняет переданное действие в указанном контексте трассировки, по окончании восстанавливает предыдущий контекст трассировки потока.
                     /// </summary>
                     /// <param name="action"></param>
                     public void Invoke(Action action) {
                         if (action == null)
                             throw new ArgumentNullException("action");
                         var old = _current;
-                        Transfer(this);
+                        Fork(this);
                         try {
                             action();
                         } finally {
                             _current.EndAllOperations();
                             _current = old;
                         }
                     }
                     /// <summary>
                     /// Текущая логическая операция.
                     /// </summary>
                     public LogicalOperation CurrentOperation {
                         get {
                             return m_currentOperation;
                         }
                     }
                     /// <summary>
                     /// Операция ниже которой нельзя опускаться в стеке логических операций, т.е. она не может быть завершена в текущем контексте.
                     /// </summary>
                     public LogicalOperation BoundOperation {
                         get {
                             return m_bound;
                         }
                     }
                     /// <summary>
                     /// Поток, в котором создан контекст трассировки.
                     /// </summary>
                     public int ThreadId {
                         get {
                             return m_threadId;
                         }
                     }
                     /// <summary>
                     /// Начинает безымянную логическую операцию.
                     /// </summary>
                     public void StartLogicalOperation() {
                         StartLogicalOperation(null);
                     }
                     /// <summary>
                     /// Начинает логическую операцию с указанным именем. Созданная операция будет добвалена в стек логических операций контекста, затем будет создано соответсвующее событие.
                     /// </summary>
                     /// <param name="name">Имя начинаемой операции.</param>
                     public void StartLogicalOperation(string name) {
                         m_currentOperation = new LogicalOperation(name, m_currentOperation);
                         LogEvent(TraceEventType.OperationStarted, name);
                     }
                     /// <summary>
                     /// Заканчивает логическую операцию начатую в текущем контексте. Операции, начатые в других контекстах не могут быть закончены в текущем контексте.
                     /// </summary>
                     /// <remarks>
                     /// При вызове данного метода создается событие журнала трассировки, либо о завершении операции, либо об ошибки, поскольку данная операция
                     /// начата в другом контексте.
                     /// </remarks>
                     public void EndLogicalOperation() {
                         if (m_bound == m_currentOperation) {
                             LogEvent(TraceEventType.Error, "Trying to end the operation which isn't belongs to current trace");
                         } else {
                             var op = m_currentOperation;
                             LogEvent(TraceEventType.OperationCompleted, "{0} {1} ms", op.Name, op.Duration);
                             m_currentOperation = m_currentOperation.Parent;
                         }
                     }
                     /// <summary>
                     /// Заврешает все начатые в этом контексте операции
                     /// </summary>
                     public void EndAllOperations() {
                         while (m_bound != m_currentOperation)
                             EndLogicalOperation();
                     }
                     void LogEvent(TraceEventType type, string format, params object[] args) {
                         LogChannel<TraceEvent>.Default.LogEvent(this, TraceEvent.Create(type, format, args));
                     }
                 }
             }

Implab/Diagnostics/TraceEventType.cs +4 -1

             using System;
             using System.Collections.Generic;
             using System.Linq;
             using System.Text;
             using System.Threading.Tasks;
             namespace Implab.Diagnostics {
                 public enum TraceEventType {
                     Information = 1,
                     Warning,
                     Error,
                     OperationStarted,
                     OperationCompleted,
-                    Transfer
+                    Fork,
+                    Attach,
+                    Detach,
+                    Created
                 }
             }

Implab/Disposable.cs +19 -3

-            using System;
+            using Implab.Diagnostics;
+            using System;
             using System.Collections.Generic;
             using System.Diagnostics;
             using System.Linq;
             using System.Web;
             namespace Implab {
+                /// <summary>
+                /// Объект, поддерживающий освобождение ресурсов.
+                /// </summary>
                 public class Disposable : IDisposable {
                     bool m_disposed;
                     public event EventHandler Disposed;
                     public bool IsDisposed {
                         get { return m_disposed; }
                     }
                     protected void AssertNotDisposed() {
                         if (m_disposed)
                             throw new ObjectDisposedException(this.ToString());
                     }
+                    /// <summary>
+                    /// Переводит объект в состояние <c>Disposed</c> и вызывает событие <see cref="Disposed"/>
+                    /// </summary>
+                    /// <param name="disposing">Признак того, что нужно освободить ресурсы, иначе данный метод
+                    /// вызван сборщиком мусора и нужно освобождать ТОЛЬКО неуправляемые ресурсы ТОЛЬКО этого
+                    /// объекта.</param>
+                    /// <remarks>
+                    /// Данный метод осуществляет проверку того, что объект уже был освобожден, чтобы не вызывать
+                    /// событие <see cref="Disposed"/>. Не поддерживает многопоточность.
+                    /// </remarks>
                     protected virtual void Dispose(bool disposing) {
                         if (disposing && !m_disposed) {
                             m_disposed = true;
                             EventHandler temp = Disposed;
                             if (temp != null)
                                 temp(this,EventArgs.Empty);
                         }
                     }
                     public void Dispose() {
                         Dispose(true);
                         GC.SuppressFinalize(this);
                     }
+                    /// <summary>
+                    /// Записывает сообщение об утечке объекта.
+                    /// </summary>
                     protected virtual void ReportObjectLeaks() {
-                        Trace.TraceWarning("The object is marked as disposable but isn't disposed properly: {0}", this);
+                        TraceLog.TraceWarning("The object is marked as disposable but isn't disposed properly: {0}", this);
                     }
                     ~Disposable() {
                         Dispose(false);
                         ReportObjectLeaks();
                     }
                 }
             }

Implab/Implab.csproj 0 -1

             <?xml version="1.0" encoding="utf-8"?>
             <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
               <PropertyGroup>
                 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
                 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
                 <ProductVersion>10.0.0</ProductVersion>
                 <SchemaVersion>2.0</SchemaVersion>
                 <ProjectGuid>{F550F1F8-8746-4AD0-9614-855F4C4B7F05}</ProjectGuid>
                 <OutputType>Library</OutputType>
                 <RootNamespace>Implab</RootNamespace>
                 <AssemblyName>Implab</AssemblyName>
               </PropertyGroup>
               <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
                 <DebugSymbols>true</DebugSymbols>
                 <DebugType>full</DebugType>
                 <Optimize>false</Optimize>
                 <OutputPath>bin\Debug</OutputPath>
                 <DefineConstants>TRACE;DEBUG;</DefineConstants>
                 <ErrorReport>prompt</ErrorReport>
                 <WarningLevel>4</WarningLevel>
                 <ConsolePause>false</ConsolePause>
               </PropertyGroup>
               <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
                 <DebugType>full</DebugType>
                 <Optimize>true</Optimize>
                 <OutputPath>bin\Release</OutputPath>
                 <ErrorReport>prompt</ErrorReport>
                 <WarningLevel>4</WarningLevel>
                 <ConsolePause>false</ConsolePause>
               </PropertyGroup>
               <ItemGroup>
                 <Reference Include="System" />
               </ItemGroup>
               <ItemGroup>
                 <Compile Include="Component.cs" />
                 <Compile Include="Diagnostics\ConsoleTraceListener.cs" />
                 <Compile Include="Diagnostics\EventText.cs" />
                 <Compile Include="Diagnostics\IEventTextFormatter.cs" />
                 <Compile Include="Diagnostics\LogChannel.cs" />
                 <Compile Include="Diagnostics\LogicalOperation.cs" />
                 <Compile Include="Diagnostics\TextFileListener.cs" />
                 <Compile Include="Diagnostics\TextListenerBase.cs" />
                 <Compile Include="Diagnostics\TraceLog.cs" />
                 <Compile Include="Diagnostics\TraceContext.cs" />
                 <Compile Include="Diagnostics\TraceEvent.cs" />
                 <Compile Include="Diagnostics\TraceEventType.cs" />
                 <Compile Include="Disposable.cs" />
                 <Compile Include="ICancellable.cs" />
                 <Compile Include="IProgressHandler.cs" />
                 <Compile Include="IProgressNotifier.cs" />
                 <Compile Include="IPromise.cs" />
                 <Compile Include="IPromiseBase.cs" />
                 <Compile Include="IServiceLocator.cs" />
                 <Compile Include="ITaskController.cs" />
-                <Compile Include="ManagedPromise.cs" />
                 <Compile Include="Parallels\DispatchPool.cs" />
                 <Compile Include="Parallels\ArrayTraits.cs" />
                 <Compile Include="Parallels\MTQueue.cs" />
                 <Compile Include="Parallels\WorkerPool.cs" />
                 <Compile Include="ServiceLocator.cs" />
                 <Compile Include="TaskController.cs" />
                 <Compile Include="ProgressInitEventArgs.cs" />
                 <Compile Include="Properties\AssemblyInfo.cs" />
                 <Compile Include="Promise.cs" />
                 <Compile Include="Parallels\AsyncPool.cs" />
                 <Compile Include="Safe.cs" />
                 <Compile Include="ValueEventArgs.cs" />
               </ItemGroup>
               <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
               <ItemGroup />
             </Project>

Implab/Parallels/ArrayTraits.cs +2 -2

             using Implab.Diagnostics;
             using System;
             using System.Collections.Generic;
             using System.Diagnostics;
             using System.Linq;
             using System.Text;
             using System.Threading;
             namespace Implab.Parallels {
                 public static class ArrayTraits {
                     class ArrayIterator<TSrc> : DispatchPool<int> {
                         readonly Action<TSrc> m_action;
                         readonly TSrc[] m_source;
                         readonly Promise<int> m_promise = new Promise<int>();
                         readonly TraceContext m_traceContext;
                         int m_pending;
                         int m_next;
                         public ArrayIterator(TSrc[] source, Action<TSrc> action, int threads)
                             : base(threads) {
                             Debug.Assert(source != null);
                             Debug.Assert(action != null);
                             m_traceContext = TraceContext.Snapshot();
                             m_next = 0;
                             m_source = source;
                             m_pending = source.Length;
                             m_action = action;
                             m_promise.Anyway(() => Dispose());
                             m_promise.Cancelled(() => Dispose());
                             InitPool();
                         }
                         public Promise<int> Promise {
                             get {
                                 return m_promise;
                             }
                         }
                         protected override void Worker() {
-                            TraceContext.Transfer(m_traceContext);
+                            TraceContext.Fork(m_traceContext);
                             base.Worker();
                         }
                         protected override bool TryDequeue(out int unit) {
                             unit = Interlocked.Increment(ref m_next) - 1;
                             return unit >= m_source.Length ? false : true;
                         }
                         protected override void InvokeUnit(int unit) {
                             try {
                                 m_action(m_source[unit]);
                                 var pending = Interlocked.Decrement(ref m_pending);
                                 if (pending == 0)
                                     m_promise.Resolve(m_source.Length);
                             } catch (Exception e) {
                                 m_promise.Reject(e);
                             }
                         }
                     }
                     class ArrayMapper<TSrc, TDst>: DispatchPool<int> {
                         readonly Func<TSrc, TDst> m_transform;
                         readonly TSrc[] m_source;
                         readonly TDst[] m_dest;
                         readonly Promise<TDst[]> m_promise = new Promise<TDst[]>();
                         readonly TraceContext m_traceContext;
                         int m_pending;
                         int m_next;
                         public ArrayMapper(TSrc[] source, Func<TSrc, TDst> transform, int threads)
                             : base(threads) {
                             Debug.Assert (source != null);
                             Debug.Assert( transform != null);
                             m_next = 0;
                             m_source = source;
                             m_dest = new TDst[source.Length];
                             m_pending = source.Length;
                             m_transform = transform;
                             m_traceContext = TraceContext.Snapshot();
                             m_promise.Anyway(() => Dispose());
                             m_promise.Cancelled(() => Dispose());
                             InitPool();
                         }
                         public Promise<TDst[]> Promise {
                             get {
                                 return m_promise;
                             }
                         }
                         protected override void Worker() {
-                            TraceContext.Transfer(m_traceContext);
+                            TraceContext.Fork(m_traceContext);
                             base.Worker();
                         }
                         protected override bool TryDequeue(out int unit) {
                             unit = Interlocked.Increment(ref m_next) - 1;
                             return unit >= m_source.Length ? false : true;
                         }
                         protected override void InvokeUnit(int unit) {
                             try {
                                 m_dest[unit] = m_transform(m_source[unit]);
                                 var pending = Interlocked.Decrement(ref m_pending);
                                 if (pending == 0)
                                     m_promise.Resolve(m_dest);
                             } catch (Exception e) {
                                 m_promise.Reject(e);
                             }
                         }
                     }
                     public static IPromise<TDst[]> ParallelMap<TSrc, TDst> (this TSrc[] source, Func<TSrc,TDst> transform, int threads) {
                         if (source == null)
                             throw new ArgumentNullException("source");
                         if (transform == null)
                             throw new ArgumentNullException("transform");
                         var mapper = new ArrayMapper<TSrc, TDst>(source, transform, threads);
                         return mapper.Promise;
                     }
                     public static IPromise<int> ParallelForEach<TSrc>(this TSrc[] source, Action<TSrc> action, int threads) {
                         if (source == null)
                             throw new ArgumentNullException("source");
                         if (action == null)
                             throw new ArgumentNullException("action");
                         var iter = new ArrayIterator<TSrc>(source, action, threads);
                         return iter.Promise;
                     }
                     public static IPromise<TDst[]> ChainedMap<TSrc, TDst>(this TSrc[] source, ChainedOperation<TSrc, TDst> transform, int threads) {
                         if (source == null)
                             throw new ArgumentNullException("source");
                         if (transform == null)
                             throw new ArgumentNullException("transform");
                         if (threads <= 0)
                             throw new ArgumentOutOfRangeException("Threads number must be greater then zero");
                         if (source.Length == 0)
                             return Promise<TDst[]>.ResultToPromise(new TDst[0]);
                         var promise = new Promise<TDst[]>();
                         var res = new TDst[source.Length];
                         var pending = source.Length;
                         var semaphore = new Semaphore(threads, threads);
                         AsyncPool.InvokeNewThread(() => {
                             for (int i = 0; i < source.Length; i++) {
                                 if(promise.IsResolved)
                                     break; // stop processing in case of error or cancellation
                                 var idx = i;
                                 semaphore.WaitOne();
                                 try {
                                     var p1 = transform(source[i]);
                                     p1.Anyway(() => semaphore.Release());
                                     p1.Cancelled(() => semaphore.Release());
                                     p1.Then(
                                         x => {
                                             res[idx] = x;
                                             var left = Interlocked.Decrement(ref pending);
                                             if (left == 0)
                                                 promise.Resolve(res);
                                         },
                                         e => promise.Reject(e)
                                     );
                                 } catch (Exception e) {
                                     promise.Reject(e);
                                 }
                             }
                             return 0;
                         });
                         return promise.Anyway(() => semaphore.Dispose());
                     }
                 }
             }

Implab/Parallels/AsyncPool.cs +25 -4

             using Implab.Diagnostics;
             using System;
             using System.Threading;
             namespace Implab.Parallels {
             	/// <summary>
             	/// Класс для распаралеливания задач.
             	/// </summary>
             	/// <remarks>
             	/// Используя данный класс и лямда выражения можно распараллелить
             	/// вычисления, для этого используется концепция обещаний.
             	/// </remarks>
             	public static class AsyncPool {
-            		public static Promise<T> Invoke<T>(Func<T> func) {
+            		public static IPromise<T> Invoke<T>(Func<T> func) {
             			var p = new Promise<T>();
                         var caller = TraceContext.Snapshot();
             			ThreadPool.QueueUserWorkItem(param => {
-                            TraceContext.Transfer(caller);
+                            TraceContext.Fork(caller);
             				try {
             					p.Resolve(func());
             				} catch(Exception e) {
             					p.Reject(e);
             				}
             			});
             			return p;
             		}
-                    public static Promise<T> InvokeNewThread<T>(Func<T> func) {
+                    public static IPromise<T> InvokeNewThread<T>(Func<T> func) {
                         var p = new Promise<T>();
                         var caller = TraceContext.Snapshot();
                         var worker = new Thread(() => {
-                            TraceContext.Transfer(caller);
+                            TraceContext.Fork(caller);
                             try {
                                 p.Resolve(func());
                             } catch (Exception e) {
                                 p.Reject(e);
                             }
                         });
                         worker.IsBackground = true;
                         worker.Start();
                         return p;
                     }
+                    public static IPromiseBase InvokeNewThread(Action func) {
+                        var p = new Promise<object>();
+                        var caller = TraceContext.Snapshot();
+                        var worker = new Thread(() => {
+                            TraceContext.Fork(caller);
+                            try {
+                                func();
+                                p.Resolve();
+                            } catch (Exception e) {
+                                p.Reject(e);
+                            }
+                        });
+                        worker.IsBackground = true;
+                        worker.Start();
+                        return p;
                     }
             	}
+            }

Implab/ManagedPromise.cs removed 0 -11

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