# HG changeset patch
# User cin
# Date 1518409471 -10800
# Node ID 6f4630d0bcd9f393f2acf1b8a13a380fd94ebbc9
# Parent 7c7e9ad6fe4a136b3565cc702420267b8610c8d4
removed absolete Diagnostics classes
diff -r 7c7e9ad6fe4a -r 6f4630d0bcd9 Implab.Diagnostics.Interactive/Implab.Diagnostics.Interactive.csproj
--- a/Implab.Diagnostics.Interactive/Implab.Diagnostics.Interactive.csproj Sun Feb 11 00:49:51 2018 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-
-
-
-
- Debug
- AnyCPU
- {1DB7DB0C-8AA9-484B-A681-33AE94038391}
- Library
- Properties
- Implab.Diagnostics.Interactive
- Implab.Diagnostics.Interactive
- v4.5
- 512
-
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Form
-
-
- TraceForm.cs
-
-
-
-
-
- {F550F1F8-8746-4AD0-9614-855F4C4B7F05}
- Implab
-
-
-
-
- TraceForm.cs
-
-
-
-
-
-
-
-
\ No newline at end of file
diff -r 7c7e9ad6fe4a -r 6f4630d0bcd9 Implab.Diagnostics.Interactive/InteractiveListener.cs
--- a/Implab.Diagnostics.Interactive/InteractiveListener.cs Sun Feb 11 00:49:51 2018 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,147 +0,0 @@
-using Implab.Parallels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace Implab.Diagnostics.Interactive
-{
- public class InteractiveListener: ListenerBase
- {
- TraceForm m_form;
-
- SynchronizationContext m_syncGuiThread;
- readonly Promise m_guiStarted = new Promise();
-
- readonly IPromise m_guiFinished;
-
- readonly SimpleAsyncQueue m_queue = new SimpleAsyncQueue();
- readonly AutoResetEvent m_queueEvent = new AutoResetEvent(false);
-
- int m_queueLength;
- bool m_exitPending;
-
- readonly object m_pauseLock = new object();
- bool m_paused;
- readonly ManualResetEvent m_pauseEvent = new ManualResetEvent(true);
-
- public InteractiveListener() {
- m_guiFinished = RunGuiThread();
- AsyncPool.RunThread(QueueThread);
-
- m_guiStarted.Join();
- }
-
- void GuiThread() {
- m_form = new TraceForm(); // will create SynchronizationContext
-
- m_form.PauseEvents += (s,a) => Pause();
- m_form.ResumeEvents += (s, a) => Resume();
-
- m_syncGuiThread = SynchronizationContext.Current;
- m_guiStarted.Resolve();
- Application.Run();
- }
-
- void QueueThread() {
- while (!m_exitPending) {
- if (m_paused)
- m_pauseEvent.WaitOne();
-
- TraceViewItem item;
- if (m_queue.TryDequeue(out item)) {
- Interlocked.Decrement(ref m_queueLength);
-
- m_syncGuiThread.Post(x => m_form.AddTraceEvent(item),null);
- } else {
- m_queueEvent.WaitOne();
- }
- }
- }
-
- public IPromise RunGuiThread() {
- var p = new Promise();
-
- var caller = TraceContext.Instance.CurrentOperation;
-
- var worker = new Thread(() => {
- TraceContext.Instance.EnterLogicalOperation(caller, false);
- try {
- Application.OleRequired();
- GuiThread();
- p.Resolve();
- } catch (Exception e) {
- p.Reject(e);
- } finally {
- TraceContext.Instance.Leave();
- }
- });
- worker.SetApartmentState(ApartmentState.STA);
- worker.IsBackground = true;
- worker.Name = string.Format("{0} GUI Thread", nameof(InteractiveListener));
- worker.Start();
-
- return p;
- }
-
- public void Pause() {
- // for consistency we need to set this properties atomically
- lock (m_pauseLock) {
- m_pauseEvent.Reset();
- m_paused = true;
- }
- }
-
- public void Resume() {
- // for consistency we need to set this properties atomically
- lock (m_pauseLock) {
- m_paused = false;
- m_pauseEvent.Set();
- }
- }
-
- void Enqueue(TraceViewItem item) {
- m_queue.Enqueue(item);
- if (Interlocked.Increment(ref m_queueLength) == 1)
- m_queueEvent.Set();
- }
-
- public void ShowForm() {
- m_syncGuiThread.Post(x => m_form.Show(), null);
- }
-
- public void HideForm() {
- m_syncGuiThread.Post(x => m_form.Hide(), null);
- }
-
- void Terminate() {
- m_exitPending = true;
- Resume();
- m_syncGuiThread.Post(x => Application.ExitThread(), null);
- }
-
- protected override void Dispose(bool disposing) {
- if (disposing) {
- Terminate();
- m_guiFinished.Join();
- }
- base.Dispose(disposing);
- }
-
- public override void Write(LogEventArgs args, object entry) {
- var item = new TraceViewItem {
- Indent = args.Operation.Level,
- Message = entry.ToString(),
- Thread = args.ThreadId,
- Channel = args.Channel.ToString(),
- Timestamp = Environment.TickCount,
- TimeDelta = args.OperationTimeOffset
- };
-
- Enqueue(item);
- }
- }
-}
diff -r 7c7e9ad6fe4a -r 6f4630d0bcd9 Implab.Diagnostics.Interactive/Properties/AssemblyInfo.cs
--- a/Implab.Diagnostics.Interactive/Properties/AssemblyInfo.cs Sun Feb 11 00:49:51 2018 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Implab.Diagnostics.Interactive")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Implab.Diagnostics.Interactive")]
-[assembly: AssemblyCopyright("Copyright © 2014")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("1c156c51-4884-43b2-a823-d86313872e82")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff -r 7c7e9ad6fe4a -r 6f4630d0bcd9 Implab.Diagnostics.Interactive/Properties/DataSources/TraceViewItem.datasource
--- a/Implab.Diagnostics.Interactive/Properties/DataSources/TraceViewItem.datasource Sun Feb 11 00:49:51 2018 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-
-
-
- Implab.Diagnostics.Interactive.TraceViewItem, Implab.Diagnostics.Interactive
-
\ No newline at end of file
diff -r 7c7e9ad6fe4a -r 6f4630d0bcd9 Implab.Diagnostics.Interactive/TextStyle.cs
--- a/Implab.Diagnostics.Interactive/TextStyle.cs Sun Feb 11 00:49:51 2018 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Implab.Diagnostics.Interactive {
- class TextStyle {
- public Color TextColor {
- get;
- set;
- }
-
- public FontStyle FontStyle {
- get;
- set;
- }
-
- public int PaddingLeft {
- get;
- set;
- }
- }
-}
diff -r 7c7e9ad6fe4a -r 6f4630d0bcd9 Implab.Diagnostics.Interactive/TraceForm.Designer.cs
--- a/Implab.Diagnostics.Interactive/TraceForm.Designer.cs Sun Feb 11 00:49:51 2018 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,149 +0,0 @@
-namespace Implab.Diagnostics.Interactive {
- partial class TraceForm {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing) {
- if (disposing && (components != null)) {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent() {
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
- this.eventsDataGrid = new System.Windows.Forms.DataGridView();
- this.traceViewItemBindingSource = new System.Windows.Forms.BindingSource();
- this.threadDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.TimeDelta = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.Channel = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.messageDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
- ((System.ComponentModel.ISupportInitialize)(this.eventsDataGrid)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.traceViewItemBindingSource)).BeginInit();
- this.SuspendLayout();
- //
- // eventsDataGrid
- //
- this.eventsDataGrid.AllowUserToAddRows = false;
- this.eventsDataGrid.AllowUserToDeleteRows = false;
- this.eventsDataGrid.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.eventsDataGrid.AutoGenerateColumns = false;
- this.eventsDataGrid.BackgroundColor = System.Drawing.SystemColors.Window;
- dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
- dataGridViewCellStyle1.Font = new System.Drawing.Font("Lucida Console", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
- dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.eventsDataGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
- this.eventsDataGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.eventsDataGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
- this.threadDataGridViewTextBoxColumn,
- this.TimeDelta,
- this.Channel,
- this.messageDataGridViewTextBoxColumn});
- this.eventsDataGrid.DataSource = this.traceViewItemBindingSource;
- dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window;
- dataGridViewCellStyle4.Font = new System.Drawing.Font("Lucida Console", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
- dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText;
- dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.eventsDataGrid.DefaultCellStyle = dataGridViewCellStyle4;
- this.eventsDataGrid.Location = new System.Drawing.Point(12, 12);
- this.eventsDataGrid.Name = "eventsDataGrid";
- this.eventsDataGrid.ReadOnly = true;
- this.eventsDataGrid.RowHeadersVisible = false;
- this.eventsDataGrid.RowHeadersWidth = 17;
- this.eventsDataGrid.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False;
- this.eventsDataGrid.Size = new System.Drawing.Size(939, 480);
- this.eventsDataGrid.TabIndex = 1;
- this.eventsDataGrid.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.eventsDataGrid_CellFormatting);
- //
- // traceViewItemBindingSource
- //
- this.traceViewItemBindingSource.DataSource = typeof(Implab.Diagnostics.Interactive.TraceViewItem);
- //
- // threadDataGridViewTextBoxColumn
- //
- this.threadDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
- this.threadDataGridViewTextBoxColumn.DataPropertyName = "Thread";
- this.threadDataGridViewTextBoxColumn.HeaderText = "TID";
- this.threadDataGridViewTextBoxColumn.Name = "threadDataGridViewTextBoxColumn";
- this.threadDataGridViewTextBoxColumn.ReadOnly = true;
- this.threadDataGridViewTextBoxColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
- this.threadDataGridViewTextBoxColumn.Width = 32;
- //
- // TimeDelta
- //
- this.TimeDelta.DataPropertyName = "TimeDelta";
- dataGridViewCellStyle2.Format = "\'+\' 0 \'ms\'";
- dataGridViewCellStyle2.NullValue = null;
- this.TimeDelta.DefaultCellStyle = dataGridViewCellStyle2;
- this.TimeDelta.HeaderText = "TimeDelta";
- this.TimeDelta.Name = "TimeDelta";
- this.TimeDelta.ReadOnly = true;
- this.TimeDelta.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
- //
- // Channel
- //
- this.Channel.DataPropertyName = "Channel";
- this.Channel.HeaderText = "Channel";
- this.Channel.Name = "Channel";
- this.Channel.ReadOnly = true;
- this.Channel.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
- //
- // messageDataGridViewTextBoxColumn
- //
- this.messageDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
- this.messageDataGridViewTextBoxColumn.DataPropertyName = "FormattedMessage";
- dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.messageDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle3;
- this.messageDataGridViewTextBoxColumn.HeaderText = "Message";
- this.messageDataGridViewTextBoxColumn.Name = "messageDataGridViewTextBoxColumn";
- this.messageDataGridViewTextBoxColumn.ReadOnly = true;
- this.messageDataGridViewTextBoxColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
- //
- // TraceForm
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(963, 504);
- this.Controls.Add(this.eventsDataGrid);
- this.Name = "TraceForm";
- this.Text = "TraceForm";
- ((System.ComponentModel.ISupportInitialize)(this.eventsDataGrid)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.traceViewItemBindingSource)).EndInit();
- this.ResumeLayout(false);
-
- }
-
- #endregion
-
- private System.Windows.Forms.DataGridView eventsDataGrid;
- private System.Windows.Forms.BindingSource traceViewItemBindingSource;
- private System.Windows.Forms.DataGridViewTextBoxColumn threadDataGridViewTextBoxColumn;
- private System.Windows.Forms.DataGridViewTextBoxColumn TimeDelta;
- private System.Windows.Forms.DataGridViewTextBoxColumn Channel;
- private System.Windows.Forms.DataGridViewTextBoxColumn messageDataGridViewTextBoxColumn;
- }
-}
\ No newline at end of file
diff -r 7c7e9ad6fe4a -r 6f4630d0bcd9 Implab.Diagnostics.Interactive/TraceForm.cs
--- a/Implab.Diagnostics.Interactive/TraceForm.cs Sun Feb 11 00:49:51 2018 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,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 m_threadColors = new Dictionary();
- readonly Random m_rand = new Random();
-
- public event EventHandler PauseEvents;
-
- public event EventHandler ResumeEvents;
-
- 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(TraceViewItem item) {
- traceViewItemBindingSource.Add(item);
- if(eventsDataGrid.RowCount > 0)
- eventsDataGrid.FirstDisplayedScrollingRowIndex = eventsDataGrid.RowCount - 1;
- }
-
- 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];
- if (e.ColumnIndex == messageDataGridViewTextBoxColumn.Index)
- e.CellStyle.Padding = new Padding(data.Indent * 10,0,0,0);
- e.CellStyle.ForeColor = GetThreadColor(data.Thread);
- }
- }
-}
diff -r 7c7e9ad6fe4a -r 6f4630d0bcd9 Implab.Diagnostics.Interactive/TraceForm.resx
--- a/Implab.Diagnostics.Interactive/TraceForm.resx Sun Feb 11 00:49:51 2018 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- True
-
-
- True
-
-
- 17, 17
-
-
\ No newline at end of file
diff -r 7c7e9ad6fe4a -r 6f4630d0bcd9 Implab.Diagnostics.Interactive/TraceViewItem.cs
--- a/Implab.Diagnostics.Interactive/TraceViewItem.cs Sun Feb 11 00:49:51 2018 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Implab.Diagnostics.Interactive {
- public class TraceViewItem {
- string m_formattedValue;
-
- public string Message { get; set; }
- public int TimeDelta { get; set; }
- public int Timestamp { get; set; }
- public int Indent { get; set; }
- public int Thread { get; set; }
- public string Channel { get; set; }
-
- public string FormattedMessage {
- get {
- if (m_formattedValue == null) {
- m_formattedValue = Message.Replace("\r",String.Empty).Replace("\n", " | ");
- }
- return m_formattedValue;
- }
- }
- }
-}
diff -r 7c7e9ad6fe4a -r 6f4630d0bcd9 Implab.Test/UnitTest1.cs
--- a/Implab.Test/UnitTest1.cs Sun Feb 11 00:49:51 2018 +0300
+++ b/Implab.Test/UnitTest1.cs Mon Feb 12 07:24:31 2018 +0300
@@ -1,29 +1,37 @@
using System;
using System.Diagnostics;
using System.Threading;
+using Implab.Diagnostics;
using Xunit;
namespace Implab.Test
{
+ using static Trace;
public class UnitTest1
{
[Fact]
public void Test1()
{
var listener = new TextWriterTraceListener(Console.Out);
- var source = new TraceSource("Custom",SourceLevels.ActivityTracing);
+ var source = TraceSource;
+ source.Switch.Level = SourceLevels.All;
source.Listeners.Add(listener);
+ Trace.Listeners.Add(listener);
- Trace.Listeners.Add(listener);
Trace.WriteLine("Hello!");
- Trace.CorrelationManager.StartLogicalOperation();
+ StartLogicalOperation();
+
Trace.WriteLine("Inner");
foreach(var x in Trace.CorrelationManager.LogicalOperationStack)
Trace.WriteLine($"-{x}");
- source.TraceEvent(TraceEventType.Information, 1, "source event");
+ Log("source event");
+
+ listener.IndentLevel = 1;
+
source.TraceData(TraceEventType.Start, 1, DateTime.Now);
- Trace.CorrelationManager.StopLogicalOperation();
+
+ StopLogicalOperation();
}
}
}
diff -r 7c7e9ad6fe4a -r 6f4630d0bcd9 Implab/Components/Disposable.cs
--- a/Implab/Components/Disposable.cs Sun Feb 11 00:49:51 2018 +0300
+++ b/Implab/Components/Disposable.cs Mon Feb 12 07:24:31 2018 +0300
@@ -48,16 +48,8 @@
}
}
- ///
- /// Записывает сообщение об утечке объекта.
- ///
- protected virtual void ReportObjectLeaks() {
- TraceLog.TraceWarning("The object is marked as disposable but isn't disposed properly: {0}", this);
- }
-
~Disposable() {
Dispose(false);
- ReportObjectLeaks();
}
}
}
\ No newline at end of file
diff -r 7c7e9ad6fe4a -r 6f4630d0bcd9 Implab/Components/RunnableComponent.cs
--- a/Implab/Components/RunnableComponent.cs Sun Feb 11 00:49:51 2018 +0300
+++ b/Implab/Components/RunnableComponent.cs Mon Feb 12 07:24:31 2018 +0300
@@ -15,7 +15,7 @@
public class RunnableComponent : IRunnable, IInitializable, IDisposable {
///
- /// This class bound lifetime to the task,
+ /// This class bounds lifetime to the task,
/// when the task completes the associated token source will be disposed.
///
class AsyncOperationDescriptor {
@@ -161,7 +161,7 @@
///
/// This method should be used for short and mostly syncronous operations,
/// other operations which require time to run shoud be placed in
- /// method.
+ /// method.
///
protected virtual Task InitializeInternalAsync(CancellationToken ct) {
return Task.CompletedTask;
@@ -170,10 +170,10 @@
public void Start(CancellationToken ct) {
var cookie = new object();
if (MoveStart(cookie))
- ScheduleTask(StartInternal, ct, cookie);
+ ScheduleTask(StartInternalAsync, ct, cookie);
}
- protected virtual Task StartInternal(CancellationToken ct) {
+ protected virtual Task StartInternalAsync(CancellationToken ct) {
return Task.CompletedTask;
}
diff -r 7c7e9ad6fe4a -r 6f4630d0bcd9 Implab/Diagnostics/ConsoleTraceListener.cs
--- a/Implab/Diagnostics/ConsoleTraceListener.cs Sun Feb 11 00:49:51 2018 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-using System;
-using System.Text;
-
-namespace Implab.Diagnostics {
- public class ConsoleTraceListener: ListenerBase {
-
- static readonly object _consoleLock = new object();
-
- public override void Write(LogEventArgs args, object entry) {
- var msg = new StringBuilder();
-
- for (int i = 0; i < args.Operation.Level; i++)
- msg.Append(" ");
- msg.AppendFormat("[{0}]: {1}", args.ThreadId, entry);
-
- lock (_consoleLock) {
- Console.ForegroundColor = (ConsoleColor)(args.ThreadId % 15 + 1);
- Console.WriteLine(msg);
- }
- }
- }
-}
diff -r 7c7e9ad6fe4a -r 6f4630d0bcd9 Implab/Diagnostics/ILogWriter.cs
--- a/Implab/Diagnostics/ILogWriter.cs Sun Feb 11 00:49:51 2018 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-using System;
-
-namespace Implab.Diagnostics {
- public interface ILogWriter {
- void Write(LogEventArgs args, TEvent entry);
- }
-}
-
diff -r 7c7e9ad6fe4a -r 6f4630d0bcd9 Implab/Diagnostics/ListenerBase.cs
--- a/Implab/Diagnostics/ListenerBase.cs Sun Feb 11 00:49:51 2018 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Implab.Components;
-
-namespace Implab.Diagnostics {
- public abstract class ListenerBase : ServiceLocator, ILogWriter