Mercurial > pub > ImplabNet
changeset 194:d45bdf510514 v2
working on diagnostics
author | cin |
---|---|
date | Mon, 25 Apr 2016 15:18:56 +0300 |
parents | cc19dc78edb7 |
children | ea485487a424 |
files | Implab.Test/RunnableComponentTests.cs Implab/Diagnostics/EventText.cs Implab/Diagnostics/ListenerBase.cs Implab/Diagnostics/LogChannel.cs Implab/Diagnostics/LogEventArgs.cs Implab/Diagnostics/LogEventArgsT.cs Implab/Diagnostics/TextFileListener.cs Implab/Implab.csproj MonoPlay/Program.cs |
diffstat | 9 files changed, 40 insertions(+), 46 deletions(-) [+] |
line wrap: on
line diff
--- a/Implab.Test/RunnableComponentTests.cs Fri Apr 22 13:09:57 2016 +0300 +++ b/Implab.Test/RunnableComponentTests.cs Mon Apr 25 15:18:56 2016 +0300 @@ -132,7 +132,7 @@ ShouldThrow(() => p.Join(1000)); Assert.AreEqual(ExecutionState.Failed, comp.State); - Assert.IsInstanceOfType(comp.LastError, typeof(OperationCanceledException)); + Assert.IsTrue(comp.LastError is OperationCanceledException); comp.Dispose(); } @@ -185,7 +185,7 @@ p.Cancel(); ShouldThrow(() => p.Join(1000)); Assert.AreEqual(ExecutionState.Failed, comp.State); - Assert.IsInstanceOfType(comp.LastError, typeof(OperationCanceledException)); + Assert.IsTrue(comp.LastError is OperationCanceledException); comp.Dispose(); }
--- a/Implab/Diagnostics/EventText.cs Fri Apr 22 13:09:57 2016 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Implab.Diagnostics { - public struct EventText { - public int indent; - - public string content; - } -}
--- a/Implab/Diagnostics/ListenerBase.cs Fri Apr 22 13:09:57 2016 +0300 +++ b/Implab/Diagnostics/ListenerBase.cs Mon Apr 25 15:18:56 2016 +0300 @@ -59,8 +59,8 @@ public void UnsubscribeAll() { lock (m_subscriptions) { - foreach (var subscription in m_subscriptions.Values) - subscription(); + foreach (var remove in m_subscriptions.Values) + remove(); m_subscriptions.Clear(); } }
--- a/Implab/Diagnostics/LogChannel.cs Fri Apr 22 13:09:57 2016 +0300 +++ b/Implab/Diagnostics/LogChannel.cs Mon Apr 25 15:18:56 2016 +0300 @@ -69,7 +69,7 @@ this, new LogEventArgs<TEvent>( data, - Name, + this, traceContext.ThreadId, traceContext.CurrentOperation, traceContext.CurrentOperation.Duration @@ -77,5 +77,9 @@ ); } } + + public override string ToString() { + return Name; + } } }
--- a/Implab/Diagnostics/LogEventArgs.cs Fri Apr 22 13:09:57 2016 +0300 +++ b/Implab/Diagnostics/LogEventArgs.cs Mon Apr 25 15:18:56 2016 +0300 @@ -2,7 +2,7 @@ namespace Implab.Diagnostics { public class LogEventArgs : EventArgs { - public string ChannelName { + public object Channel { get; private set; } @@ -18,8 +18,8 @@ get; private set; } - public LogEventArgs(string channelName, int threadId, LogicalOperation operation, int timeOffset) { - ChannelName = channelName; + public LogEventArgs(object channel, int threadId, LogicalOperation operation, int timeOffset) { + Channel = channel; ThreadId = threadId; Operation = operation; OperationTimeOffset = timeOffset;
--- a/Implab/Diagnostics/LogEventArgsT.cs Fri Apr 22 13:09:57 2016 +0300 +++ b/Implab/Diagnostics/LogEventArgsT.cs Mon Apr 25 15:18:56 2016 +0300 @@ -5,7 +5,7 @@ private set; } - public LogEventArgs(TEvent value,string channelName, int threadId, LogicalOperation operation, int timeOffset) : base(channelName, threadId, operation, timeOffset) { + public LogEventArgs(TEvent value,object channel, int threadId, LogicalOperation operation, int timeOffset) : base(channel, threadId, operation, timeOffset) { Value = value; } }
--- a/Implab/Diagnostics/TextFileListener.cs Fri Apr 22 13:09:57 2016 +0300 +++ b/Implab/Diagnostics/TextFileListener.cs Mon Apr 25 15:18:56 2016 +0300 @@ -18,7 +18,7 @@ var msg = new StringBuilder(); for (int i = 0; i < args.Operation.Level; i++) msg.Append(" "); - msg.AppendFormat("[{0}]:{1}: {2}", args.ThreadId, args.ChannelName, entry); + msg.AppendFormat("[{0}]:{1}: {2}", args.ThreadId, args.Channel, entry); lock (m_textWriter) { if (!IsDisposed) {
--- a/Implab/Implab.csproj Fri Apr 22 13:09:57 2016 +0300 +++ b/Implab/Implab.csproj Mon Apr 25 15:18:56 2016 +0300 @@ -77,7 +77,6 @@ <ItemGroup> <Compile Include="CustomEqualityComparer.cs" /> <Compile Include="Diagnostics\ConsoleTraceListener.cs" /> - <Compile Include="Diagnostics\EventText.cs" /> <Compile Include="Diagnostics\LogChannel.cs" /> <Compile Include="Diagnostics\LogicalOperation.cs" /> <Compile Include="Diagnostics\TextFileListener.cs" />
--- a/MonoPlay/Program.cs Fri Apr 22 13:09:57 2016 +0300 +++ b/MonoPlay/Program.cs Mon Apr 25 15:18:56 2016 +0300 @@ -4,39 +4,42 @@ using Implab.Formats.JSON; using System.IO; using System.Text.Json; +using System.Diagnostics; +using Implab.Parallels; +using System.Threading; namespace MonoPlay { class MainClass { public static void Main(string[] args) { - if (args == null) - throw new ArgumentNullException("args"); - int t1, t2; + var pool = new WorkerPool(10); - for (int i = 0; i < 2; i++) { - t1 = Environment.TickCount; - int elements =0; - using (var reader = new JSONParser(File.OpenText("/home/sergey/temp/citylots.json"))) { - while (reader.Read()) - elements++; - } + var listerner = new ConsoleTraceListener(); + listerner.TraceOutputOptions = TraceOptions.LogicalOperationStack; + Trace.Listeners.Add(listerner); + + Trace.CorrelationManager.StartLogicalOperation("Main"); - t2 = Environment.TickCount; - Console.WriteLine("attempt {0} done: {1} ms, {2:.00} Mb, {3} GC, Elements: {4}",i+1, t2 - t1, GC.GetTotalMemory(false) / (1024*1024), GC.CollectionCount(0), elements ); - } + var d = pool.Invoke(() => { + Trace.CorrelationManager.StartLogicalOperation("Worker"); + Thread.Sleep(100); + Trace.TraceInformation("worker done"); + Trace.CorrelationManager.StopLogicalOperation(); + }); - Console.WriteLine("Syste.Text.Json"); - var paraser = new JsonParser(); - for (int i = 0; i < 2; i++) { - t1 = Environment.TickCount; - using (var reader = File.OpenText("/home/sergey/temp/citylots.json")) { - paraser.Parse(reader); - } + ThreadPool.QueueUserWorkItem((o) => { + Trace.CorrelationManager.StartLogicalOperation("Thread"); + Thread.Sleep(100); + Trace.TraceInformation("thread done"); + Trace.CorrelationManager.StopLogicalOperation(); + }); - t2 = Environment.TickCount; - Console.WriteLine("attempt {0} done: {1} ms, {2:.00} Mb, {3} GC, ",i+1, t2 - t1, GC.GetTotalMemory(false) / (1024*1024), GC.CollectionCount(0)); - } + Trace.TraceInformation("main done"); + Trace.CorrelationManager.StopLogicalOperation(); + + d.Join(); + }