small perf optimizations with adding TrackDisposableWithoutDisposalOrder

Author: maximv

src/DryIoc/Container.cs

@@ -3321,7 +3321,7 @@ private static bool TryInterpretMethodCall(IResolverContext r, Expression expr,
                     {
                         if (!TryInterpret(resolver, callArgs[2], paramExprs, paramValues, parentArgs, useFec, out var service))
                             return false;
-                        result = scope.TrackDisposable(service); // todo: what is with `disposalOrder`
+                        result = service is IDisposable d ? scope.TrackDisposableWithoutDisposalOrder(d) : service;
                     }
 
                     return true;
@@ -3336,7 +3336,7 @@ private static bool TryInterpretMethodCall(IResolverContext r, Expression expr,
                     {
                         if (!TryInterpret(resolver, callArgs[3], paramExprs, paramValues, parentArgs, useFec, out var service))
                             return false;
-                        result = scope.TrackDisposable(service);
+                        result = service is IDisposable d ? scope.TrackDisposableWithoutDisposalOrder(d) : service;
                     }
 
                     return true;
@@ -3359,9 +3359,9 @@ private static bool TryInterpretMethodCall(IResolverContext r, Expression expr,
                             {
                                 if (TryInterpret(rc, e, paramExprs, paramValues, parentArgs, uf, out var value))
                                     return value;
-                                return e.CompileToFactoryDelegate(uf, ((IContainer) rc).Rules.UseInterpretation)(rc);
+                                return e.CompileToFactoryDelegate(uf, ((IContainer)rc).Rules.UseInterpretation)(rc);
                             },
-                            (int) ConstValue(callArgs[3]));
+                            (int)ConstValue(callArgs[3]));
                     }
 
                     return true;
@@ -3372,7 +3372,14 @@ private static bool TryInterpretMethodCall(IResolverContext r, Expression expr,
                     r = r.Root ?? r;
                     if (!TryInterpret(r, callArgs[0], paramExprs, paramValues, parentArgs, useFec, out var service))
                         return false;
-                    result = r.SingletonScope.TrackDisposable(service, (int)ConstValue(callArgs[1]));
+                    if (service is IDisposable d) 
+                    {
+                        var disposalOrder = (int)ConstValue(callArgs[1]);
+                        result = disposalOrder == 0
+                            ? r.SingletonScope.TrackDisposableWithoutDisposalOrder(d)
+                            : r.SingletonScope.TrackDisposable(service, disposalOrder);
+                    }
+                    
                     return true;
                 }
             }
@@ -4713,7 +4720,7 @@ public static IResolverContext OpenScope(this IResolverContext r, object name =
                 var parentScope = r.CurrentScope;
                 var newOwnScope = new Scope(parentScope, name);
                 if (trackInParent)
-                    (parentScope ?? r.SingletonScope).TrackDisposable(newOwnScope);
+                    (parentScope ?? r.SingletonScope).TrackDisposableWithoutDisposalOrder(newOwnScope);
                 return r.WithCurrentScope(newOwnScope);
             }
 
@@ -4722,7 +4729,7 @@ public static IResolverContext OpenScope(this IResolverContext r, object name =
                 : r.ScopeContext.SetCurrent(parent => new Scope(parent, name));
 
             if (trackInParent)
-                (newContextScope.Parent ?? r.SingletonScope).TrackDisposable(newContextScope);
+                (newContextScope.Parent ?? r.SingletonScope).TrackDisposableWithoutDisposalOrder(newContextScope);
             return r.WithCurrentScope(null);
         }
 
@@ -4737,7 +4744,7 @@ internal static bool TryGetUsedInstance(this IResolverContext r, Type serviceTyp
         // todo: @perf no need to check for IDisposable in TrackDisposable
         /// <summary>A bit if sugar to track disposable in the current scope or in the singleton scope as a fallback</summary>
         public static T TrackDisposable<T>(this IResolverContext r, T instance) where T : IDisposable =>
-            (T)(r.CurrentScope ?? r.SingletonScope).TrackDisposable(instance);
+            (T)(r.CurrentScope ?? r.SingletonScope).TrackDisposableWithoutDisposalOrder(instance);
     }
 
     /// <summary>The result delegate generated by DryIoc for service creation.</summary>
@@ -6891,8 +6898,8 @@ public static void RegisterInstance(this IRegistrator registrator, bool isChecke
                 serviceType, serviceKey, ifAlreadyRegistered, isStaticallyChecked: false);
 
             // done after registration to pass all the registration validation checks
-            if (instance is IDisposable && (setup == null || (!setup.PreventDisposal && !setup.WeaklyReferenced)))
-                (registrator as IResolverContext)?.SingletonScope.TrackDisposable(instance);
+            if (instance is IDisposable d && (setup == null || (!setup.PreventDisposal && !setup.WeaklyReferenced)))
+                (registrator as IResolverContext)?.SingletonScope.TrackDisposableWithoutDisposalOrder(d);
         }
 
          /// <summary>
@@ -6945,8 +6952,9 @@ public static void RegisterInstanceMany(this IRegistrator registrator, Type impl
             foreach (var serviceType in serviceTypes)
                 registrator.Register(factory, serviceType, serviceKey, ifAlreadyRegistered, isStaticallyChecked: true);
 
-            if (instance is IDisposable && (setup == null || (!setup.PreventDisposal && !setup.WeaklyReferenced)))
-                (registrator as IResolverContext)?.SingletonScope.TrackDisposable(instance);
+            if (instance is IDisposable d && 
+                (setup == null || (!setup.PreventDisposal && !setup.WeaklyReferenced)))
+                (registrator as IResolverContext)?.SingletonScope.TrackDisposableWithoutDisposalOrder(d);
         }
 
         /// <summary>
