aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-09-03 23:43:59 +0100
committerJustin Clark-Casey (justincc)2014-09-03 23:43:59 +0100
commit6e6512eb4a9fb9fb88d5ec7f3968598f3012b356 (patch)
treeb04e26a5ddcddb1d69535505943ce7ae5c4e6691 /OpenSim
parentminor: fix indenting from previous commit b08ab1e (diff)
downloadopensim-SC_OLD-6e6512eb4a9fb9fb88d5ec7f3968598f3012b356.zip
opensim-SC_OLD-6e6512eb4a9fb9fb88d5ec7f3968598f3012b356.tar.gz
opensim-SC_OLD-6e6512eb4a9fb9fb88d5ec7f3968598f3012b356.tar.bz2
opensim-SC_OLD-6e6512eb4a9fb9fb88d5ec7f3968598f3012b356.tar.xz
Make bulletsim thread alarm if no update for 5 seconds.
The cost is minimal (also done for scene loop) at the benefit of telling us if this thread simply stops for some reason.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSScene.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index f87c6c4..338593f 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -293,7 +293,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
293 string.Format("{0} ({1})", BulletEngineName, RegionName), 293 string.Format("{0} ({1})", BulletEngineName, RegionName),
294 ThreadPriority.Normal, 294 ThreadPriority.Normal,
295 true, 295 true,
296 false); 296 true);
297 } 297 }
298 } 298 }
299 299
@@ -861,6 +861,9 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
861 // TODO. 861 // TODO.
862 DetailLog("{0},BulletSPluginPhysicsThread,longerThanRealtime={1}", BSScene.DetailLogZero, simulationTimeVsRealtimeDifferenceMS); 862 DetailLog("{0},BulletSPluginPhysicsThread,longerThanRealtime={1}", BSScene.DetailLogZero, simulationTimeVsRealtimeDifferenceMS);
863 } 863 }
864
865 if (BSParam.UseSeparatePhysicsThread)
866 Watchdog.UpdateThread();
864 } 867 }
865 } 868 }
866 869