2008-09-02 Sebastien Pouliot <sebastien@ximian.com>

* DoubleCheckLockingRule.cs: Current rule logic does not apply for Fx 2.0 and later runtimes, so we limit it for 1.x. A new rule (with shared logic) should be done to handle 2.0 specific stuff. svn path=/branches/mono-2-0/mono-tools/; revision=112080
mono · Sep 2, 2008 · 1161831 · 1161831
1 parent 7816707
commit 1161831
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/gendarme/rules/Gendarme.Rules.Concurrency/ChangeLog b/gendarme/rules/Gendarme.Rules.Concurrency/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-02  Sebastien Pouliot  <sebastien@ximian.com>
+
+	* DoubleCheckLockingRule.cs: Current rule logic does not apply for
+	Fx 2.0 and later runtimes, so we limit it for 1.x. A new rule (with
+	shared logic) should be done to handle 2.0 specific stuff.
+
 2008-08-13  Sebastien Pouliot  <sebastien@ximian.com>
 
 	* DoNotLockOnThisOrTypesRule.cs: Use TraceBack rocks. Don't ignore

diff --git a/gendarme/rules/Gendarme.Rules.Concurrency/DoubleCheckLockingRule.cs b/gendarme/rules/Gendarme.Rules.Concurrency/DoubleCheckLockingRule.cs
@@ -40,8 +40,6 @@
 
 namespace Gendarme.Rules.Concurrency {
 
-	// FIXME?: see http://groups.google.com/group/gendarme/browse_thread/thread/b46d1ddc3a2d8fb9#msg_9b9c2989cedb4c34
-
 	// note: the rule only report a single double-lock per method
 
 	[Problem ("This method uses the unreliable double-check locking technique.")]
@@ -55,6 +53,13 @@ public override void Initialize (IRunner runner)
 		{
 			base.Initialize (runner);
 
+			// we only want to run this on assemblies that use either the
+			// 1.0 or 1.1 runtime - since the memory model, at that time,
+			// was not entirely safe for double check locks
+			Runner.AnalyzeAssembly += delegate (object o, RunnerEventArgs e) {
+				Active = (e.CurrentAssembly.Runtime < TargetRuntime.NET_2_0);
+			};
+
 			// is this module using Monitor.Enter ? (lock in c#)
 			// if not then this rule does not need to be executed for the module
 			// note: mscorlib.dll is an exception since it defines, not refer, System.Threading.Monitor
@@ -91,7 +96,7 @@ public RuleResult CheckMethod (MethodDefinition method)
 							if (insn.Offset >= monitorOffsetList.Peek ())
 								continue;
 
-							Runner.Report (method, insn, Severity.Medium, Confidence.High, String.Empty);
+							Runner.Report (method, insn, Severity.Medium, Confidence.High);
 							return RuleResult.Failure;
 						}
 					}