From d582db6132ef7bea8b15e7a9f0dd64400d43b517 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Tue, 2 Sep 2014 23:35:03 +0100 Subject: [PATCH 01/12] Fix recent regression from 473c5594 where camera started to judder on moving vehicles. Other parts of OpenSimulator are relying on SP.Velocity == 0 for vehicles. So add and use SP.GetWorldVelocity() instead when we need vehicle velocity, along the same lines as existing SP.GetWorldRotation() --- .../Region/Framework/Scenes/ScenePresence.cs | 40 ++++++++++++------- .../Shared/Api/Implementation/LSL_Api.cs | 6 +-- 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index e0b76407c7..f2a636afc2 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -608,8 +608,11 @@ namespace OpenSim.Region.Framework.Scenes } /// - /// Current velocity of the avatar. + /// Velocity of the avatar with respect to its local reference frame. /// + /// + /// So when sat on a vehicle this will be 0. To get velocity with respect to the world use GetWorldVelocity() + /// public override Vector3 Velocity { get @@ -622,10 +625,10 @@ namespace OpenSim.Region.Framework.Scenes // "[SCENE PRESENCE]: Set velocity {0} for {1} in {2} via getting Velocity!", // m_velocity, Name, Scene.RegionInfo.RegionName); } - else if (ParentPart != null) - { - return ParentPart.ParentGroup.Velocity; - } +// else if (ParentPart != null) +// { +// return ParentPart.ParentGroup.Velocity; +// } return m_velocity; } @@ -749,25 +752,32 @@ namespace OpenSim.Region.Framework.Scenes } /// - /// Gets the world rotation of this presence. + /// Get rotation relative to the world. /// - /// - /// Unlike Rotation, this returns the world rotation no matter whether the avatar is sitting on a prim or not. - /// /// public Quaternion GetWorldRotation() { - if (IsSatOnObject) - { - SceneObjectPart sitPart = ParentPart; + SceneObjectPart sitPart = ParentPart; - if (sitPart != null) - return sitPart.GetWorldRotation() * Rotation; - } + if (sitPart != null) + return sitPart.GetWorldRotation() * Rotation; return Rotation; } + /// + /// Get velocity relative to the world. + /// + public Vector3 GetWorldVelocity() + { + SceneObjectPart sitPart = ParentPart; + + if (sitPart != null) + return sitPart.ParentGroup.Velocity; + + return Velocity; + } + public void AdjustKnownSeeds() { Dictionary seeds; diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 5d7fc9db0d..7c384b268f 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -2560,7 +2560,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (m_host.ParentGroup.IsAttachment) { ScenePresence avatar = m_host.ParentGroup.Scene.GetScenePresence(m_host.ParentGroup.AttachedAvatar); - vel = avatar.Velocity; + vel = avatar.GetWorldVelocity(); } else { @@ -11221,7 +11221,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api ret.Add(new LSL_Rotation(av.GetWorldRotation())); break; case ScriptBaseClass.OBJECT_VELOCITY: - ret.Add(new LSL_Vector(av.Velocity.X, av.Velocity.Y, av.Velocity.Z)); + ret.Add(new LSL_Vector(av.GetWorldVelocity())); break; case ScriptBaseClass.OBJECT_OWNER: ret.Add(new LSL_String(id)); @@ -11342,7 +11342,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api ScenePresence sp = World.GetScenePresence(obj.ParentGroup.AttachedAvatar); if (sp != null) - vel = sp.Velocity; + vel = sp.GetWorldVelocity(); } else { From ac866a1c46583e50e74aefad0a1bc6de720a7211 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Wed, 3 Sep 2014 00:25:56 +0100 Subject: [PATCH 02/12] Add [EntityTransfer] AllowAvatarCrossing setting to determine whether avatars are allowed to cross regions at all. Defaults to true. For test purposes. --- OpenSim/Region/Framework/Scenes/Scene.cs | 17 +++++++++++++++++ .../Region/Framework/Scenes/ScenePresence.cs | 3 ++- bin/OpenSimDefaults.ini | 3 +++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 18376c317e..5f0dbd7497 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -224,6 +224,12 @@ namespace OpenSim.Region.Framework.Scenes public bool m_clampPrimSize; public bool m_trustBinaries; public bool m_allowScriptCrossings = true; + + /// + /// Can avatars cross from and to this region? + /// + public bool AllowAvatarCrossing { get; set; } + public bool m_useFlySlow; public bool m_useTrashOnDelete = true; @@ -1023,6 +1029,12 @@ namespace OpenSim.Region.Framework.Scenes #endregion Region Config + IConfig entityTransferConfig = m_config.Configs["EntityTransfer"]; + if (entityTransferConfig != null) + { + AllowAvatarCrossing = entityTransferConfig.GetBoolean("AllowAvatarCrossing", AllowAvatarCrossing); + } + #region Interest Management IConfig interestConfig = m_config.Configs["InterestManagement"]; @@ -1091,6 +1103,8 @@ namespace OpenSim.Region.Framework.Scenes CollidablePrims = true; PhysicsEnabled = true; + AllowAvatarCrossing = true; + PeriodicBackup = true; UseBackup = true; @@ -5613,6 +5627,9 @@ namespace OpenSim.Region.Framework.Scenes return true; } + if (!AllowAvatarCrossing && !viaTeleport) + return false; + // FIXME: Root agent count is currently known to be inaccurate. This forces a recount before we check. // However, the long term fix is to make sure root agent count is always accurate. m_sceneGraph.RecalculateStats(); diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index f2a636afc2..3c37de84ec 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -3226,7 +3226,8 @@ namespace OpenSim.Region.Framework.Scenes m_lastVelocity = Velocity; } - CheckForBorderCrossing(); + if (Scene.AllowAvatarCrossing) + CheckForBorderCrossing(); CheckForSignificantMovement(); // sends update to the modules. } diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 348aaa2bf7..dce01ebce9 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -711,6 +711,9 @@ ; max_distance = 65535 + ; Allow avatars to cross into and out of the region. + AllowAvatarCrossing = true + ; Minimum user level required for HyperGrid teleports LevelHGTeleport = 0 From e8ca900ef837f7d4faa7e9cc4dd9e02947a4d46f Mon Sep 17 00:00:00 2001 From: BlueWall Date: Wed, 3 Sep 2014 12:57:29 -0400 Subject: [PATCH 03/12] Move the 32 bit launchers as discussed at OpenSimulator Office Hour 9//2/14 http://opensimulator.org/wiki/Chat_log_from_the_meeting_on_2014-09-02. --- share/32BitLaunch/OpenSim.32BitLaunch.exe | Bin 0 -> 5632 bytes .../OpenSim.32BitLaunch/Program.cs | 59 ++++++++++++++++ .../Properties/AssemblyInfo.cs | 63 ++++++++++++++++++ share/32BitLaunch/README | 5 ++ share/32BitLaunch/Robust.32BitLaunch.exe | Bin 0 -> 5632 bytes .../32BitLaunch/Robust.32BitLaunch/Program.cs | 60 +++++++++++++++++ .../Properties/AssemblyInfo.cs | 63 ++++++++++++++++++ .../Robust.32BitLaunch/Robust.32BitLaunch.sln | 20 ++++++ 8 files changed, 270 insertions(+) create mode 100755 share/32BitLaunch/OpenSim.32BitLaunch.exe create mode 100644 share/32BitLaunch/OpenSim.32BitLaunch/Program.cs create mode 100644 share/32BitLaunch/OpenSim.32BitLaunch/Properties/AssemblyInfo.cs create mode 100644 share/32BitLaunch/README create mode 100755 share/32BitLaunch/Robust.32BitLaunch.exe create mode 100644 share/32BitLaunch/Robust.32BitLaunch/Program.cs create mode 100644 share/32BitLaunch/Robust.32BitLaunch/Properties/AssemblyInfo.cs create mode 100644 share/32BitLaunch/Robust.32BitLaunch/Robust.32BitLaunch.sln diff --git a/share/32BitLaunch/OpenSim.32BitLaunch.exe b/share/32BitLaunch/OpenSim.32BitLaunch.exe new file mode 100755 index 0000000000000000000000000000000000000000..62c14af416b823e435f976ca503ed51974f3c899 GIT binary patch literal 5632 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 literal 0 HcmV?d00001 diff --git a/share/32BitLaunch/Robust.32BitLaunch/Program.cs b/share/32BitLaunch/Robust.32BitLaunch/Program.cs new file mode 100644 index 0000000000..490414c456 --- /dev/null +++ b/share/32BitLaunch/Robust.32BitLaunch/Program.cs @@ -0,0 +1,60 @@ +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSimulator Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +using System; +using log4net; + +namespace Robust._32BitLaunch +{ + class Program + { + static void Main(string[] args) + { + log4net.Config.XmlConfigurator.Configure(); + + System.Console.WriteLine("32-bit OpenSim executor"); + System.Console.WriteLine("-----------------------"); + System.Console.WriteLine(""); + System.Console.WriteLine("This application is compiled for 32-bit CPU and will run under WOW32 or similar."); + System.Console.WriteLine("All 64-bit incompatibilities should be gone."); + System.Console.WriteLine(""); + System.Threading.Thread.Sleep(300); + try + { + global::OpenSim.Server.OpenSimServer.Main(args); + } + catch (Exception ex) + { + System.Console.WriteLine("OpenSim threw an exception:"); + System.Console.WriteLine(ex.ToString()); + System.Console.WriteLine(""); + System.Console.WriteLine("Application will now terminate!"); + System.Console.WriteLine(""); + } + } + } +} diff --git a/share/32BitLaunch/Robust.32BitLaunch/Properties/AssemblyInfo.cs b/share/32BitLaunch/Robust.32BitLaunch/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..cf80f472ef --- /dev/null +++ b/share/32BitLaunch/Robust.32BitLaunch/Properties/AssemblyInfo.cs @@ -0,0 +1,63 @@ +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSimulator Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Robust.32BitLaunch")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("http://opensimulator.org")] +[assembly: AssemblyProduct("Robust.32BitLaunch")] +[assembly: AssemblyCopyright("Copyright (c) 2008")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("5072e919-46ab-47e6-8a63-08108324ccdf")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("0.6.3.*")] +[assembly: AssemblyVersion("0.6.3.*")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/share/32BitLaunch/Robust.32BitLaunch/Robust.32BitLaunch.sln b/share/32BitLaunch/Robust.32BitLaunch/Robust.32BitLaunch.sln new file mode 100644 index 0000000000..a48a2d34fc --- /dev/null +++ b/share/32BitLaunch/Robust.32BitLaunch/Robust.32BitLaunch.sln @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual C# Express 2010 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.32BitLaunch", "Robust.32BitLaunch.csproj", "{595D67F3-B413-4A43-8568-5B5930E3B31D}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {595D67F3-B413-4A43-8568-5B5930E3B31D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {595D67F3-B413-4A43-8568-5B5930E3B31D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {595D67F3-B413-4A43-8568-5B5930E3B31D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {595D67F3-B413-4A43-8568-5B5930E3B31D}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal From 3e5bc75f89998e9b1bba5e7e5f4042e883afb522 Mon Sep 17 00:00:00 2001 From: BlueWall Date: Wed, 3 Sep 2014 13:00:09 -0400 Subject: [PATCH 04/12] Remove the 32 bit launchers as discussed at OpenSimulator Office Hour 9//2/14 http://opensimulator.org/wiki/Chat_log_from_the_meeting_on_2014-09-02. Find the binaries, sources and README in ./share/32BitLaunch if needed. --- .../OpenSim.32BitLaunch.csproj | 97 ----------------- OpenSim/Tools/OpenSim.32BitLaunch/Program.cs | 59 ----------- .../Properties/AssemblyInfo.cs | 63 ----------- OpenSim/Tools/Robust.32BitLaunch/Program.cs | 60 ----------- .../Properties/AssemblyInfo.cs | 63 ----------- .../Robust.32BitLaunch.csproj | 99 ------------------ .../Robust.32BitLaunch/Robust.32BitLaunch.sln | 20 ---- bin/OpenSim.32BitLaunch.exe | Bin 5632 -> 0 bytes bin/Robust.32BitLaunch.exe | Bin 5632 -> 0 bytes 9 files changed, 461 deletions(-) delete mode 100644 OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj delete mode 100644 OpenSim/Tools/OpenSim.32BitLaunch/Program.cs delete mode 100644 OpenSim/Tools/OpenSim.32BitLaunch/Properties/AssemblyInfo.cs delete mode 100644 OpenSim/Tools/Robust.32BitLaunch/Program.cs delete mode 100644 OpenSim/Tools/Robust.32BitLaunch/Properties/AssemblyInfo.cs delete mode 100644 OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj delete mode 100644 OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.sln delete mode 100755 bin/OpenSim.32BitLaunch.exe delete mode 100755 bin/Robust.32BitLaunch.exe diff --git a/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj b/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj deleted file mode 100644 index 4625c330e0..0000000000 --- a/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj +++ /dev/null @@ -1,97 +0,0 @@ - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {595D67F3-B413-4A43-8568-5B5930E3B31D} - Exe - Properties - OpenSim._32BitLaunch - OpenSim.32BitLaunch - v4.0 - 512 - - - - - 3.5 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - true - full - false - ..\..\..\bin\ - DEBUG;TRACE - prompt - 4 - x86 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - False - .exe - ..\..\..\bin\OpenSim.exe - - - - - - - - - - False - Microsoft .NET Framework 4 %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - false - - - False - Windows Installer 3.1 - true - - - - - \ No newline at end of file diff --git a/OpenSim/Tools/OpenSim.32BitLaunch/Program.cs b/OpenSim/Tools/OpenSim.32BitLaunch/Program.cs deleted file mode 100644 index 52806b81bf..0000000000 --- a/OpenSim/Tools/OpenSim.32BitLaunch/Program.cs +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (c) Contributors, http://opensimulator.org/ - * See CONTRIBUTORS.TXT for a full list of copyright holders. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the OpenSimulator Project nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -using System; - -namespace OpenSim._32BitLaunch -{ - class Program - { - static void Main(string[] args) - { - log4net.Config.XmlConfigurator.Configure(); - - System.Console.WriteLine("32-bit OpenSim executor"); - System.Console.WriteLine("-----------------------"); - System.Console.WriteLine(""); - System.Console.WriteLine("This application is compiled for 32-bit CPU and will run under WOW32 or similar."); - System.Console.WriteLine("All 64-bit incompatibilities should be gone."); - System.Console.WriteLine(""); - System.Threading.Thread.Sleep(300); - try - { - global::OpenSim.Application.Main(args); - } - catch (Exception ex) - { - System.Console.WriteLine("OpenSim threw an exception:"); - System.Console.WriteLine(ex.ToString()); - System.Console.WriteLine(""); - System.Console.WriteLine("Application will now terminate!"); - System.Console.WriteLine(""); - } - } - } -} diff --git a/OpenSim/Tools/OpenSim.32BitLaunch/Properties/AssemblyInfo.cs b/OpenSim/Tools/OpenSim.32BitLaunch/Properties/AssemblyInfo.cs deleted file mode 100644 index e81870f92f..0000000000 --- a/OpenSim/Tools/OpenSim.32BitLaunch/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) Contributors, http://opensimulator.org/ - * See CONTRIBUTORS.TXT for a full list of copyright holders. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the OpenSimulator Project nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("OpenSim.32BitLaunch")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("http://opensimulator.org")] -[assembly: AssemblyProduct("OpenSim.32BitLaunch")] -[assembly: AssemblyCopyright("Copyright (c) 2008")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("5072e919-46ab-47e6-8a63-08108324ccdf")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("0.6.3.*")] -[assembly: AssemblyVersion("0.6.3.*")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/OpenSim/Tools/Robust.32BitLaunch/Program.cs b/OpenSim/Tools/Robust.32BitLaunch/Program.cs deleted file mode 100644 index 490414c456..0000000000 --- a/OpenSim/Tools/Robust.32BitLaunch/Program.cs +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) Contributors, http://opensimulator.org/ - * See CONTRIBUTORS.TXT for a full list of copyright holders. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the OpenSimulator Project nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -using System; -using log4net; - -namespace Robust._32BitLaunch -{ - class Program - { - static void Main(string[] args) - { - log4net.Config.XmlConfigurator.Configure(); - - System.Console.WriteLine("32-bit OpenSim executor"); - System.Console.WriteLine("-----------------------"); - System.Console.WriteLine(""); - System.Console.WriteLine("This application is compiled for 32-bit CPU and will run under WOW32 or similar."); - System.Console.WriteLine("All 64-bit incompatibilities should be gone."); - System.Console.WriteLine(""); - System.Threading.Thread.Sleep(300); - try - { - global::OpenSim.Server.OpenSimServer.Main(args); - } - catch (Exception ex) - { - System.Console.WriteLine("OpenSim threw an exception:"); - System.Console.WriteLine(ex.ToString()); - System.Console.WriteLine(""); - System.Console.WriteLine("Application will now terminate!"); - System.Console.WriteLine(""); - } - } - } -} diff --git a/OpenSim/Tools/Robust.32BitLaunch/Properties/AssemblyInfo.cs b/OpenSim/Tools/Robust.32BitLaunch/Properties/AssemblyInfo.cs deleted file mode 100644 index cf80f472ef..0000000000 --- a/OpenSim/Tools/Robust.32BitLaunch/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) Contributors, http://opensimulator.org/ - * See CONTRIBUTORS.TXT for a full list of copyright holders. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the OpenSimulator Project nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Robust.32BitLaunch")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("http://opensimulator.org")] -[assembly: AssemblyProduct("Robust.32BitLaunch")] -[assembly: AssemblyCopyright("Copyright (c) 2008")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("5072e919-46ab-47e6-8a63-08108324ccdf")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("0.6.3.*")] -[assembly: AssemblyVersion("0.6.3.*")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj b/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj deleted file mode 100644 index 9618c08500..0000000000 --- a/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj +++ /dev/null @@ -1,99 +0,0 @@ - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {595D67F3-B413-4A43-8568-5B5930E3B31D} - Exe - Properties - Robust._32BitLaunch - Robust.32BitLaunch - v4.0 - 512 - - - - - 3.5 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - true - full - false - ..\..\..\bin\ - DEBUG;TRACE - prompt - 4 - x86 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - False - ..\..\..\bin\log4net.dll - - - False - ..\..\..\bin\Robust.exe - - - - - - - - - - False - Microsoft .NET Framework 4 %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - false - - - False - Windows Installer 3.1 - true - - - - - \ No newline at end of file diff --git a/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.sln b/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.sln deleted file mode 100644 index a48a2d34fc..0000000000 --- a/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C# Express 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.32BitLaunch", "Robust.32BitLaunch.csproj", "{595D67F3-B413-4A43-8568-5B5930E3B31D}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {595D67F3-B413-4A43-8568-5B5930E3B31D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {595D67F3-B413-4A43-8568-5B5930E3B31D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {595D67F3-B413-4A43-8568-5B5930E3B31D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {595D67F3-B413-4A43-8568-5B5930E3B31D}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/bin/OpenSim.32BitLaunch.exe b/bin/OpenSim.32BitLaunch.exe deleted file mode 100755 index 62c14af416b823e435f976ca503ed51974f3c899..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5632 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 From 40c579addf86b4dff23cf67062a879e95e89bf51 Mon Sep 17 00:00:00 2001 From: Kevin Cozens Date: Wed, 3 Sep 2014 14:14:26 -0400 Subject: [PATCH 05/12] Don't show the ScrLPS data twice in the WebStats based statistics page. --- OpenSim/Region/UserStatistics/SimStatsAJAX.cs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/OpenSim/Region/UserStatistics/SimStatsAJAX.cs b/OpenSim/Region/UserStatistics/SimStatsAJAX.cs index ad848a1330..06d9e91449 100644 --- a/OpenSim/Region/UserStatistics/SimStatsAJAX.cs +++ b/OpenSim/Region/UserStatistics/SimStatsAJAX.cs @@ -162,9 +162,6 @@ namespace OpenSim.Region.UserStatistics output.Append("OthrMS"); HTMLUtil.TD_C(ref output); HTMLUtil.TD_O(ref output, TDHeaderClass); - output.Append("ScrLPS"); - HTMLUtil.TD_C(ref output); - HTMLUtil.TD_O(ref output, TDHeaderClass); output.Append("OutPPS"); HTMLUtil.TD_C(ref output); HTMLUtil.TD_O(ref output, TDHeaderClass); @@ -194,9 +191,6 @@ namespace OpenSim.Region.UserStatistics output.Append(sdata.OtherFrameTime); HTMLUtil.TD_C(ref output); HTMLUtil.TD_O(ref output, TDDataClassCenter); - output.Append(sdata.ScriptLinesPerSecond); - HTMLUtil.TD_C(ref output); - HTMLUtil.TD_O(ref output, TDDataClassCenter); output.Append(sdata.OutPacketsPerSecond); HTMLUtil.TD_C(ref output); HTMLUtil.TD_O(ref output, TDDataClassCenter); From e19d1ecce8a5e1ca921323fa9e4f92ebfba73725 Mon Sep 17 00:00:00 2001 From: BlueWall Date: Wed, 3 Sep 2014 17:00:03 -0400 Subject: [PATCH 06/12] Cleanup some unused code and configuration entries --- OpenSim/Services/LLLoginService/LLLoginResponse.cs | 2 +- OpenSim/Services/LLLoginService/LLLoginService.cs | 6 +----- bin/Robust.HG.ini.example | 10 ---------- bin/Robust.ini.example | 10 ---------- 4 files changed, 2 insertions(+), 26 deletions(-) diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs index e67ecf05fa..27376cc69d 100644 --- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs +++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs @@ -227,7 +227,7 @@ namespace OpenSim.Services.LLLoginService public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo, GridRegion destination, List invSkel, FriendInfo[] friendsList, ILibraryService libService, string where, string startlocation, Vector3 position, Vector3 lookAt, List gestures, string message, - GridRegion home, IPEndPoint clientIP, string mapTileURL, string profileURL, string openIDURL, string searchURL, string currency, + GridRegion home, IPEndPoint clientIP, string mapTileURL, string searchURL, string currency, string DSTZone, string destinationsURL, string avatarsURL, string classifiedFee) : this() { diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 0ad9f9284a..80596525d1 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs @@ -77,8 +77,6 @@ namespace OpenSim.Services.LLLoginService protected string m_GatekeeperURL; protected bool m_AllowRemoteSetLoginLevel; protected string m_MapTileURL; - protected string m_ProfileURL; - protected string m_OpenIDURL; protected string m_SearchURL; protected string m_Currency; protected string m_ClassifiedFee; @@ -119,8 +117,6 @@ namespace OpenSim.Services.LLLoginService m_GatekeeperURL = Util.GetConfigVarFromSections(config, "GatekeeperURI", new string[] { "Startup", "Hypergrid", "LoginService" }, String.Empty); m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty); - m_ProfileURL = m_LoginServerConfig.GetString("ProfileServerURL", string.Empty); - m_OpenIDURL = m_LoginServerConfig.GetString("OpenIDServerURL", String.Empty); m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty); m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty); m_ClassifiedFee = m_LoginServerConfig.GetString("ClassifiedFee", string.Empty); @@ -498,7 +494,7 @@ namespace OpenSim.Services.LLLoginService = new LLLoginResponse( account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, - m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency, m_DSTZone, + m_MapTileURL, m_SearchURL, m_Currency, m_DSTZone, m_DestinationGuide, m_AvatarPicker, m_ClassifiedFee); m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName); diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index 684c019175..edcbec3a74 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example @@ -372,16 +372,6 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset ; Url to search service ; SearchURL = "http://127.0.0.1:8002/"; - ; For V2/3 Web Profiles - ; Work in progress: The ProfileServerURL/OpenIDServerURL are - ; being used in a development viewer as support for webprofiles - ; is being developed across the componets - ; - ; ProfileServerURL = "http://127.0.0.1/profiles/[AGENT_NAME]" - ; - ; For V2/V3 webapp authentication SSO - ; OpenIDServerURL = "http://127.0.0.1/openid/openidserver/" - ; For V3 destination guide ; DestinationGuide = "http://127.0.0.1/guide" diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index eafab64c4a..6686c3f7a2 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example @@ -331,16 +331,6 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto ; Url to search service ; SearchURL = "http://127.0.0.1:8002/"; - ; For V2/3 Web Profiles - ; Work in progress: The ProfileServerURL/OpenIDServerURL are - ; being used in a development viewer as support for webprofiles - ; is being developed across the componets - ; - ; ProfileServerURL = "http://127.0.0.1/profiles/[AGENT_NAME]" - ; - ; For V2/V3 webapp authentication SSO - ; OpenIDServerURL = "http://127.0.0.1/openid/openidserver/" - ; For V3 destination guide ; DestinationGuide = "http://127.0.0.1/guide" From b08ab1e3754da4a2855bb77fca91dce01e9c2fae Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Wed, 3 Sep 2014 23:31:45 +0100 Subject: [PATCH 07/12] 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. --- OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 11 ++++++++--- prebuild.xml | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs index f7317c01fe..d3b2ad701c 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs @@ -32,6 +32,7 @@ using System.Runtime.InteropServices; using System.Text; using System.Threading; using OpenSim.Framework; +using OpenSim.Framework.Monitoring; using OpenSim.Region.Framework; using OpenSim.Region.CoreModules; using Logging = OpenSim.Region.CoreModules.Framework.Statistics.Logging; @@ -286,9 +287,13 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters if (BSParam.UseSeparatePhysicsThread) { // The physics simulation should happen independently of the heartbeat loop - m_physicsThread = new Thread(BulletSPluginPhysicsThread); - m_physicsThread.Name = BulletEngineName; - m_physicsThread.Start(); + m_physicsThread + = Watchdog.StartThread( + BulletSPluginPhysicsThread, + string.Format("{0} ({1})", BulletEngineName, RegionName), + ThreadPriority.Normal, + true, + false); } } diff --git a/prebuild.xml b/prebuild.xml index 006f545fd4..ba18a2c50f 100644 --- a/prebuild.xml +++ b/prebuild.xml @@ -1746,6 +1746,7 @@ + From 29400538b7bb9505ab2873d90680d9ad4cb101d0 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Wed, 3 Sep 2014 23:37:20 +0100 Subject: [PATCH 08/12] minor: fix indenting from previous commit b08ab1e --- OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs index d3b2ad701c..f87c6c4c64 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs @@ -287,13 +287,13 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters if (BSParam.UseSeparatePhysicsThread) { // The physics simulation should happen independently of the heartbeat loop - m_physicsThread - = Watchdog.StartThread( - BulletSPluginPhysicsThread, - string.Format("{0} ({1})", BulletEngineName, RegionName), - ThreadPriority.Normal, - true, - false); + m_physicsThread + = Watchdog.StartThread( + BulletSPluginPhysicsThread, + string.Format("{0} ({1})", BulletEngineName, RegionName), + ThreadPriority.Normal, + true, + false); } } From 6e6512eb4a9fb9fb88d5ec7f3968598f3012b356 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Wed, 3 Sep 2014 23:43:59 +0100 Subject: [PATCH 09/12] 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. --- OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs index f87c6c4c64..338593f75e 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 string.Format("{0} ({1})", BulletEngineName, RegionName), ThreadPriority.Normal, true, - false); + true); } } @@ -861,6 +861,9 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters // TODO. DetailLog("{0},BulletSPluginPhysicsThread,longerThanRealtime={1}", BSScene.DetailLogZero, simulationTimeVsRealtimeDifferenceMS); } + + if (BSParam.UseSeparatePhysicsThread) + Watchdog.UpdateThread(); } } From 4b04d22899e954831c4bf0904b5c2d9adacf650a Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Wed, 3 Sep 2014 23:53:04 +0100 Subject: [PATCH 10/12] Don't need to check separate physics status in bulletsim update since that method is only run for an indepndent thread anyway. Also remove bulletsim monitored thread from watchdog on shutdown. --- OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs index 338593f75e..a46c241db3 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs @@ -862,9 +862,10 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters DetailLog("{0},BulletSPluginPhysicsThread,longerThanRealtime={1}", BSScene.DetailLogZero, simulationTimeVsRealtimeDifferenceMS); } - if (BSParam.UseSeparatePhysicsThread) - Watchdog.UpdateThread(); + Watchdog.UpdateThread(); } + + Watchdog.RemoveThread(); } #endregion // Simulation From 0692ebfbc6bfbbae428d79cb824622cea297fbaf Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Thu, 4 Sep 2014 00:00:51 +0100 Subject: [PATCH 11/12] Start long-lived thread in IRCConnector via watchdog rather than indepedently, so that it can be seen in "show threads" and stats --- .../Avatar/Chat/IRCConnector.cs | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs index f5bd44db5f..bdd07e0a99 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs @@ -109,10 +109,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat internal int m_resetk = 0; - // Working threads - - private Thread m_listener = null; - private Object msyncConnect = new Object(); internal bool m_randomizeNick = true; // add random suffix @@ -363,10 +359,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat m_log.InfoFormat("[IRC-Connector-{0}]: Connected to {1}:{2}", idn, m_server, m_port); - m_listener = new Thread(new ThreadStart(ListenerRun)); - m_listener.Name = "IRCConnectorListenerThread"; - m_listener.IsBackground = true; - m_listener.Start(); + Watchdog.StartThread(ListenerRun, "IRCConnectionListenerThread", ThreadPriority.Normal, true, false); // This is the message order recommended by RFC 2812 if (m_password != null) @@ -510,21 +503,20 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat { while (m_enabled && m_connected) { - if ((inputLine = m_reader.ReadLine()) == null) throw new Exception("Listener input socket closed"); + Watchdog.UpdateThread(); + // m_log.Info("[IRCConnector]: " + inputLine); if (inputLine.Contains("PRIVMSG")) { - Dictionary data = ExtractMsg(inputLine); // Any chat ??? if (data != null) { - OSChatMessage c = new OSChatMessage(); c.Message = data["msg"]; c.Type = ChatTypeEnum.Region; @@ -540,9 +532,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat c.Message = String.Format("/me {0}", c.Message.Substring(8, c.Message.Length - 9)); ChannelState.OSChat(this, c, false); - } - } else { @@ -562,6 +552,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat if (m_enabled && (m_resetk == resetk)) Reconnect(); + + Watchdog.RemoveThread(); } private Regex RE = new Regex(@":(?[\w-]*)!(?\S*) PRIVMSG (?\S+) :(?.*)", From 73e20b7f5f3c6b8b45233cc04e5c6abce0d6b0a2 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Thu, 4 Sep 2014 00:22:30 +0100 Subject: [PATCH 12/12] For processing outbound http requests in the XMLRPCModule, start the thread through Watchdog for monitoring and stat purposes. --- .../Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs index c6e05b1f6a..d7ea906d8c 100644 --- a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs @@ -36,6 +36,7 @@ using Nini.Config; using Nwc.XmlRpc; using OpenMetaverse; using OpenSim.Framework; +using OpenSim.Framework.Monitoring; using OpenSim.Framework.Servers; using OpenSim.Framework.Servers.HttpServer; using OpenSim.Region.Framework.Interfaces; @@ -656,12 +657,8 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC public void Process() { - httpThread = new Thread(SendRequest); - httpThread.Name = "HttpRequestThread"; - httpThread.Priority = ThreadPriority.BelowNormal; - httpThread.IsBackground = true; _finished = false; - httpThread.Start(); + Watchdog.StartThread(SendRequest, "HttpRequestThread", ThreadPriority.BelowNormal, true, false); } /* @@ -733,6 +730,8 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC } _finished = true; + + Watchdog.RemoveThread(); } public void Stop()