<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
</head>
<body bgcolor="#ffffff" text="#000000">
Justin Clark-Casey wrote:
<blockquote id="mid_4AE1E52A_8060109_googlemail_com"
cite="mid:4AE1E52A.8060109@googlemail.com" type="cite">
<pre wrap="">Dr Scofield wrote:
</pre>
<blockquote id="StationeryCiteGenerated_1" type="cite">
<pre wrap="">Justin Clark-Casey wrote:
</pre>
<blockquote id="StationeryCiteGenerated_2" type="cite">
<pre wrap="">This looks like a great change but could we make sure that the Author field is
filled in on git am patches? Otherwise it's going to be a bit hard to tell who
to talk to about which changes...
</pre>
</blockquote>
<pre wrap="">perhaps it would be good to have the core committer sign-off on the patch? that
way we'd know who dragged it in...
</pre>
</blockquote>
<pre wrap=""><!---->
Yes, I saw this on some of your commits (looks like the same format as Linux
kernel signoffs). I take it there's some standard git mechanism for doing this?
</pre>
</blockquote>
yes: "git --signoff --amend" once you've merge the patch on your local
system and BEFORE you do the push to master.<br>
<br>
cheers,<br>
dirk<br>
<br>
<blockquote id="mid_4AE1E52A_8060109_googlemail_com"
cite="mid:4AE1E52A.8060109@googlemail.com" type="cite">
<pre wrap="">
If no-one objects then I'd very much like to see that turned on.
</pre>
<blockquote id="StationeryCiteGenerated_3" type="cite">
<pre wrap=""> DrS
</pre>
<blockquote id="StationeryCiteGenerated_4" type="cite">
<pre wrap="">Best,
Justin
<a class="moz-txt-link-abbreviated" href="mailto:opensim-commits-bounces@lists.berlios.de">opensim-commits-bounces@lists.berlios.de</a> wrote:
</pre>
<blockquote id="StationeryCiteGenerated_5" type="cite">
<pre wrap="">The branch, master has been updated
via 71c9291 Inconsistent locking of SenseRepeaters in Script Engine.
from b0923e0 Fix a glitch in a ROBUST message
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 71c929137f48a0a7d97dbc866cbe2b12319aa40b
Author: unknown <a class="moz-txt-link-rfc2396E" href="mailto:Administrator@.(none)"><Administrator@.(none)></a>
Date: Fri Oct 23 03:52:49 2009 -0700
Inconsistent locking of SenseRepeaters in Script Engine.
When I attempt to 'save oar' on a region with thousands of scripts with timers, I get a NullReferenceException every time. The problem comes from inconsistent locking in SensorRepeat.cs of the SenseRepeaters List. It is iterated and modified in many places and these places are all wrapped in a lock except in the GetSerializationData(). This is the function throwing the exception because an item in the list becomes null during iteration.
The attached patch locks SenseRepeatListLock in GetSerializationData()
71c929137f48a0a7d97dbc866cbe2b12319aa40b
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
index ee01c3c..b75a2e4 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
@@ -516,16 +516,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
{
List<Object> data = new List<Object>();
- foreach (SenseRepeatClass ts in SenseRepeaters)
+ lock (SenseRepeatListLock)
{
- if (ts.itemID == itemID)
+ foreach (SenseRepeatClass ts in SenseRepeaters)
{
- data.Add(ts.interval);
- data.Add(ts.name);
- data.Add(ts.keyID);
- data.Add(ts.type);
- data.Add(ts.range);
- data.Add(ts.arc);
+ if (ts.itemID == itemID)
+ {
+ data.Add(ts.interval);
+ data.Add(ts.name);
+ data.Add(ts.keyID);
+ data.Add(ts.type);
+ data.Add(ts.range);
+ data.Add(ts.arc);
+ }
}
}
return data.ToArray();
-----------------------------------------------------------------------
Summary of changes:
.../Api/Implementation/Plugins/SensorRepeat.cs | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
_______________________________________________
Opensim-commits mailing list
<a class="moz-txt-link-abbreviated" href="mailto:Opensim-commits@lists.berlios.de">Opensim-commits@lists.berlios.de</a>
<a class="moz-txt-link-freetext" href="https://lists.berlios.de/mailman/listinfo/opensim-commits">https://lists.berlios.de/mailman/listinfo/opensim-commits</a>
</pre>
</blockquote>
</blockquote>
<pre wrap="">
</pre>
</blockquote>
<pre wrap=""><!---->
</pre>
</blockquote>
<br>
<br>
<pre class="moz-signature" cols="80">--
dr dirk husemann ---- math & computer science ---- ibm zurich research lab
RL: <a class="moz-txt-link-abbreviated" href="mailto:hud@zurich.ibm.com">hud@zurich.ibm.com</a> - +41 44 724 8573 - <a class="moz-txt-link-freetext" href="http://www.zurich.ibm.com/~hud/">http://www.zurich.ibm.com/~hud/</a>
SL: <a class="moz-txt-link-abbreviated" href="mailto:drscofield@xyzzyxyzzy.net">drscofield@xyzzyxyzzy.net</a> --------------------- <a class="moz-txt-link-freetext" href="http://xyzzyxyzzy.net/">http://xyzzyxyzzy.net/</a></pre>
</body>
</html>