ntdll: Refactor logical processor info manipulation functions.
To reduce the diff in the next patch. Signed-off-by: Paul Gofman <pgofman@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
aadc1a0a80
commit
6aa437de6a
|
@ -585,10 +585,11 @@ static BOOL logical_proc_info_add_by_id( SYSTEM_LOGICAL_PROCESSOR_INFORMATION **
|
|||
DWORD *pmax_len, LOGICAL_PROCESSOR_RELATIONSHIP rel,
|
||||
DWORD id, ULONG_PTR mask )
|
||||
{
|
||||
SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *dataex;
|
||||
unsigned int ofs = 0, i;
|
||||
|
||||
if (pdata)
|
||||
{
|
||||
DWORD i;
|
||||
|
||||
for (i = 0; i < *len; i++)
|
||||
{
|
||||
if (rel == RelationProcessorPackage && (*pdata)[i].Relationship == rel && (*pdata)[i].u.Reserved[1] == id)
|
||||
|
@ -612,11 +613,8 @@ static BOOL logical_proc_info_add_by_id( SYSTEM_LOGICAL_PROCESSOR_INFORMATION **
|
|||
(*pdata)[i].u.Reserved[0] = 0;
|
||||
(*pdata)[i].u.Reserved[1] = id;
|
||||
*len = i + 1;
|
||||
return TRUE;
|
||||
}
|
||||
else
|
||||
{
|
||||
SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *dataex;
|
||||
DWORD ofs = 0;
|
||||
|
||||
while (ofs < *len)
|
||||
{
|
||||
|
@ -658,7 +656,6 @@ static BOOL logical_proc_info_add_by_id( SYSTEM_LOGICAL_PROCESSOR_INFORMATION **
|
|||
dataex->u.Processor.Reserved[1] = id;
|
||||
|
||||
*len += dataex->Size;
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
@ -667,10 +664,11 @@ static BOOL logical_proc_info_add_cache( SYSTEM_LOGICAL_PROCESSOR_INFORMATION **
|
|||
SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX **pdataex, DWORD *len,
|
||||
DWORD *pmax_len, ULONG_PTR mask, CACHE_DESCRIPTOR *cache )
|
||||
{
|
||||
SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *dataex;
|
||||
unsigned int ofs = 0, i;
|
||||
|
||||
if (pdata)
|
||||
{
|
||||
DWORD i;
|
||||
|
||||
for (i = 0; i < *len; i++)
|
||||
{
|
||||
if ((*pdata)[i].Relationship==RelationCache && (*pdata)[i].ProcessorMask==mask
|
||||
|
@ -685,11 +683,8 @@ static BOOL logical_proc_info_add_cache( SYSTEM_LOGICAL_PROCESSOR_INFORMATION **
|
|||
(*pdata)[i].ProcessorMask = mask;
|
||||
(*pdata)[i].u.Cache = *cache;
|
||||
*len = i + 1;
|
||||
return TRUE;
|
||||
}
|
||||
else
|
||||
{
|
||||
SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *dataex;
|
||||
DWORD ofs;
|
||||
|
||||
for (ofs = 0; ofs < *len; )
|
||||
{
|
||||
|
@ -718,7 +713,6 @@ static BOOL logical_proc_info_add_cache( SYSTEM_LOGICAL_PROCESSOR_INFORMATION **
|
|||
dataex->u.Cache.GroupMask.Group = 0;
|
||||
|
||||
*len += dataex->Size;
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
@ -727,6 +721,8 @@ static BOOL logical_proc_info_add_numa_node( SYSTEM_LOGICAL_PROCESSOR_INFORMATIO
|
|||
SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX **pdataex, DWORD *len,
|
||||
DWORD *pmax_len, ULONG_PTR mask, DWORD node_id )
|
||||
{
|
||||
SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *dataex;
|
||||
|
||||
if (pdata)
|
||||
{
|
||||
while (*len == *pmax_len)
|
||||
|
@ -736,10 +732,8 @@ static BOOL logical_proc_info_add_numa_node( SYSTEM_LOGICAL_PROCESSOR_INFORMATIO
|
|||
(*pdata)[*len].ProcessorMask = mask;
|
||||
(*pdata)[*len].u.NumaNode.NodeNumber = node_id;
|
||||
(*len)++;
|
||||
return TRUE;
|
||||
}
|
||||
else
|
||||
{
|
||||
SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *dataex;
|
||||
|
||||
while (*len + log_proc_ex_size_plus( sizeof(NUMA_NODE_RELATIONSHIP) ) > *pmax_len)
|
||||
{
|
||||
|
@ -755,7 +749,6 @@ static BOOL logical_proc_info_add_numa_node( SYSTEM_LOGICAL_PROCESSOR_INFORMATIO
|
|||
dataex->u.NumaNode.GroupMask.Group = 0;
|
||||
|
||||
*len += dataex->Size;
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue