aboutsummaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorLasse Collin <lasse.collin@tukaani.org>2009-06-27 22:57:15 +0300
committerLasse Collin <lasse.collin@tukaani.org>2009-06-27 22:57:15 +0300
commit73f560ee5fa064992b76688d9472baf139432540 (patch)
tree8ed2a89568f383fb3dae8965ace24be11ff23d02 /src/common
parentMoved the Windows resource files outside the windows directory (diff)
downloadxz-73f560ee5fa064992b76688d9472baf139432540.tar.xz
Make physmem() work on Cygwin 1.5 and older.
Diffstat (limited to 'src/common')
-rw-r--r--src/common/physmem.h77
1 files changed, 40 insertions, 37 deletions
diff --git a/src/common/physmem.h b/src/common/physmem.h
index 25806512..63482c6c 100644
--- a/src/common/physmem.h
+++ b/src/common/physmem.h
@@ -13,7 +13,16 @@
#ifndef PHYSMEM_H
#define PHYSMEM_H
-#if defined(HAVE_PHYSMEM_SYSCONF)
+// Test for Windows first, because we want to use Windows-specific code
+// on Cygwin, which also has memory information available via sysconf(), but
+// on Cygwin 1.5 and older it gives wrong results (from our point of view).
+#if defined(_WIN32) || defined(__CYGWIN__)
+# ifndef _WIN32_WINNT
+# define _WIN32_WINNT 0x0500
+# endif
+# include <windows.h>
+
+#elif defined(HAVE_PHYSMEM_SYSCONF)
# include <unistd.h>
#elif defined(HAVE_PHYSMEM_SYSCTL)
@@ -27,12 +36,6 @@
#elif defined(HAVE_PHYSMEM_SYSINFO)
# include <sys/sysinfo.h>
-#elif defined(_WIN32)
-# ifndef _WIN32_WINNT
-# define _WIN32_WINNT 0x0500
-# endif
-# include <windows.h>
-
#elif defined(__DJGPP__)
# include <dpmi.h>
#endif
@@ -47,7 +50,36 @@ physmem(void)
{
uint64_t ret = 0;
-#if defined(HAVE_PHYSMEM_SYSCONF)
+#if defined(_WIN32) || defined(__CYGWIN__)
+ if ((GetVersion() & 0xFF) >= 5) {
+ // Windows 2000 and later have GlobalMemoryStatusEx() which
+ // supports reporting values greater than 4 GiB. To keep the
+ // code working also on older Windows versions, use
+ // GlobalMemoryStatusEx() conditionally.
+ HMODULE kernel32 = GetModuleHandle("kernel32.dll");
+ if (kernel32 != NULL) {
+ BOOL (WINAPI *gmse)(LPMEMORYSTATUSEX) = GetProcAddress(
+ kernel32, "GlobalMemoryStatusEx");
+ if (gmse != NULL) {
+ MEMORYSTATUSEX meminfo;
+ meminfo.dwLength = sizeof(meminfo);
+ if (gmse(&meminfo))
+ ret = meminfo.ullTotalPhys;
+ }
+ }
+ }
+
+ if (ret == 0) {
+ // GlobalMemoryStatus() is supported by Windows 95 and later,
+ // so it is fine to link against it unconditionally. Note that
+ // GlobalMemoryStatus() has no return value.
+ MEMORYSTATUS meminfo;
+ meminfo.dwLength = sizeof(meminfo);
+ GlobalMemoryStatus(&meminfo);
+ ret = meminfo.dwTotalPhys;
+ }
+
+#elif defined(HAVE_PHYSMEM_SYSCONF)
const long pagesize = sysconf(_SC_PAGESIZE);
const long pages = sysconf(_SC_PHYS_PAGES);
if (pagesize != -1 || pages != -1)
@@ -87,35 +119,6 @@ physmem(void)
if (sysinfo(&si) == 0)
ret = (uint64_t)(si.totalram) * si.mem_unit;
-#elif defined(_WIN32)
- if ((GetVersion() & 0xFF) >= 5) {
- // Windows 2000 and later have GlobalMemoryStatusEx() which
- // supports reporting values greater than 4 GiB. To keep the
- // code working also on older Windows versions, use
- // GlobalMemoryStatusEx() conditionally.
- HMODULE kernel32 = GetModuleHandle("kernel32.dll");
- if (kernel32 != NULL) {
- BOOL (WINAPI *gmse)(LPMEMORYSTATUSEX) = GetProcAddress(
- kernel32, "GlobalMemoryStatusEx");
- if (gmse != NULL) {
- MEMORYSTATUSEX meminfo;
- meminfo.dwLength = sizeof(meminfo);
- if (gmse(&meminfo))
- ret = meminfo.ullTotalPhys;
- }
- }
- }
-
- if (ret == 0) {
- // GlobalMemoryStatus() is supported by Windows 95 and later,
- // so it is fine to link against it unconditionally. Note that
- // GlobalMemoryStatus() has no return value.
- MEMORYSTATUS meminfo;
- meminfo.dwLength = sizeof(meminfo);
- GlobalMemoryStatus(&meminfo);
- ret = meminfo.dwTotalPhys;
- }
-
#elif defined(__DJGPP__)
__dpmi_free_mem_info meminfo;
if (__dpmi_get_free_memory_information(&meminfo) == 0