Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

don't always aquite lock when calling RuntimeInformation.OSArchitecture and OSArchitecture.ProcessArchitecture #39196

Merged
merged 8 commits into from
Jul 14, 2020
Merged

don't always aquite lock when calling RuntimeInformation.OSArchitecture and OSArchitecture.ProcessArchitecture #39196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2e7899a
don't always aquite lock when calling RuntimeInformation.OSArchitectu…
adamsitnik Jul 13, 2020
8bfba8b
make the arch fields volatile
adamsitnik Jul 13, 2020
aac655d
1 lock should be enough
adamsitnik Jul 13, 2020
02f254f
proper fix of the Unix code
adamsitnik Jul 13, 2020
49e0b8a
apply [SuppressGCTransition]
adamsitnik Jul 13, 2020
d5351ff
minor refactor
adamsitnik Jul 13, 2020
89696d2
simplify it further
adamsitnik Jul 13, 2020
deb1d80
remove the locks enitrely
adamsitnik Jul 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/libraries/Common/src/Interop/Unix/System.Native/Interop.GetOSArchitecture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ internal static partial class Interop
{
internal static partial class Sys
{
[SuppressGCTransition]
[DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_GetOSArchitecture")]
internal static extern int GetOSArchitecture();
}
Expand Down
1 change: 1 addition & 0 deletions src/libraries/Common/src/Interop/Unix/System.Native/Interop.GetProcessArchitecture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ internal static partial class Interop
{
internal static partial class Sys
{
[SuppressGCTransition]
[DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_GetProcessArchitecture")]
internal static extern int GetProcessArchitecture();
}
Expand Down
81 changes: 14 additions & 67 deletions ...ormation/src/System/Runtime/InteropServices/RuntimeInformation/RuntimeInformation.Unix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,8 @@ namespace System.Runtime.InteropServices
{
public static partial class RuntimeInformation
{
private static readonly object s_osLock = new object();
private static readonly object s_processLock = new object();
private static string? s_osPlatformName;
private static string? s_osDescription;
private static Architecture? s_osArch;
private static Architecture? s_processArch;

public static bool IsOSPlatform(OSPlatform osPlatform)
{
Expand All @@ -22,73 +18,24 @@ public static bool IsOSPlatform(OSPlatform osPlatform)

public static string OSDescription => s_osDescription ??= Interop.Sys.GetUnixVersion();

public static Architecture OSArchitecture
{
get
{
lock (s_osLock)
{
if (null == s_osArch)
{
Interop.Sys.ProcessorArchitecture arch = (Interop.Sys.ProcessorArchitecture)Interop.Sys.GetOSArchitecture();
switch (arch)
{
case Interop.Sys.ProcessorArchitecture.ARM:
s_osArch = Architecture.Arm;
break;

case Interop.Sys.ProcessorArchitecture.x64:
s_osArch = Architecture.X64;
break;
public static Architecture OSArchitecture { get; } = Map((Interop.Sys.ProcessorArchitecture)Interop.Sys.GetOSArchitecture());

case Interop.Sys.ProcessorArchitecture.x86:
s_osArch = Architecture.X86;
break;
public static Architecture ProcessArchitecture { get; } = Map((Interop.Sys.ProcessorArchitecture)Interop.Sys.GetProcessArchitecture());

case Interop.Sys.ProcessorArchitecture.ARM64:
s_osArch = Architecture.Arm64;
break;
}
}
}

Debug.Assert(s_osArch != null);
return s_osArch.Value;
}
}

public static Architecture ProcessArchitecture
private static Architecture Map(Interop.Sys.ProcessorArchitecture arch)
{
get
switch (arch)
{
lock (s_processLock)
{
if (null == s_processArch)
{
Interop.Sys.ProcessorArchitecture arch = (Interop.Sys.ProcessorArchitecture)Interop.Sys.GetProcessArchitecture();
switch (arch)
{
case Interop.Sys.ProcessorArchitecture.ARM:
s_processArch = Architecture.Arm;
break;

case Interop.Sys.ProcessorArchitecture.x64:
s_processArch = Architecture.X64;
break;

case Interop.Sys.ProcessorArchitecture.x86:
s_processArch = Architecture.X86;
break;

case Interop.Sys.ProcessorArchitecture.ARM64:
s_processArch = Architecture.Arm64;
break;
}
}
}

Debug.Assert(s_processArch != null);
return s_processArch.Value;
case Interop.Sys.ProcessorArchitecture.ARM:
return Architecture.Arm;
case Interop.Sys.ProcessorArchitecture.x64:
return Architecture.X64;
case Interop.Sys.ProcessorArchitecture.ARM64:
return Architecture.Arm64;
case Interop.Sys.ProcessorArchitecture.x86:
default:
Debug.Assert(arch == Interop.Sys.ProcessorArchitecture.x86, "Unidentified Architecture");
return Architecture.X86;
}
}
}
Expand Down
86 changes: 34 additions & 52 deletions ...ation/src/System/Runtime/InteropServices/RuntimeInformation/RuntimeInformation.Windows.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@ namespace System.Runtime.InteropServices
public static partial class RuntimeInformation
{
private static string? s_osDescription;
private static readonly object s_osLock = new object();
private static readonly object s_processLock = new object();
private static Architecture? s_osArch;
private static Architecture? s_processArch;
private static volatile int s_osArch = -1;
private static volatile int s_processArch = -1;

public static bool IsOSPlatform(OSPlatform osPlatform)
{
Expand Down Expand Up @@ -42,68 +40,52 @@ public static Architecture OSArchitecture
{
get
{
lock (s_osLock)
{
if (null == s_osArch)
{
Interop.Kernel32.SYSTEM_INFO sysInfo;
Interop.Kernel32.GetNativeSystemInfo(out sysInfo);
Debug.Assert(sizeof(Architecture) == sizeof(int));

switch ((Interop.Kernel32.ProcessorArchitecture)sysInfo.wProcessorArchitecture)
{
case Interop.Kernel32.ProcessorArchitecture.Processor_Architecture_ARM64:
s_osArch = Architecture.Arm64;
break;
case Interop.Kernel32.ProcessorArchitecture.Processor_Architecture_ARM:
s_osArch = Architecture.Arm;
break;
case Interop.Kernel32.ProcessorArchitecture.Processor_Architecture_AMD64:
s_osArch = Architecture.X64;
break;
case Interop.Kernel32.ProcessorArchitecture.Processor_Architecture_INTEL:
s_osArch = Architecture.X86;
break;
}
int osArch = s_osArch;

}
if (osArch == -1)
{
Interop.Kernel32.GetNativeSystemInfo(out Interop.Kernel32.SYSTEM_INFO sysInfo);
osArch = s_osArch = (int)Map((Interop.Kernel32.ProcessorArchitecture)sysInfo.wProcessorArchitecture);
}

Debug.Assert(s_osArch != null);
return s_osArch.Value;
return (Architecture)osArch;
}
}

public static Architecture ProcessArchitecture
{
get
{
lock (s_processLock)
{
if (null == s_processArch)
{
Interop.Kernel32.SYSTEM_INFO sysInfo;
Interop.Kernel32.GetSystemInfo(out sysInfo);
Debug.Assert(sizeof(Architecture) == sizeof(int));

switch ((Interop.Kernel32.ProcessorArchitecture)sysInfo.wProcessorArchitecture)
{
case Interop.Kernel32.ProcessorArchitecture.Processor_Architecture_ARM64:
s_processArch = Architecture.Arm64;
break;
case Interop.Kernel32.ProcessorArchitecture.Processor_Architecture_ARM:
s_processArch = Architecture.Arm;
break;
case Interop.Kernel32.ProcessorArchitecture.Processor_Architecture_AMD64:
s_processArch = Architecture.X64;
break;
case Interop.Kernel32.ProcessorArchitecture.Processor_Architecture_INTEL:
s_processArch = Architecture.X86;
break;
}
}
int processArch = s_processArch;

if (processArch == -1)
{
Interop.Kernel32.GetSystemInfo(out Interop.Kernel32.SYSTEM_INFO sysInfo);
processArch = s_processArch = (int)Map((Interop.Kernel32.ProcessorArchitecture)sysInfo.wProcessorArchitecture);
}

Debug.Assert(s_processArch != null);
return s_processArch.Value;
return (Architecture)processArch;
}
}

private static Architecture Map(Interop.Kernel32.ProcessorArchitecture processorArchitecture)
{
switch (processorArchitecture)
{
case Interop.Kernel32.ProcessorArchitecture.Processor_Architecture_ARM64:
return Architecture.Arm64;
case Interop.Kernel32.ProcessorArchitecture.Processor_Architecture_ARM:
return Architecture.Arm;
case Interop.Kernel32.ProcessorArchitecture.Processor_Architecture_AMD64:
return Architecture.X64;
case Interop.Kernel32.ProcessorArchitecture.Processor_Architecture_INTEL:
default:
Debug.Assert(processorArchitecture == Interop.Kernel32.ProcessorArchitecture.Processor_Architecture_INTEL, "Unidentified Architecture");
return Architecture.X86;
}
}
}
Expand Down