implab/ImplabNet Commit - r288:90cef6117ced

Added IObservable to TraceRegistry

cin -

r288:90cef6117ced v3

parent child

Context file:

r288:90cef6117ced

Collapse all files

Implab.Playground/Implab.Playground.csproj +3 -1

               </ItemGroup>
               <ItemGroup>
-                <PackageReference Include="Unity" Version="5.8.5" />
+                <PackageReference Include="Unity" Version="5.8.6" />
+                <PackageReference Include="System.Reactive" Version="4.0.0" />
               </ItemGroup>
             </Project>

Implab.Playground/Program.cs +3 -6

             using Unity.Registration;
             namespace Implab.Playground {
+                using System.Reactive.Linq;
                 using static Trace<Bar>;
                 class Foo {
                         Trace<Foo>.Log("First!");
                         Log("+1!");
-                        using(TraceRegistry.Global.Subscribe(x => {
+                        using(TraceRegistry.Global.OfType<TraceSourceChannel>().Subscribe(ch => {
-                            var ch  = x as TraceSourceChannel;
-                            if (ch == null)
-                                return;
                             Console.WriteLine($"{ch.Id}: {ch.Source.Name}");
-                        }, true)) {
+                        })) {
                             Trace<Foo>.Log("Hi!");
                             Log("Respect!");
                         }

Implab.ServiceHost/Implab.ServiceHost.csproj +1 -1

               </PropertyGroup>
               <ItemGroup>
-                <PackageReference Include="Unity" Version="5.8.5" />
+                <PackageReference Include="Unity" Version="5.8.6" />
               </ItemGroup>
               <ItemGroup>

Implab.Test/DiagnosticsTest.cs +1 -8

                         TraceRegistry.Global.Subscribe(x => {
                             visited++;
                             found = x as TraceSourceChannel;
-                        }, false);
+                        });
-                        Assert.Equal(0, visited);
-                        TraceRegistry.Global.Subscribe(x => {
-                            visited++;
-                            found = x as TraceSourceChannel;
-                        }, true);
                         Assert.Equal(1,visited);
                         Assert.Equal(channel, found);

Implab.Test/Implab.Test.csproj +1 0

               <ItemGroup>
                 <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0-preview-20180109-01" />
+                <PackageReference Include="System.Reactive" Version="4.0.0" />
                 <PackageReference Include="xunit" Version="2.3.1" />
                 <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
                 <ProjectReference Include="../Implab/Implab.csproj"/>

Implab/Diagnostics/TraceRegistry.cs +13 -10

             using Implab.Parallels;
             namespace Implab.Diagnostics {
-                public class TraceRegistry {
+                public class TraceRegistry: IObservable<TraceChannel> {
                     class Subscription : IDisposable {
                         readonly WeakReference<TraceRegistry> m_registry;
-                        readonly Action<object> m_unsubscribe;
                         public Subscription(TraceRegistry registry) {
                             m_registry = new WeakReference<TraceRegistry>(registry);
                         }
                     }
+                    /// <summary>
+                    /// The global collection of available diagnostic channels
+                    /// </summary>
+                    /// <returns></returns>
                     public static TraceRegistry Global { get; } = new TraceRegistry();
                     readonly object m_lock = new object();
-                    readonly Dictionary<object, Action<TraceChannel>> m_subscriptions = new Dictionary<object, Action<TraceChannel>>();
+                    readonly Dictionary<object, IObserver<TraceChannel>> m_subscriptions = new Dictionary<object, IObserver<TraceChannel>>();
                     readonly SimpleAsyncQueue<TraceChannel> m_channels = new SimpleAsyncQueue<TraceChannel>();
-                    internal void Register(TraceChannel channel) {
+                    public void Register(TraceChannel channel) {
                         // notifications can run in parallel
-                        Action<TraceChannel>[] handlers = null;
+                        IObserver<TraceChannel>[] handlers = null;
                         lock(m_lock) {
                             m_channels.Enqueue(channel);
                             if (m_subscriptions.Count > 0) {
-                                handlers = new Action<TraceChannel>[m_subscriptions.Count];
+                                handlers = new IObserver<TraceChannel>[m_subscriptions.Count];
                                 m_subscriptions.Values.CopyTo(handlers, 0);
                             }
                         }
                         if (handlers != null)
                             foreach(var h in handlers)
-                                h(channel);
+                                h.OnNext(channel);
                     }
                     /// <summary>
                     /// </summary>
                     /// <param name="handler"></param>
                     /// <returns></returns>
-                    public IDisposable Subscribe(Action<TraceChannel> handler, bool existing) {
+                    public IDisposable Subscribe(IObserver<TraceChannel> handler) {
                         Safe.ArgumentNotNull(handler, nameof(handler));
                         var cookie = new Subscription(this);
                         }
                         // announce previously declared channels if required
-                        if (existing) {
+                        if (snap != null) {
                             foreach(var c in snap)
-                                handler(c);
+                                handler.OnNext(c);
                         }
                         // return the subscription

Implab/Implab.csproj +1 -1

                 and SharedLock, Trace helpers on top of System.Diagnostics, ObjectPool etc.
                 </Description>
                 <Copyright>2012-2018 Sergey Smirnov</Copyright>
-                <Version>3.0.12</Version>
+                <Version>3.0.14</Version>
                 <PackageLicenseUrl>https://hg.implab.org/pub/ImplabNet/file/tip/Implab/license.txt</PackageLicenseUrl>
                 <PackageProjectUrl>https://implab.org</PackageProjectUrl>
                 <RepositoryUrl>https://hg.implab.org/pub/ImplabNet/</RepositoryUrl>

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