sean-m
/
Vanara
mirror of https://github.com/dahall/Vanara.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Completed unit tests and corrections to systemtopologyapi.h

pull/83/head
David Hall 2019-07-16 21:30:16 -06:00
parent c25b34a445
commit 4bb12ff369
3 changed files with 43 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
PInvoke/Kernel32/SystemTopologyApi.cs
View File

@ -21,8 +21,8 @@ namespace Vanara.PInvoke
/// <param name="Node">The node number.</param>
/// <param name="ProcessorMask">
/// <para>
/// A pointer to a <c>GROUP_AFFINITY</c> structure that receives the processor mask for the specified node. A processor mask is a bit vector in which
/// each bit represents a processor and whether it is in the node.
/// A pointer to a <c>GROUP_AFFINITY</c> structure that receives the processor mask for the specified node. A processor mask is a bit
/// vector in which each bit represents a processor and whether it is in the node.
/// </para>
/// <para>If the specified node has no processors configured, the <c>Mask</c> member is zero and the <c>Group</c> member is undefined.</para>
/// </param>
@ -50,20 +50,23 @@ namespace Vanara.PInvoke
public static extern bool GetNumaProximityNodeEx(uint ProximityId, out ushort NodeNumber);
/// <summary>Represents a processor group-specific affinity, such as the affinity of a thread.</summary>
// typedef struct _GROUP_AFFINITY { KAFFINITY Mask; WORD Group; WORD Reserved[3];} GROUP_AFFINITY, *PGROUP_AFFINITY;
// https://msdn.microsoft.com/en-us/library/windows/desktop/dd405500(v=vs.85).aspx
// typedef struct _GROUP_AFFINITY { KAFFINITY Mask; WORD Group; WORD Reserved[3];} GROUP_AFFINITY, *PGROUP_AFFINITY; https://msdn.microsoft.com/en-us/library/windows/desktop/dd405500(v=vs.85).aspx
[PInvokeData("WinNT.h", MSDNShortId = "dd405500")]
[StructLayout(LayoutKind.Sequential, Pack = 4)]
public struct GROUP_AFFINITY
{
/// <summary>A bitmap that specifies the affinity for zero or more processors within the specified group.</summary>
public UIntPtr Mask;
/// <summary>The processor group number.</summary>
public ushort Group;
/// <summary>This member is reserved.</summary>
private ushort Reserved1;
/// <summary>This member is reserved.</summary>
private ushort Reserved2;
/// <summary>This member is reserved.</summary>
private ushort Reserved3;
}

1
UnitTests/PInvoke/Kernel32/Kernel32.csproj
View File

@ -48,6 +48,7 @@
<Compile Include="AppModelTests.cs" />
<Compile Include="InterlockedApiTests.cs" />
<Compile Include="InteropServices\SafeLocalHandleTests.cs" />
<Compile Include="SystemTopologyTests.cs" />
<Compile Include="SynchApiTests.cs" />
<Compile Include="StringApiSetTests.cs" />
<Compile Include="RtlSupportApiTests.cs" />

35
UnitTests/PInvoke/Kernel32/SystemTopologyTests.cs Normal file
View File

@ -0,0 +1,35 @@
using NUnit.Framework;
using System;
using System.Runtime.InteropServices;
using System.Text;
using Vanara.InteropServices;
using static Vanara.PInvoke.AdvApi32;
using static Vanara.PInvoke.Kernel32;
namespace Vanara.PInvoke.Tests
{
[TestFixture]
public class SystemTopologyTests
{
[Test]
public void GetNumaHighestNodeNumberTest()
{
Assert.That(GetNumaHighestNodeNumber(out var highNode), ResultIs.Successful);
Assert.That(highNode, Is.InRange(0, Environment.ProcessorCount - 1));
}
[Test]
public void GetNumaNodeProcessorMaskExTest()
{
GetNumaHighestNodeNumber(out var n);
Assert.That(GetNumaNodeProcessorMaskEx((ushort)n, out var ga), ResultIs.Successful);
Assert.That(ga.Group, Is.InRange(0, Environment.ProcessorCount - 1));
}
[Test]
public void GetNumaProximityNodeExTest()
{
Assert.That(GetNumaProximityNodeEx(0, out var n), ResultIs.Successful);
}
}
}