use interlocked increment

stephen-hawley · stephen-hawley · commit 20c0fe902760 · 2024-04-01T10:41:39.000-04:00
diff --git a/SwiftReflector/Naming/SequentialNamer.cs b/SwiftReflector/Naming/SequentialNamer.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.Threading;
 using SwiftReflector.Demangling;
 
 #nullable enable
@@ -7,7 +8,6 @@ namespace SwiftReflector.Naming {
 	public class SequentialNamer {
 		int current;
 		string prefix;
-		object nameLock = new object ();
 
 		public SequentialNamer (string prefix, int start = 0)
 		{
@@ -17,9 +17,7 @@ public SequentialNamer (string prefix, int start = 0)
 
 		public string SafeName (string name)
 		{
-			lock (nameLock) {
-				return CSSafeNaming.SafeIdentifier ($"{prefix}{name}{current++}");
-			}
+			return CSSafeNaming.SafeIdentifier ($"{prefix}{name}{Interlocked.Increment (ref current)}");
 		}
 	}
 
@@ -32,7 +30,7 @@ public string SafeName (TLFunction tlf)
 		{
 			var module = tlf.Module.Name ?? "NoModule";
 			var name = tlf.Name.Name ?? "Anonymous";
-			return Name ($"_{module}_{name}");			
+			return SafeName ($"_{module}_{name}");			
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+using System.Threading;`
`2`	`3`	`using SwiftReflector.Demangling;`
`3`	`4`
`4`	`5`	`#nullable enable`
`@@ -7,7 +8,6 @@ namespace SwiftReflector.Naming {`
`7`	`8`	`public class SequentialNamer {`
`8`	`9`	`int current;`
`9`	`10`	`string prefix;`
`10`		`- object nameLock = new object ();`
`11`	`11`
`12`	`12`	`public SequentialNamer (string prefix, int start = 0)`
`13`	`13`	`{`
`@@ -17,9 +17,7 @@ public SequentialNamer (string prefix, int start = 0)`
`17`	`17`
`18`	`18`	`public string SafeName (string name)`
`19`	`19`	`{`
`20`		`- lock (nameLock) {`
`21`		`- return CSSafeNaming.SafeIdentifier ($"{prefix}{name}{current++}");`
`22`		`- }`
	`20`	`+ return CSSafeNaming.SafeIdentifier ($"{prefix}{name}{Interlocked.Increment (ref current)}");`
`23`	`21`	`}`
`24`	`22`	`}`
`25`	`23`
`@@ -32,7 +30,7 @@ public string SafeName (TLFunction tlf)`
`32`	`30`	`{`
`33`	`31`	`var module = tlf.Module.Name ?? "NoModule";`
`34`	`32`	`var name = tlf.Name.Name ?? "Anonymous";`
`35`		`- return Name ($"_{module}_{name}");`
	`33`	`+ return SafeName ($"_{module}_{name}");`
`36`	`34`	`}`
`37`	`35`	`}`
`38`	`36`	`}`