diff options
author | Justin Clark-Casey (justincc) | 2014-11-04 17:21:22 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-11-25 23:23:10 +0000 |
commit | f54c70741b4008c242aa8f088be7551bfe41ac1f (patch) | |
tree | ebd89f57749eed1a247ef6f013395e1a65539f60 /OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | |
parent | Add naive implementation of controlled incoming HG attachments to manage load. (diff) | |
download | opensim-SC_OLD-f54c70741b4008c242aa8f088be7551bfe41ac1f.zip opensim-SC_OLD-f54c70741b4008c242aa8f088be7551bfe41ac1f.tar.gz opensim-SC_OLD-f54c70741b4008c242aa8f088be7551bfe41ac1f.tar.bz2 opensim-SC_OLD-f54c70741b4008c242aa8f088be7551bfe41ac1f.tar.xz |
Add "show threadpool calls active" console debug command.
This shows named threadpool calls (excluding timer and network calls) that are currently queued or running.
Also shows total of labelled and any anonymous calls.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs index 519c18b..522de79 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | |||
@@ -110,6 +110,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
110 | } | 110 | } |
111 | } | 111 | } |
112 | 112 | ||
113 | /// <summary> | ||
114 | /// Used for processing analysis of incoming attachments in a controlled fashion. | ||
115 | /// </summary> | ||
116 | private HGIncomingSceneObjectEngine m_incomingSceneObjectEngine; | ||
117 | |||
113 | #region ISharedRegionModule | 118 | #region ISharedRegionModule |
114 | 119 | ||
115 | public override string Name | 120 | public override string Name |
@@ -155,6 +160,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
155 | scene.RegisterModuleInterface<IUserAgentVerificationModule>(this); | 160 | scene.RegisterModuleInterface<IUserAgentVerificationModule>(this); |
156 | //scene.EventManager.OnIncomingSceneObject += OnIncomingSceneObject; | 161 | //scene.EventManager.OnIncomingSceneObject += OnIncomingSceneObject; |
157 | 162 | ||
163 | m_incomingSceneObjectEngine = new HGIncomingSceneObjectEngine(scene.Name); | ||
158 | m_incomingSceneObjectEngine.Start(); | 164 | m_incomingSceneObjectEngine.Start(); |
159 | } | 165 | } |
160 | } | 166 | } |
@@ -540,8 +546,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
540 | } | 546 | } |
541 | } | 547 | } |
542 | 548 | ||
543 | private HGIncomingSceneObjectEngine m_incomingSceneObjectEngine = new HGIncomingSceneObjectEngine(); | ||
544 | |||
545 | public override bool HandleIncomingSceneObject(SceneObjectGroup so, Vector3 newPosition) | 549 | public override bool HandleIncomingSceneObject(SceneObjectGroup so, Vector3 newPosition) |
546 | { | 550 | { |
547 | // FIXME: We must make it so that we can use SOG.IsAttachment here. At the moment it is always null! | 551 | // FIXME: We must make it so that we can use SOG.IsAttachment here. At the moment it is always null! |