Label all threadpool calls being made in core OpenSimulator. This is to add problem diagnosis.

"show threadpool calls" now also returns named (labelled), anonymous (unlabelled) and total call stats.

2 files changed, 10 insertions, 5 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index bfa3b9a..9db5309 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -226,7 +226,10 @@ namespace OpenSim.Region.Framework.Scenes
                 // We must take a copy here since handle is acts like a reference when used in an iterator.
                 // This leads to race conditions if directly passed to SendCloseChildAgent with more than one neighbour region.
                 ulong handleCopy = handle;
-                Util.FireAndForget((o) => { SendCloseChildAgent(agentID, handleCopy, auth_code); });
+                Util.FireAndForget(
+                    o => SendCloseChildAgent(agentID, handleCopy, auth_code), 
+                    null, 
+                    "SceneCommunicationService.SendCloseChildAgentConnections");
             }
         }
        
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 9481f71..1d234e2 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1235,7 +1235,8 @@ namespace OpenSim.Region.Framework.Scenes
                             string.Format("Rez attachments for {0} in {1}", Name, Scene.Name), 
                             null);
                     else
-                        Util.FireAndForget(o => Scene.AttachmentsModule.RezAttachments(this));
+                        Util.FireAndForget(
+                            o => Scene.AttachmentsModule.RezAttachments(this), null, "ScenePresence.RezAttachmentsOnLogin");
                 }
             }
             else
@@ -1338,7 +1339,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                 UseFakeGroupTitle = false;
                 SendAvatarDataToAllClients(false);
-            });
+            }, null, "Scenepresence.ForceViewersUpdateName");
         }
 
         public int GetStateSource()
@@ -3645,7 +3646,8 @@ namespace OpenSim.Region.Framework.Scenes
                 agentpos.CopyFrom(cadu, ControllingClient.SessionId);
 
                 // Let's get this out of the update loop
-                Util.FireAndForget(delegate { m_scene.SendOutChildAgentUpdates(agentpos, this); });
+                Util.FireAndForget(
+                    o => m_scene.SendOutChildAgentUpdates(agentpos, this), null, "ScenePresence.SendOutChildAgentUpdates");
             }
         }
 
@@ -4515,7 +4517,7 @@ namespace OpenSim.Region.Framework.Scenes
                         }
                     }
                 }
-            });
+            }, null, "ScenePresence.SendScriptEventToAttachments");
         }
 
         /// <summary>