# HG changeset patch
# User cin
# Date 2014-04-17 04:49:24
# Node ID 9ce97b262a7a0e6e9ee64b45efa4c8e7417e1a57
# Parent  d10034588e38cfa0c89d484914695cc6eca2b3dc
# Parent  e5ec543feee336b44fc00caeeab1ffcfaf557916

Слияние с default

diff --git a/Implab.v11.suo b/Implab.v11.suo
deleted file mode 100644
index 2499e7be2058885bde9009de32d2756ec4238c87..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001

diff --git a/Implab/Diagnostics/ConsoleTraceListener.cs b/Implab/Diagnostics/ConsoleTraceListener.cs
--- a/Implab/Diagnostics/ConsoleTraceListener.cs
+++ b/Implab/Diagnostics/ConsoleTraceListener.cs
@@ -8,6 +8,16 @@ namespace Implab.Diagnostics {
 
         static readonly object _consoleLock = new object();
 
+        public ConsoleTraceListener()
+            : base(true) {
+
+        }
+
+        public ConsoleTraceListener(bool local)
+            : base(local) {
+
+        }
+
         protected override void WriteEntry(TraceContext context, EventText text) {
             var msg = new StringBuilder();
 
diff --git a/Implab/Diagnostics/TextFileListener.cs b/Implab/Diagnostics/TextFileListener.cs
--- a/Implab/Diagnostics/TextFileListener.cs
+++ b/Implab/Diagnostics/TextFileListener.cs
@@ -8,7 +8,7 @@ namespace Implab.Diagnostics {
     public class TextFileListener: TextListenerBase {
         readonly TextWriter m_textWriter;
 
-        public TextFileListener(string fileName) {
+        public TextFileListener(string fileName, bool local) : base(local) {
             m_textWriter = File.CreateText(fileName);
 
             m_textWriter.WriteLine("LOG {0}", DateTime.Now);
diff --git a/Implab/Diagnostics/TextListenerBase.cs b/Implab/Diagnostics/TextListenerBase.cs
--- a/Implab/Diagnostics/TextListenerBase.cs
+++ b/Implab/Diagnostics/TextListenerBase.cs
@@ -7,9 +7,15 @@ namespace Implab.Diagnostics {
     public abstract class TextListenerBase : ServiceLocator, IEventTextFormatter<object>, IEventTextFormatter<TraceEvent> {
 
         readonly Dictionary<object, Action> m_subscriptions = new Dictionary<object, Action>();
+        readonly LogicalOperation m_boundOperation;
+        readonly int m_baseIndent;
 
-        protected TextListenerBase() {
+        protected TextListenerBase(bool local) {
             Register(this);
+            if (local) {
+                m_boundOperation = TraceContext.Current.CurrentOperation;
+                m_baseIndent = Math.Max(0, m_boundOperation.Level - 1);
+            }
         }
 
         public void Subscribe(Type eventType) {
@@ -32,7 +38,12 @@ namespace Implab.Diagnostics {
                 var formatter = GetService<IEventTextFormatter<TEvent>>();
 
                 EventHandler<ValueEventArgs<TEvent>> handler = (sender, args) => {
-                    WriteEntry((TraceContext)sender, formatter.Format((TraceContext)sender, args.Value));
+                    TraceContext context = (TraceContext)sender;
+                    var text = formatter.Format(context, args.Value);
+                    text.indent -= m_baseIndent;
+
+                    if (IsRelated(context.CurrentOperation))
+                        WriteEntry(context, text);
                 };
 
                 if (m_subscriptions.ContainsKey(channel))
@@ -48,6 +59,15 @@ namespace Implab.Diagnostics {
             }
         }
 
+        public bool IsRelated(LogicalOperation op) {
+            if (m_boundOperation == null)
+                return true;
+
+            while (op != m_boundOperation && op.Level > m_boundOperation.Level)
+                op = op.Parent;
+            return op == m_boundOperation;
+        }
+
         public void Unsubscribe<TEvent>(LogChannel<TEvent> channel) {
             if (channel == null)
                 throw new ArgumentNullException("channel");
diff --git a/Implab/Diagnostics/TraceContext.cs b/Implab/Diagnostics/TraceContext.cs
--- a/Implab/Diagnostics/TraceContext.cs
+++ b/Implab/Diagnostics/TraceContext.cs
@@ -92,6 +92,7 @@ namespace Implab.Diagnostics {
             try {
                 action();
             } finally {
+                _current.EndAllOperations();
                 _current = old;
             }
         }
@@ -156,6 +157,14 @@ namespace Implab.Diagnostics {
             }
         }
 
+        /// <summary>
+        /// Заврешает все начатые в этом контексте операции
+        /// </summary>
+        public void EndAllOperations() {
+            while (m_bound != m_currentOperation)
+                EndLogicalOperation();
+        }
+
         void LogEvent(TraceEventType type, string format, params object[] args) {
             LogChannel<TraceEvent>.Default.LogEvent(this, TraceEvent.Create(type, format, args));
         }
diff --git a/Implab/Diagnostics/TraceEvent.cs b/Implab/Diagnostics/TraceEvent.cs
--- a/Implab/Diagnostics/TraceEvent.cs
+++ b/Implab/Diagnostics/TraceEvent.cs
@@ -25,7 +25,7 @@ namespace Implab.Diagnostics {
         }
 
         public static TraceEvent Create(TraceEventType type, string format, params object[] args) {
-            return new TraceEvent(type, String.Format(format ?? String.Empty, args));
+            return new TraceEvent(type, format == null ? String.Empty : String.Format(format, args));
         }
     }
 }