diff options
author | Justin Clark-Casey (justincc) | 2014-07-14 20:08:11 +0100 |
---|---|---|
committer | Justin Clark-Casey | 2014-08-02 00:54:42 +0100 |
commit | 539ffb776919e0285b052f7268893a37d387deac (patch) | |
tree | 82ccfb5207c380a7310469b822139094a02ff130 /OpenSim/Region/ScriptEngine | |
parent | Call RemoveScriptInstance when removing from inventory (diff) | |
download | opensim-SC_OLD-539ffb776919e0285b052f7268893a37d387deac.zip opensim-SC_OLD-539ffb776919e0285b052f7268893a37d387deac.tar.gz opensim-SC_OLD-539ffb776919e0285b052f7268893a37d387deac.tar.bz2 opensim-SC_OLD-539ffb776919e0285b052f7268893a37d387deac.tar.xz |
Use thread-safe version of .NET Random as the SDK class is not thread-safe.
As per http://msdn.microsoft.com/en-us/library/system.random%28v=vs.100%29.aspx, the .NET Random class is not thread-safe.
If called by multiple threads at once, methods may return 0.
Except for llRand(), other OpenSimulator code did not lock before calling a shared Random instance.
This commit adds a ThreadSafeRandom class that extends Random but does internal locking so that it is thread-safe.
This change is invisible to existing callers and the explicit locking in the llFrand() implementation is now redundant.
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 7d8821c..991107e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -544,10 +544,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
544 | public LSL_Float llFrand(double mag) | 544 | public LSL_Float llFrand(double mag) |
545 | { | 545 | { |
546 | m_host.AddScriptLPS(1); | 546 | m_host.AddScriptLPS(1); |
547 | lock (Util.RandomClass) | 547 | |
548 | { | 548 | return Util.RandomClass.NextDouble() * mag; |
549 | return Util.RandomClass.NextDouble() * mag; | ||
550 | } | ||
551 | } | 549 | } |
552 | 550 | ||
553 | public LSL_Integer llFloor(double f) | 551 | public LSL_Integer llFloor(double f) |