diff --git a/Implab.v11.suo b/Implab.v11.suo index abba552222ef3eaa7ffdb49cf74135550b033615..c3b0d3f668f7a93b548d7c4a3825707ecbef4da9 GIT binary patch literal 100864 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 diff --git a/Implab/Diagnostics/ConsoleTraceListener.cs b/Implab/Diagnostics/ConsoleTraceListener.cs new file mode 100644 --- /dev/null +++ b/Implab/Diagnostics/ConsoleTraceListener.cs @@ -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.Default.Events += Default_Events; + } + + public void Unsubscribe() { + LogChannel.Default.Events -= Default_Events; + } + + void Default_Events(object sender, ValueEventArgs 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()); + } + } + } +} diff --git a/Implab/Diagnostics/IEventListener.cs b/Implab/Diagnostics/IEventListener.cs deleted file mode 100644 --- a/Implab/Diagnostics/IEventListener.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Implab.Diagnostics { - public interface IEventListener { - void TraceEvent(LogContext context, TraceEventType type, string format, params object[] args); - } -} diff --git a/Implab/Diagnostics/Log.cs b/Implab/Diagnostics/Log.cs deleted file mode 100644 --- a/Implab/Diagnostics/Log.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Implab.Diagnostics { - public static class Log { - [Conditional("TRACE")] - public static void Transfer(LogContext from) { - LogContext.Transfer(from); - } - - [Conditional("TRACE")] - public static void StartLogicalOperation() { - LogContext.Current.StartLogicalOperation(); - } - - [Conditional("TRACE")] - public static void StartLogicalOperation(string name) { - LogContext.Current.StartLogicalOperation(name); - } - - [Conditional("TRACE")] - public static void EndLogicalOperation() { - LogContext.Current.EndLogicalOperation(); - } - - [Conditional("TRACE")] - public static void TraceInformation(string format, params object[] arguments) { - LogContext.Current.TraceEvent(TraceEventType.Information, format, arguments); - } - - [Conditional("TRACE")] - public static void TraceWarning(string format, params object[] arguments) { - LogContext.Current.TraceEvent(TraceEventType.Warning, format, arguments); - } - - [Conditional("TRACE")] - public static void TraceError(string format, params object[] arguments) { - LogContext.Current.TraceEvent(TraceEventType.Error, format, arguments); - } - - [Conditional("TRACE")] - public static void TraceError(Exception err) { - TraceError("{0}", err); - } - } -} diff --git a/Implab/Diagnostics/LogChannel.cs b/Implab/Diagnostics/LogChannel.cs new file mode 100644 --- /dev/null +++ b/Implab/Diagnostics/LogChannel.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Implab.Diagnostics { + public class LogChannel { + static LogChannel _default = new LogChannel(); + + public static LogChannel Default { + get { + return _default; + } + } + + public event EventHandler> Events; + + public void LogEvent(TEvent data) { + var t = Events; + if (t!= null) + t(TraceContext.Current,new ValueEventArgs(data)); + } + } +} diff --git a/Implab/Diagnostics/LogContext.cs b/Implab/Diagnostics/LogContext.cs deleted file mode 100644 --- a/Implab/Diagnostics/LogContext.cs +++ /dev/null @@ -1,107 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; - -namespace Implab.Diagnostics { - public class LogContext { - LogicalOperation m_currentOperation; - readonly LogicalOperation m_traceBound; - readonly int m_threadId; - readonly LogContext m_parent; - - readonly static object _consoleLock = new object(); - - [ThreadStatic] - static LogContext _current; - - public static LogContext Current { - get { - if (_current == null) - _current = new LogContext(); - return _current; - } - } - - LogContext(LogContext context) { - if (context == null) - throw new ArgumentNullException("context"); - - m_parent = context; - m_currentOperation = context.CurrentOperation; - m_traceBound = context.CurrentOperation; - m_threadId = Thread.CurrentThread.ManagedThreadId; - - TraceEvent(TraceEventType.Transfer, String.Empty); - } - - LogContext() { - m_currentOperation = new LogicalOperation(); - m_traceBound = m_currentOperation; - m_threadId = Thread.CurrentThread.ManagedThreadId; - } - - public static void Transfer(LogContext from) { - _current = from == null ? new LogContext() : new LogContext(from); - } - - public LogContext 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) { - TraceEvent(TraceEventType.OperationStarted, "{0}", name); - m_currentOperation = new LogicalOperation(name, m_currentOperation); - } - - public void EndLogicalOperation() { - if (m_traceBound == m_currentOperation) { - TraceEvent(TraceEventType.Error, "Trying to end the operation which isn't belongs to current trace"); - } else { - var op = m_currentOperation; - m_currentOperation = m_currentOperation.Parent; - TraceEvent(TraceEventType.OperationCompleted, "{0} {1} ms", op.Name, op.Duration); - } - } - - public void TraceEvent(TraceEventType type, string format, params object[] args) { - /*var msg = new StringBuilder(); - for (int i = 0; i < CurrentOperation.Level; i++) - msg.Append(" "); - msg.Append(type); - msg.AppendFormat("[{0}]: ",m_threadId); - msg.AppendFormat(format, args); - - lock (_consoleLock) { - Console.ForegroundColor = (ConsoleColor)(m_threadId % 15 + 1); - Console.WriteLine(msg.ToString()); - }*/ - } - } -} diff --git a/Implab/Diagnostics/TraceContext.cs b/Implab/Diagnostics/TraceContext.cs new file mode 100644 --- /dev/null +++ b/Implab/Diagnostics/TraceContext.cs @@ -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, String.Empty); + } + + 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.Default.LogEvent(TraceEvent.Create(type, format, args)); + } + } +} diff --git a/Implab/Diagnostics/TraceEvent.cs b/Implab/Diagnostics/TraceEvent.cs new file mode 100644 --- /dev/null +++ b/Implab/Diagnostics/TraceEvent.cs @@ -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)); + } + } +} diff --git a/Implab/Diagnostics/TraceLog.cs b/Implab/Diagnostics/TraceLog.cs new file mode 100644 --- /dev/null +++ b/Implab/Diagnostics/TraceLog.cs @@ -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 { + /// + /// Класс для публикации событий выполнения программы, события публикуются через + /// + 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.Default.LogEvent(TraceEvent.Create(TraceEventType.Information, format, arguments)); + } + + [Conditional("TRACE")] + public static void TraceWarning(string format, params object[] arguments) { + LogChannel.Default.LogEvent(TraceEvent.Create(TraceEventType.Warning, format, arguments)); + } + + [Conditional("TRACE")] + public static void TraceError(string format, params object[] arguments) { + LogChannel.Default.LogEvent(TraceEvent.Create(TraceEventType.Error, format, arguments)); + } + + [Conditional("TRACE")] + public static void TraceError(Exception err) { + TraceError("{0}", err); + } + } +} diff --git a/Implab/Implab.csproj b/Implab/Implab.csproj --- a/Implab/Implab.csproj +++ b/Implab/Implab.csproj @@ -32,10 +32,12 @@ - + + - - + + + diff --git a/Implab/Parallels/AsyncPool.cs b/Implab/Parallels/AsyncPool.cs --- a/Implab/Parallels/AsyncPool.cs +++ b/Implab/Parallels/AsyncPool.cs @@ -14,10 +14,10 @@ namespace Implab.Parallels { public static Promise Invoke(Func func) { var p = new Promise(); - var caller = LogContext.Current; + var caller = TraceContext.Current; ThreadPool.QueueUserWorkItem(param => { - Log.Transfer(caller); + TraceLog.Transfer(caller); try { p.Resolve(func()); } catch(Exception e) { @@ -31,10 +31,10 @@ namespace Implab.Parallels { public static Promise InvokeNewThread(Func func) { var p = new Promise(); - var caller = LogContext.Current; + var caller = TraceContext.Current; var worker = new Thread(() => { - Log.Transfer(caller); + TraceLog.Transfer(caller); try { p.Resolve(func()); } catch (Exception e) { diff --git a/Implab/Parallels/WorkerPool.cs b/Implab/Parallels/WorkerPool.cs --- a/Implab/Parallels/WorkerPool.cs +++ b/Implab/Parallels/WorkerPool.cs @@ -42,10 +42,10 @@ namespace Implab.Parallels { var promise = new Promise(); - var caller = LogContext.Current; + var caller = TraceContext.Current; EnqueueTask(delegate() { - Log.Transfer(caller); + TraceLog.Transfer(caller); try { promise.Resolve(task()); } catch (Exception e) {