system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-01 09:53:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

ntdll: Use pread in NtQueryVirtualMemory(MemoryWorkingSetExInformation).

Browse source 
1 syscall instead of 2 syscalls. Faster and simpler code.
This commit is contained in:
Witold Baryluk 2022-09-15 17:21:36 +00:00 committed by Alexandre Julliard
parent 96a4a2b4c4
commit ffab9d9747
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
dlls/ntdll/unix/virtual.c
View file

@ -4203,7 +4203,7 @@ static NTSTATUS get_working_set_ex( HANDLE process, LPCVOID addr,
MEMORY_WORKING_SET_EX_INFORMATION *info, MEMORY_WORKING_SET_EX_INFORMATION *info,
SIZE_T len, SIZE_T *res_len ) SIZE_T len, SIZE_T *res_len )
{ {
FILE *f = NULL; int pagemap_fd;
MEMORY_WORKING_SET_EX_INFORMATION *p; MEMORY_WORKING_SET_EX_INFORMATION *p;
sigset_t sigset; sigset_t sigset;
@ -4266,8 +4266,8 @@ static NTSTATUS get_working_set_ex( HANDLE process, LPCVOID addr,
procstat_close( pstat ); procstat_close( pstat );
} }
#else #else
f = fopen( "/proc/self/pagemap", "rb" ); pagemap_fd = open( "/proc/self/pagemap", O_RDONLY, 0 );
if (!f) if (pagemap_fd == -1)
{ {
static int once; static int once;
if (!once++) WARN( "unable to open /proc/self/pagemap\n" ); if (!once++) WARN( "unable to open /proc/self/pagemap\n" );
@ -4286,8 +4286,8 @@ static NTSTATUS get_working_set_ex( HANDLE process, LPCVOID addr,
get_committed_size( view, p->VirtualAddress, &vprot, VPROT_COMMITTED ) && get_committed_size( view, p->VirtualAddress, &vprot, VPROT_COMMITTED ) &&
(vprot & VPROT_COMMITTED)) (vprot & VPROT_COMMITTED))
{ {
if (!f || fseek( f, ((UINT_PTR)p->VirtualAddress >> page_shift) * sizeof(pagemap), SEEK_SET ) == -1 || if (pagemap_fd == -1 ||
fread( &pagemap, sizeof(pagemap), 1, f ) != 1) pread( pagemap_fd, &pagemap, sizeof(pagemap), ((UINT_PTR)p->VirtualAddress >> page_shift) * sizeof(pagemap) ) != sizeof(pagemap))
{ {
/* If we don't have pagemap information, default to invalid. */ /* If we don't have pagemap information, default to invalid. */
pagemap = 0; pagemap = 0;
@ -4304,8 +4304,8 @@ static NTSTATUS get_working_set_ex( HANDLE process, LPCVOID addr,
server_leave_uninterrupted_section( &virtual_mutex, &sigset ); server_leave_uninterrupted_section( &virtual_mutex, &sigset );
#endif #endif
if (f) if (pagemap_fd != -1)
fclose( f ); close( pagemap_fd );
if (res_len) if (res_len)
*res_len = (UINT_PTR)p - (UINT_PTR)info; *res_len = (UINT_PTR)p - (UINT_PTR)info;
return STATUS_SUCCESS; return STATUS_SUCCESS;