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)
-                                 subscription();
+                             foreach (var remove in m_subscriptions.Values)
+                                 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) {
-                         ChannelName = channelName;
+                     public LogEventArgs(object channel, int threadId, LogicalOperation operation, int timeOffset) {
+                         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

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

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