diff options
author | Justin Clark-Casey (justincc) | 2014-09-03 23:31:45 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-09-03 23:35:18 +0100 |
commit | b08ab1e3754da4a2855bb77fca91dce01e9c2fae (patch) | |
tree | bd988acd43103f8b38fa7d6c1ccdef2c5c95f821 /OpenSim/Region | |
parent | Cleanup some unused code and configuration entries (diff) | |
download | opensim-SC_OLD-b08ab1e3754da4a2855bb77fca91dce01e9c2fae.zip opensim-SC_OLD-b08ab1e3754da4a2855bb77fca91dce01e9c2fae.tar.gz opensim-SC_OLD-b08ab1e3754da4a2855bb77fca91dce01e9c2fae.tar.bz2 opensim-SC_OLD-b08ab1e3754da4a2855bb77fca91dce01e9c2fae.tar.xz |
If BulletSim is running on its own threads, start this thread via the thread watchdog.
This allows us to see the presence of the permanent thread via the "show threads" console comand.
Also adds the region name to the thread name.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs index f7317c0..d3b2ad7 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |||
@@ -32,6 +32,7 @@ using System.Runtime.InteropServices; | |||
32 | using System.Text; | 32 | using System.Text; |
33 | using System.Threading; | 33 | using System.Threading; |
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | using OpenSim.Framework.Monitoring; | ||
35 | using OpenSim.Region.Framework; | 36 | using OpenSim.Region.Framework; |
36 | using OpenSim.Region.CoreModules; | 37 | using OpenSim.Region.CoreModules; |
37 | using Logging = OpenSim.Region.CoreModules.Framework.Statistics.Logging; | 38 | using Logging = OpenSim.Region.CoreModules.Framework.Statistics.Logging; |
@@ -286,9 +287,13 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters | |||
286 | if (BSParam.UseSeparatePhysicsThread) | 287 | if (BSParam.UseSeparatePhysicsThread) |
287 | { | 288 | { |
288 | // The physics simulation should happen independently of the heartbeat loop | 289 | // The physics simulation should happen independently of the heartbeat loop |
289 | m_physicsThread = new Thread(BulletSPluginPhysicsThread); | 290 | m_physicsThread |
290 | m_physicsThread.Name = BulletEngineName; | 291 | = Watchdog.StartThread( |
291 | m_physicsThread.Start(); | 292 | BulletSPluginPhysicsThread, |
293 | string.Format("{0} ({1})", BulletEngineName, RegionName), | ||
294 | ThreadPriority.Normal, | ||
295 | true, | ||
296 | false); | ||
292 | } | 297 | } |
293 | } | 298 | } |
294 | 299 | ||