reduce allocations in RemoteSystemDaemon ActorPath resolution (#3842)

akkadotnet · Jul 26, 2019 · 14e5e84 · 14e5e84
1 parent 754e6b8
commit 14e5e84
Showing 1 changed file with 9 additions and 28 deletions.
diff --git a/src/core/Akka.Remote/RemoteSystemDaemon.cs b/src/core/Akka.Remote/RemoteSystemDaemon.cs
@@ -304,45 +304,26 @@ private void HandleDaemonMsgCreate(DaemonMsgCreate message)
         /// <returns>ActorRef.</returns>
         public override IActorRef GetChild(IEnumerable<string> name)
         {
-            var elements = name.ToArray();
-            var path = elements.Join("/");
+            var path = name.Join("/");
             var n = 0;
             while (true)
             {
                 var nameAndUid = ActorCell.SplitNameAndUid(path);
-                var child = GetChild(nameAndUid.Name);
-                if (child == null)
+                if (TryGetChild(nameAndUid.Name, out var child))
                 {
-                    var last = path.LastIndexOf("/", StringComparison.Ordinal);
-                    if (last == -1)
+                    if (nameAndUid.Uid != ActorCell.UndefinedUid && nameAndUid.Uid != child.Path.Uid)
                         return Nobody.Instance;
-                    path = path.Substring(0, last);
-                    n++;
-                    continue;
+                    return n == 0 ? child : child.GetChild(name.TakeRight(n));
                 }
-                if (nameAndUid.Uid != ActorCell.UndefinedUid && nameAndUid.Uid != child.Path.Uid)
-                    return Nobody.Instance;
-
-                return n == 0 ? child : child.GetChild(elements.TakeRight(n));
-            }
-        }
-
 
-        private IInternalActorRef GetChild(string name)
-        {
-            var nameAndUid = ActorCell.SplitNameAndUid(name);
-            IInternalActorRef child;
-            if (TryGetChild(nameAndUid.Name, out child))
-            {
-                if (nameAndUid.Uid != ActorCell.UndefinedUid && nameAndUid.Uid != child.Path.Uid)
-                {
-                    return ActorRefs.Nobody;
-                }
+                var last = path.LastIndexOf("/", StringComparison.Ordinal);
+                if (last == -1)
+                    return Nobody.Instance;
+                path = path.Substring(0, last);
+                n++;
             }
-            return child;
         }
 
-
         private bool AddChildParentNeedsWatch(IActorRef parent, IActorRef child)
         {
             const bool weDontHaveTailRecursion = true;