Skip to content

W
wine-winehq
Commit ee706c3e authored by Witold Baryluk's avatar Witold Baryluk Committed by Alexandre Julliard
Browse files
Options

ntdll: Speed up NtQueryVirtualMemory(MemoryWorkingSetExInformation) by conditional page check.

Legends game periodically (every 30 seconds) calls this function with up to 22k virtual addresses. All but 1 of them is valid. Due to amount of queries addresses, and cost of seek+read, this causes this function to take up to about 50ms. So framerate drops from ~150 FPS to 20FPS for about a second. As far as I can see, returning 0 entries from this function, still makes Apex Legend work. But keep code correct, and optimise it by only performing pagemap read when the address is valid. This change get_working_set_ex reduces peek wall clock runtime from 57ms to 0.29ms. Tested on Linux, but similar change done for the BSD part. Signed-off-by: 's avatarWitold Baryluk <witold.baryluk@gmail.com>
parent e2a5bf75
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 12 deletions
dlls/ntdll/unix/virtual.c
View file @ ee706c3e
......@@ -4237,16 +4237,17 @@ static NTSTATUS get_working_set_ex( HANDLE process, LPCVOID addr,
BYTE vprot;
struct file_view *view;
for (i = 0; i < vmentry_count && entry == NULL; i++)
{
if (vmentries[i].kve_start <= (ULONG_PTR)p->VirtualAddress && (ULONG_PTR)p->VirtualAddress <= vmentries[i].kve_end)
entry = &vmentries[i];
}
memset( &p->VirtualAttributes, 0, sizeof(p->VirtualAttributes) );
if ((view = find_view( p->VirtualAddress, 0 )) &&
get_committed_size( view, p->VirtualAddress, &vprot, VPROT_COMMITTED ) &&
(vprot & VPROT_COMMITTED))
{
for (i = 0; i < vmentry_count && entry == NULL; i++)
{
if (vmentries[i].kve_start <= (ULONG_PTR)p->VirtualAddress && (ULONG_PTR)p->VirtualAddress <= vmentries[i].kve_end)
entry = &vmentries[i];
}
p->VirtualAttributes.Valid = !(vprot & VPROT_GUARD) && (vprot & 0x0f) && entry && entry->kve_type != KVME_TYPE_SWAP;
p->VirtualAttributes.Shared = !is_view_valloc( view );
if (p->VirtualAttributes.Shared && p->VirtualAttributes.Valid)
......@@ -4281,17 +4282,17 @@ static NTSTATUS get_working_set_ex( HANDLE process, LPCVOID addr,
memset( &p->VirtualAttributes, 0, sizeof(p->VirtualAttributes) );
/* If we don't have pagemap information, default to invalid. */
if (!f || fseek( f, ((UINT_PTR)p->VirtualAddress >> 12) * sizeof(pagemap), SEEK_SET ) == -1 ||
fread( &pagemap, sizeof(pagemap), 1, f ) != 1)
{
pagemap = 0;
}
if ((view = find_view( p->VirtualAddress, 0 )) &&
get_committed_size( view, p->VirtualAddress, &vprot, VPROT_COMMITTED ) &&
(vprot & VPROT_COMMITTED))
{
if (!f || fseek( f, ((UINT_PTR)p->VirtualAddress >> 12) * sizeof(pagemap), SEEK_SET ) == -1 ||
fread( &pagemap, sizeof(pagemap), 1, f ) != 1)
{
/* If we don't have pagemap information, default to invalid. */
pagemap = 0;
}
p->VirtualAttributes.Valid = !(vprot & VPROT_GUARD) && (vprot & 0x0f) && (pagemap >> 63);
p->VirtualAttributes.Shared = !is_view_valloc( view ) && ((pagemap >> 61) & 1);
if (p->VirtualAttributes.Shared && p->VirtualAttributes.Valid)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment