ntdll: Use sysinfo to report correct number of physical pages.
Sebastian Lackner
sebastian at fds-team.de
Thu Jul 7 22:40:22 CDT 2016
From: Michael Müller <michael at fds-team.de>
Signed-off-by: Michael Müller <michael at fds-team.de>
Signed-off-by: Sebastian Lackner <sebastian at fds-team.de>
---
configure.ac | 1 +
dlls/ntdll/virtual.c | 14 ++++++++++++++
2 files changed, 15 insertions(+)
diff --git a/configure.ac b/configure.ac
index e7c1dd1..e8c743e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -494,6 +494,7 @@ AC_CHECK_HEADERS(\
sys/statvfs.h \
sys/strtio.h \
sys/syscall.h \
+ sys/sysinfo.h \
sys/tihdr.h \
sys/time.h \
sys/timeout.h \
diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
index 5c43d26..2e63b78 100644
--- a/dlls/ntdll/virtual.c
+++ b/dlls/ntdll/virtual.c
@@ -38,6 +38,9 @@
#ifdef HAVE_SYS_MMAN_H
# include <sys/mman.h>
#endif
+#ifdef HAVE_SYS_SYSINFO_H
+# include <sys/sysinfo.h>
+#endif
#ifdef HAVE_VALGRIND_VALGRIND_H
# include <valgrind/valgrind.h>
#endif
@@ -1356,11 +1359,22 @@ void virtual_init_threading(void)
*/
void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info )
{
+#ifdef HAVE_SYS_SYSINFO_H
+ struct sysinfo sinfo;
+#endif
+
info->unknown = 0;
info->KeMaximumIncrement = 0; /* FIXME */
info->PageSize = page_size;
info->MmLowestPhysicalPage = 1;
info->MmHighestPhysicalPage = 0x7fffffff / page_size;
+#ifdef HAVE_SYS_SYSINFO_H
+ if (!sysinfo(&sinfo))
+ {
+ ULONG64 total = (ULONG64)sinfo.totalram * sinfo.mem_unit;
+ info->MmHighestPhysicalPage = max(1, total / page_size);
+ }
+#endif
info->MmNumberOfPhysicalPages = info->MmHighestPhysicalPage - info->MmLowestPhysicalPage;
info->AllocationGranularity = get_mask(0) + 1;
info->LowestUserAddress = (void *)0x10000;
--
2.8.0
More information about the wine-patches
mailing list