@@ -6986,8 +6994,9 @@ public static void RegisterInstanceMany(this IRegistrator registrator, Type[] se
                 registrator.Register(factory, serviceType, serviceKey, ifAlreadyRegistered, isStaticallyChecked: true);
             }
 
-            if (instance is IDisposable && (setup == null || (!setup.PreventDisposal && !setup.WeaklyReferenced)))
-                (registrator as IResolverContext)?.SingletonScope.TrackDisposable(instance);
+            if (instance is IDisposable d && 
+                (setup == null || (!setup.PreventDisposal && !setup.WeaklyReferenced)))
+                (registrator as IResolverContext)?.SingletonScope.TrackDisposableWithoutDisposalOrder(d);
         }
 
         /// <summary>List of types excluded by default from RegisterMany convention.</summary>
@@ -11339,11 +11348,13 @@ object TryGetOrAddWithoutClosure(int id,
             IResolverContext resolveContext, Expression expr, bool useFec,
             Func<IResolverContext, Expression, bool, object> createValue, int disposalOrder = 0);
 
-        // todo: @perf introduce the overload WithoutDisposalOrder
         /// <summary>Tracked item will be disposed with the scope. 
         /// Smaller <paramref name="disposalOrder"/> will be disposed first.</summary>
         object TrackDisposable(object item, int disposalOrder = 0);
 
+        /// <summary>Tracked item will be disposed with the scope.</summary> 
+        T TrackDisposableWithoutDisposalOrder<T>(T disposable) where T : IDisposable;
+
         ///<summary>Sets or adds the service item directly to the scope services</summary>
         void SetOrAdd(int id, object item);
 
@@ -11683,7 +11694,7 @@ public bool TryGet(out object item, int id)
         /// <summary>Can be used to manually add service for disposal</summary>
         public object TrackDisposable(object item, int disposalOrder = 0)
         {
-            if (item is IDisposable disposable && disposable != this)
+            if (item is IDisposable disposable && !ReferenceEquals(disposable, this))
                 if (disposalOrder == 0)
                     AddUnorderedDisposable(disposable);
                 else
@@ -11694,6 +11705,18 @@ public object TrackDisposable(object item, int disposalOrder = 0)
         internal static readonly MethodInfo TrackDisposableMethod =
             typeof(IScope).GetTypeInfo().GetDeclaredMethod(nameof(IScope.TrackDisposable));
 
+        /// <summary>Tracked item will be disposed with the scope.</summary> 
+        public T TrackDisposableWithoutDisposalOrder<T>(T disposable) where T : IDisposable 
+        {
+            if (!ReferenceEquals(disposable, this)) 
+            {
+                var copy = _unorderedDisposables;
+                if (Interlocked.CompareExchange(ref _unorderedDisposables, copy.Push(disposable), copy) != copy)
+                    Ref.Swap(ref _unorderedDisposables, disposable, (x, d) => x.Push(d));
+            }
+            return disposable;
+        }
+
         ///[Obsolete("Removing because it is not used")]
         public void SetUsedInstance(Type type, FactoryDelegate factory) =>
             SetUsedInstance(RuntimeHelpers.GetHashCode(type), type, factory);
@@ -11984,7 +12007,6 @@ public Expression Apply(Request request, Expression serviceFactoryExpr)
                 serviceFactoryExpr = Convert(serviceFactoryExpr, typeof(object));
 
             var resolverContextParamExpr = FactoryDelegateCompiler.ResolverContextParamExpr;
-
             if (request.TracksTransientDisposable)
             {
                 if (ScopedOrSingleton)
@@ -12102,7 +12124,7 @@ public static object GetScopedOrSingletonViaFactoryDelegate(IResolverContext r,
         /// <summary>Tracks the Unordered disposal in the current scope or in the singleton as fallback</summary>
         [MethodImpl((MethodImplOptions)256)]
         public static object TrackScopedOrSingleton(IResolverContext r, object item) =>
-            (r.CurrentScope ?? r.SingletonScope).TrackDisposable(item);
+            item is IDisposable d ? (r.CurrentScope ?? r.SingletonScope).TrackDisposableWithoutDisposalOrder(d) : item;
 
         internal static readonly MethodInfo TrackScopedOrSingletonMethod =
             typeof(CurrentScopeReuse).GetTypeInfo().GetDeclaredMethod(nameof(TrackScopedOrSingleton));
@@ -12143,14 +12165,14 @@ public static object GetNameScopedViaFactoryDelegate(IResolverContext r,
 
         /// Subject
         public static object TrackScoped(IResolverContext r, bool throwIfNoScope, object item) =>
-            r.GetCurrentScope(throwIfNoScope)?.TrackDisposable(item);
+            item is IDisposable d ? r.GetCurrentScope(throwIfNoScope)?.TrackDisposableWithoutDisposalOrder(d) : item;
 
         internal static readonly MethodInfo TrackScopedMethod =
             typeof(CurrentScopeReuse).GetTypeInfo().GetDeclaredMethod(nameof(TrackScoped));
 
         /// Subject
         public static object TrackNameScoped(IResolverContext r, object scopeName, bool throwIfNoScope, object item) =>
-            r.GetNamedScope(scopeName, throwIfNoScope)?.TrackDisposable(item);
+            item is IDisposable d ? r.GetNamedScope(scopeName, throwIfNoScope)?.TrackDisposableWithoutDisposalOrder(d) : item;
 
         internal static readonly MethodInfo TrackNameScopedMethod =
             typeof(CurrentScopeReuse).GetTypeInfo().GetDeclaredMethod(nameof(TrackNameScoped));