implab/ImplabNet Commit - r94:a43745f81f10

minor fixes

cin -

r94:a43745f81f10 v2

parent child

Context file:

r94:a43745f81f10

Collapse all files

Implab/Diagnostics/Extensions.cs +11 0

@@ -10,6 +10,17
10	TraceContext.Instance.Leave();	10	TraceContext.Instance.Leave();
11	});	11	});
12	}	12	}
		13
		14	public static IPromise EndLogicalOperation(this IPromise promise) {
		15	Safe.ArgumentNotNull(promise, "promise");
		16	var op = TraceContext.Instance.DetachLogicalOperation();
		17
		18	return promise.Anyway(() => {
		19	TraceContext.Instance.EnterLogicalOperation(op,true);
		20	TraceLog.EndLogicalOperation();
		21	TraceContext.Instance.Leave();
		22	});
		23	}
13	}	24	}
14	}	25	}
15		26

Implab/Diagnostics/TraceContext.cs +7 -4

                     }
                     public void EnterLogicalOperation(LogicalOperation operation, bool takeOwnership) {
-                        LogChannel<TraceEvent>.Default.LogEvent(new TraceEvent(TraceEventType.Attach, String.Format("{0} -> [{1}]", operation.Name, m_threadId)));
+                        var prev = CurrentOperation;
                         m_stack.Push(m_current);
                         m_current = new OperationContext(operation, takeOwnership);
+                        LogChannel<TraceEvent>.Default.LogEvent(new TraceEvent(takeOwnership ? TraceEventType.Attach : TraceEventType.Enter, String.Format("{0} -> {1}",prev.Name, operation.Name)));
                     }
                     public void StartLogicalOperation(string name) {
                     }
                     public LogicalOperation DetachLogicalOperation() {
-                        var op = m_current.DetachLogicalOperation();
+                        var prev = m_current.DetachLogicalOperation();
-                        LogChannel<TraceEvent>.Default.LogEvent(new TraceEvent(TraceEventType.Detach, String.Format("[{0}] -> {1}", m_threadId, op.Name)));
+                        LogChannel<TraceEvent>.Default.LogEvent(new TraceEvent(TraceEventType.Detach, String.Format("{0} -> {1}",prev.Name, CurrentOperation.Name)));
-                        return op;
+                        return prev;
                     }
                     public void Leave() {
                         if (m_stack.Count > 0) {
                             m_current.Leave();
+                            var prev = CurrentOperation;
                             m_current = m_stack.Pop();
+                            LogChannel<TraceEvent>.Default.LogEvent(new TraceEvent(TraceEventType.Leave, String.Format("{0} -> {1}", prev.Name, CurrentOperation.Name)));
                         } else {
                             TraceLog.TraceWarning("Attemtp to leave the last operation context");
                             m_current = OperationContext.EMPTY;

Implab/Diagnostics/TraceEventType.cs +2 0

                     OperationCompleted,
                     Attach,
                     Detach,
+                    Enter,
+                    Leave
                 }
             }

Implab/IPromiseT.cs 0 -3

             using System;
-            using System.Collections.Generic;
-            using System.Linq;
-            using System.Text;
             namespace Implab {
                 public interface IPromise<T> : IPromise {

Implab/Safe.cs +3 -3

                     }
                     [DebuggerStepThrough]
-                    public static IPromise<T> GuargPromise<T>(Func<T> action) {
+                    public static IPromise<T> InvokePromise<T>(Func<T> action) {
                         ArgumentNotNull(action, "action");
                         var p = new Promise<T>();
                     }
                     [DebuggerStepThrough]
-                    public static IPromise<T> GuardPromise<T>(Func<IPromise<T>> action) {
+                    public static IPromise<T> InvokePromise<T>(Func<IPromise<T>> action) {
                         ArgumentNotNull(action, "action");
                         try {
-                            return action();
+                            return action() ?? Promise<T>.ExceptionToPromise(new Exception("The action returned null"));
                         } catch (Exception err) {
                             return Promise<T>.ExceptionToPromise(err);
                         }

MonoPlay/Program.cs +4 -3

             namespace MonoPlay {
                 class MainClass {
                     public static void Main(string[] args) {
+                        if (args == null)
+                            throw new ArgumentNullException("args");
                         var listener = new ConsoleTraceListener(true);
                         listener.Subscribe<TraceEvent>();
                         TraceLog.StartLogicalOperation("program");
-                        Console.WriteLine("Hello World!");
                         TraceLog.StartLogicalOperation("async");
                         AsyncPool.Invoke(() => {
                             TraceLog.TraceInformation("Hello async");
-                            TraceLog.StartLogicalOperation();
+                            TraceLog.StartLogicalOperation("foo");
                             return 0;
                         })
                             .EndLogicalOperation()

General Comments 0

Write
Preview

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

No TODOs yet

	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