Mercurial > pub > ImplabNet
changeset 39:6498078ae368
Слияние с diagnostics
author | cin |
---|---|
date | Tue, 15 Apr 2014 02:46:53 +0400 |
parents | dabf79fde388 (current diff) 1cedc4e58acc (diff) |
children | fe33f4e02ad5 |
files | Implab/PromiseState.cs |
diffstat | 12 files changed, 325 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Implab/Diagnostics/ConsoleTraceListener.cs Tue Apr 15 02:46:53 2014 +0400 @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Implab.Diagnostics { + public class ConsoleTraceListener { + + static readonly object _consoleLock = new object(); + + public void Subscribe() { + LogChannel<TraceEvent>.Default.Events += Default_Events; + } + + public void Unsubscribe() { + LogChannel<TraceEvent>.Default.Events -= Default_Events; + } + + void Default_Events(object sender, ValueEventArgs<TraceEvent> e) { + LogEvent((TraceContext)sender, e.Value); + } + + void LogEvent(TraceContext context, TraceEvent evt) { + var msg = new StringBuilder(); + for (int i = 0; i < context.CurrentOperation.Level; i++) + msg.Append(" "); + msg.Append(evt.EventType); + msg.AppendFormat("[{0}]: ",context.ThreadId); + msg.Append(evt.Message); + + lock (_consoleLock) { + Console.ForegroundColor = (ConsoleColor)(context.ThreadId % 15 + 1); + Console.WriteLine(msg.ToString()); + } + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Implab/Diagnostics/LogChannel.cs Tue Apr 15 02:46:53 2014 +0400 @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Implab.Diagnostics { + public class LogChannel<TEvent> { + static LogChannel<TEvent> _default = new LogChannel<TEvent>(); + + public static LogChannel<TEvent> Default { + get { + return _default; + } + } + + public event EventHandler<ValueEventArgs<TEvent>> Events; + + public void LogEvent(TEvent data) { + var t = Events; + if (t!= null) + t(TraceContext.Current,new ValueEventArgs<TEvent>(data)); + } + + public void LogEvent(TraceContext context,TEvent data) { + var t = Events; + if (t != null) + t(context, new ValueEventArgs<TEvent>(data)); + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Implab/Diagnostics/LogicalOperation.cs Tue Apr 15 02:46:53 2014 +0400 @@ -0,0 +1,47 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Implab.Diagnostics { + public class LogicalOperation { + readonly LogicalOperation m_parent; + readonly string m_name; + readonly int m_level; + readonly int m_timestamp; + + public LogicalOperation() + : this(null, null) { + } + + public LogicalOperation(string name, LogicalOperation parent) { + m_name = name ?? String.Empty; + m_parent = parent; + + m_level = parent == null ? 0 : parent.Level + 1; + m_timestamp = Environment.TickCount; + } + + public int Duration { + get { + var dt = Environment.TickCount - m_timestamp; + return dt < 0 ? int.MaxValue + dt : dt; // handle overflow + } + } + + public LogicalOperation Parent { + get { + return m_parent; + } + } + + public int Level { + get { return m_level; } + } + + public string Name { + get { return m_name; } + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Implab/Diagnostics/TraceContext.cs Tue Apr 15 02:46:53 2014 +0400 @@ -0,0 +1,97 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Implab.Diagnostics { + public class TraceContext { + LogicalOperation m_currentOperation; + readonly LogicalOperation m_traceBound; + readonly int m_threadId; + readonly TraceContext m_parent; + + readonly static object _consoleLock = new object(); + + [ThreadStatic] + static TraceContext _current; + + public static TraceContext Current { + get { + if (_current == null) + _current = new TraceContext(); + return _current; + } + } + + TraceContext(TraceContext context) { + if (context == null) + throw new ArgumentNullException("context"); + + m_parent = context; + m_currentOperation = context.CurrentOperation; + m_traceBound = context.CurrentOperation; + m_threadId = Thread.CurrentThread.ManagedThreadId; + + LogEvent(TraceEventType.Transfer, "FORK {0}", context.ThreadId); + } + + TraceContext() { + m_currentOperation = new LogicalOperation(); + m_traceBound = m_currentOperation; + m_threadId = Thread.CurrentThread.ManagedThreadId; + } + + public static void Transfer(TraceContext from) { + _current = from == null ? new TraceContext() : new TraceContext(from); + } + + public TraceContext ParentContext { + get { + return m_parent; + } + } + + public LogicalOperation CurrentOperation { + get { + return m_currentOperation; + } + } + + public LogicalOperation TraceBound { + get { + return m_traceBound; + } + } + + public int ThreadId { + get { + return m_threadId; + } + } + + public void StartLogicalOperation() { + StartLogicalOperation(null); + } + + public void StartLogicalOperation(string name) { + LogEvent(TraceEventType.OperationStarted, "{0}", name); + m_currentOperation = new LogicalOperation(name, m_currentOperation); + } + + public void EndLogicalOperation() { + if (m_traceBound == m_currentOperation) { + LogEvent(TraceEventType.Error, "Trying to end the operation which isn't belongs to current trace"); + } else { + var op = m_currentOperation; + m_currentOperation = m_currentOperation.Parent; + LogEvent(TraceEventType.OperationCompleted, "{0} {1} ms", op.Name, op.Duration); + } + } + + void LogEvent(TraceEventType type, string format, params object[] args) { + LogChannel<TraceEvent>.Default.LogEvent(this, TraceEvent.Create(type, format, args)); + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Implab/Diagnostics/TraceEvent.cs Tue Apr 15 02:46:53 2014 +0400 @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Implab.Diagnostics { + public class TraceEvent { + public string Message { + get; + private set; + } + + public TraceEventType EventType { + get; + private set; + } + + public TraceEvent(TraceEventType type, string message) { + EventType = type; + Message = message; + } + + public static TraceEvent Create(TraceEventType type, string format, params object[] args) { + return new TraceEvent(type, String.Format(format, args)); + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Implab/Diagnostics/TraceEventType.cs Tue Apr 15 02:46:53 2014 +0400 @@ -0,0 +1,16 @@ +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 + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Implab/Diagnostics/TraceLog.cs Tue Apr 15 02:46:53 2014 +0400 @@ -0,0 +1,53 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Implab.Diagnostics { + /// <summary> + /// Класс для публикации событий выполнения программы, события публикуются через <see cref="LogChannel{TraceEvent}"/> + /// </summary> + public static class TraceLog { + [Conditional("TRACE")] + public static void Transfer(TraceContext from) { + TraceContext.Transfer(from); + } + + [Conditional("TRACE")] + public static void StartLogicalOperation() { + TraceContext.Current.StartLogicalOperation(); + } + + [Conditional("TRACE")] + public static void StartLogicalOperation(string name) { + TraceContext.Current.StartLogicalOperation(name); + } + + [Conditional("TRACE")] + public static void EndLogicalOperation() { + TraceContext.Current.EndLogicalOperation(); + } + + [Conditional("TRACE")] + public static void TraceInformation(string format, params object[] arguments) { + LogChannel<TraceEvent>.Default.LogEvent(TraceEvent.Create(TraceEventType.Information, format, arguments)); + } + + [Conditional("TRACE")] + public static void TraceWarning(string format, params object[] arguments) { + LogChannel<TraceEvent>.Default.LogEvent(TraceEvent.Create(TraceEventType.Warning, format, arguments)); + } + + [Conditional("TRACE")] + public static void TraceError(string format, params object[] arguments) { + LogChannel<TraceEvent>.Default.LogEvent(TraceEvent.Create(TraceEventType.Error, format, arguments)); + } + + [Conditional("TRACE")] + public static void TraceError(Exception err) { + TraceError("{0}", err); + } + } +}
--- a/Implab/Implab.csproj Thu Apr 10 04:20:25 2014 +0400 +++ b/Implab/Implab.csproj Tue Apr 15 02:46:53 2014 +0400 @@ -15,7 +15,7 @@ <DebugType>full</DebugType> <Optimize>false</Optimize> <OutputPath>bin\Debug</OutputPath> - <DefineConstants>DEBUG;</DefineConstants> + <DefineConstants>TRACE;DEBUG;</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <ConsolePause>false</ConsolePause> @@ -32,6 +32,13 @@ <Reference Include="System" /> </ItemGroup> <ItemGroup> + <Compile Include="Diagnostics\ConsoleTraceListener.cs" /> + <Compile Include="Diagnostics\LogChannel.cs" /> + <Compile Include="Diagnostics\LogicalOperation.cs" /> + <Compile Include="Diagnostics\TraceLog.cs" /> + <Compile Include="Diagnostics\TraceContext.cs" /> + <Compile Include="Diagnostics\TraceEvent.cs" /> + <Compile Include="Diagnostics\TraceEventType.cs" /> <Compile Include="ICancellable.cs" /> <Compile Include="IProgressHandler.cs" /> <Compile Include="IProgressNotifier.cs" /> @@ -43,7 +50,6 @@ <Compile Include="Parallels\ArrayTraits.cs" /> <Compile Include="Parallels\MTQueue.cs" /> <Compile Include="Parallels\WorkerPool.cs" /> - <Compile Include="PromiseState.cs" /> <Compile Include="TaskController.cs" /> <Compile Include="ProgressInitEventArgs.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
--- a/Implab/Parallels/AsyncPool.cs Thu Apr 10 04:20:25 2014 +0400 +++ b/Implab/Parallels/AsyncPool.cs Tue Apr 15 02:46:53 2014 +0400 @@ -1,3 +1,4 @@ +using Implab.Diagnostics; using System; using System.Threading; @@ -13,8 +14,10 @@ public static Promise<T> Invoke<T>(Func<T> func) { var p = new Promise<T>(); + var caller = TraceContext.Current; ThreadPool.QueueUserWorkItem(param => { + TraceLog.Transfer(caller); try { p.Resolve(func()); } catch(Exception e) { @@ -28,7 +31,10 @@ public static Promise<T> InvokeNewThread<T>(Func<T> func) { var p = new Promise<T>(); + var caller = TraceContext.Current; + var worker = new Thread(() => { + TraceLog.Transfer(caller); try { p.Resolve(func()); } catch (Exception e) {
--- a/Implab/Parallels/WorkerPool.cs Thu Apr 10 04:20:25 2014 +0400 +++ b/Implab/Parallels/WorkerPool.cs Tue Apr 15 02:46:53 2014 +0400 @@ -4,6 +4,7 @@ using System.Text; using System.Threading; using System.Diagnostics; +using Implab.Diagnostics; namespace Implab.Parallels { public class WorkerPool : DispatchPool<Action> { @@ -41,7 +42,10 @@ var promise = new Promise<T>(); + var caller = TraceContext.Current; + EnqueueTask(delegate() { + TraceLog.Transfer(caller); try { promise.Resolve(task()); } catch (Exception e) {
--- a/Implab/PromiseState.cs Thu Apr 10 04:20:25 2014 +0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Implab -{ - public enum PromiseState - { - Unresolved, - Resolved, - Cancelled, - Rejected - } -}