implab/ImplabNet Commit - r194:d45bdf510514

working on diagnostics

cin -

r194:d45bdf510514 v2

parent child

Context file:

r194:d45bdf510514

Collapse all files

Implab.Test/RunnableComponentTests.cs +2 -2

                         ShouldThrow(() => p.Join(1000));
                         Assert.AreEqual(ExecutionState.Failed, comp.State);
-                        Assert.IsInstanceOfType(comp.LastError, typeof(OperationCanceledException));
+                        Assert.IsTrue(comp.LastError is OperationCanceledException);
                         comp.Dispose();
                     }
                         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();
                     }

Implab/Diagnostics/ListenerBase.cs +2 -2

                     public void UnsubscribeAll() {
                         lock (m_subscriptions) {
-                            foreach (var subscription in m_subscriptions.Values)
+                            foreach (var remove in m_subscriptions.Values)
-                                subscription();
+                                remove();
                             m_subscriptions.Clear();
                         }
                     }

Implab/Diagnostics/LogChannel.cs +5 -1

                                 this,
                                 new LogEventArgs<TEvent>(
                                     data,
-                                    Name,
+                                    this,
                                     traceContext.ThreadId,
                                     traceContext.CurrentOperation,
                                     traceContext.CurrentOperation.Duration
                             );
                         }
                     }
+                    public override string ToString() {
+                        return Name;
+                    }
                 }
             }

Implab/Diagnostics/LogEventArgs.cs +3 -3

             namespace Implab.Diagnostics {
                 public class LogEventArgs : EventArgs {
-                    public string ChannelName {
+                    public object Channel {
                         get;
                         private set;
                     }
                         get;
                         private set;
                     }
-                    public LogEventArgs(string channelName, int threadId, LogicalOperation operation, int timeOffset) {
+                    public LogEventArgs(object channel, int threadId, LogicalOperation operation, int timeOffset) {
-                        ChannelName = channelName;
+                        Channel = channel;
                         ThreadId = threadId;
                         Operation = operation;
                         OperationTimeOffset = timeOffset;

Implab/Diagnostics/LogEventArgsT.cs +1 -1

                         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;
                     }
                 }

Implab/Diagnostics/TextFileListener.cs +1 -1

                         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) {

Implab/Implab.csproj 0 -1

               <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" />

MonoPlay/Program.cs +26 -23

@@ -4,39 +4,42 using System.Threading.Tasks;
4	using Implab.Formats.JSON;	4	using Implab.Formats.JSON;
5	using System.IO;	5	using System.IO;
6	using System.Text.Json;	6	using System.Text.Json;
		7	using System.Diagnostics;
		8	using Implab.Parallels;
		9	using System.Threading;
7		10
8	namespace MonoPlay {	11	namespace MonoPlay {
9	class MainClass {	12	class MainClass {
10		13
11		14
12	public static void Main(string[] args) {	15	public static void Main(string[] args) {
13	if (args == null)	16	var pool = new WorkerPool(10);
14	throw new ArgumentNullException("args");
15	int t1, t2;
16		17
17	for (int i = 0; i < 2; i++) {	18	var listerner = new ConsoleTraceListener();
18	t1 = Environment.TickCount;	19	listerner.TraceOutputOptions = TraceOptions.LogicalOperationStack;
19	int elements =0;	20	Trace.Listeners.Add(listerner);
20	using (var reader = new JSONParser(File.OpenText("/home/sergey/temp/citylots.json"))) {	21
21	while (reader.Read())	22	Trace.CorrelationManager.StartLogicalOperation("Main");
22	elements++;
23	}
24		23
25	t2 = Environment.TickCount;	24	var d = pool.Invoke(() => {
26	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 );	25	Trace.CorrelationManager.StartLogicalOperation("Worker");
27	}	26	Thread.Sleep(100);
		27	Trace.TraceInformation("worker done");
		28	Trace.CorrelationManager.StopLogicalOperation();
		29	});
28		30
29	Console.WriteLine("Syste.Text.Json");	31	ThreadPool.QueueUserWorkItem((o) => {
30	var paraser = new JsonParser();	32	Trace.CorrelationManager.StartLogicalOperation("Thread");
31	for (int i = 0; i < 2; i++) {	33	Thread.Sleep(100);
32	t1 = Environment.TickCount;	34	Trace.TraceInformation("thread done");
33	using (var reader = File.OpenText("/home/sergey/temp/citylots.json")) {	35	Trace.CorrelationManager.StopLogicalOperation();
34	paraser.Parse(reader);	36	});
35	}
36		37
37	t2 = Environment.TickCount;	38	Trace.TraceInformation("main done");
38	Console.WriteLine("attempt {0} done: {1} ms, {2:.00} Mb, {3} GC, ",i+1, t2 - t1, GC.GetTotalMemory(false) / (1024*1024), GC.CollectionCount(0));	39	Trace.CorrelationManager.StopLogicalOperation();
39	}	40
		41	d.Join();
		42
40		43
41		44
42	}	45	}

Implab/Diagnostics/EventText.cs removed 0 -12

NO CONTENT: file was removed

General Comments 3

sergey

|

Auto status change to "Under Review"

sergey

|

ok, latest stable version should be in default

Write
Preview

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

	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