Mainline merge as of 2003-03-02.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/tree-ssa-20020619-branch@63675 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 107 insertions, 14 deletions

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index a72af02d94c..31d159b9317 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,18 @@
+2003-02-27  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* physmem.c: Formatting changes from upstream.
+
+2003-02-24  Danny Smith  <dannysmith@users.source.forge.net>
+
+	* physmem.c (physmem_total): Add _WIN32 support.
+	(physmem_available): Likewise.
+
+2003-02-24  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* physmem.c (physmem_total) [HAVE_GETSYSINFO]: Test for
+	GSI_PHYSMEM.
+	(physmem_available) [HAVE_TABLE]: Test for TBL_VMSTATS.
+
 2003-02-22  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* configure.in: Check for sys/systemcfg.h and
diff --git a/libiberty/physmem.c b/libiberty/physmem.c
index 80fdd7975e9..9185c1224e8 100644
--- a/libiberty/physmem.c
+++ b/libiberty/physmem.c
@@ -56,6 +56,26 @@
 # include <sys/systemcfg.h>
 #endif
 
+#ifdef _WIN32
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>
+/*  MEMORYSTATUSEX is missing from older windows headers, so define
+    a local replacement.  */
+typedef struct
+{
+  DWORD dwLength;
+  DWORD dwMemoryLoad;
+  DWORDLONG ullTotalPhys;
+  DWORDLONG ullAvailPhys;
+  DWORDLONG ullTotalPageFile;
+  DWORDLONG ullAvailPageFile;
+  DWORDLONG ullTotalVirtual;
+  DWORDLONG ullAvailVirtual;
+  DWORDLONG ullAvailExtendedVirtual;
+} lMEMORYSTATUSEX;
+typedef WINBOOL (WINAPI *PFN_MS_EX) (lMEMORYSTATUSEX*);
+#endif
+
 #include "libiberty.h"
 
 /* Return the total amount of physical memory.  */
@@ -63,7 +83,7 @@ double
 physmem_total ()
 {
 #if defined _SC_PHYS_PAGES && defined _SC_PAGESIZE
-  {
+  { /* This works on linux-gnu, solaris2 and cygwin.  */
     double pages = sysconf (_SC_PHYS_PAGES);
     double pagesize = sysconf (_SC_PAGESIZE);
     if (0 <= pages && 0 <= pagesize)
@@ -92,12 +112,12 @@ physmem_total ()
 	double pagesize = sysconf (_SC_PAGESIZE);
 	double pages = realmem.physmem;
 	if (0 <= pages && 0 <= pagesize)
-          return pages * pagesize;
+	  return pages * pagesize;
       }
   }
 #endif
 
-#if HAVE_GETSYSINFO
+#if HAVE_GETSYSINFO && defined GSI_PHYSMEM
   { /* This works on Tru64 UNIX V4/5.  */
     int physmem;
 
@@ -115,12 +135,12 @@ physmem_total ()
 #if HAVE_SYSCTL && defined HW_PHYSMEM
   { /* This works on *bsd and darwin.  */
     unsigned int physmem;
-    size_t len = sizeof(physmem);
-    static int mib[2] = {CTL_HW, HW_PHYSMEM};
+    size_t len = sizeof physmem;
+    static int mib[2] = { CTL_HW, HW_PHYSMEM };
 
-    if (sysctl(mib, ARRAY_SIZE(mib), &physmem, &len, NULL, 0) == 0
+    if (sysctl (mib, ARRAY_SIZE (mib), &physmem, &len, NULL, 0) == 0
 	&& len == sizeof (physmem))
-      return (double)physmem;
+      return (double) physmem;
   }
 #endif
 
@@ -129,6 +149,35 @@ physmem_total ()
   return _system_configuration.physmem;
 #endif
 
+#if defined _WIN32
+  { /* this works on windows */
+    PFN_MS_EX pfnex;
+    HMODULE h = GetModuleHandle ("kernel32.dll");
+
+    if (!h)
+      return 0.0;
+
+    /*  Use GlobalMemoryStatusEx if available.  */
+    if ((pfnex = (PFN_MS_EX) GetProcAddress (h, "GlobalMemoryStatusEx")))
+      {
+	lMEMORYSTATUSEX lms_ex;
+	lms_ex.dwLength = sizeof lms_ex;
+	if (!pfnex (&lms_ex))
+	  return 0.0;
+	return (double) lms_ex.ullTotalPhys;
+      }
+
+    /*  Fall back to GlobalMemoryStatus which is always available.
+        but returns wrong results for physical memory > 4GB.  */
+    else
+      {
+	MEMORYSTATUS ms;
+	GlobalMemoryStatus (&ms);
+	return (double) ms.dwTotalPhys;
+      }
+  }
+#endif
+
   /* Return 0 if we can't determine the value.  */
   return 0;
 }
@@ -138,7 +187,7 @@ double
 physmem_available ()
 {
 #if defined _SC_AVPHYS_PAGES && defined _SC_PAGESIZE
-  {
+  { /* This works on linux-gnu, solaris2 and cygwin.  */
     double pages = sysconf (_SC_AVPHYS_PAGES);
     double pagesize = sysconf (_SC_PAGESIZE);
     if (0 <= pages && 0 <= pagesize)
@@ -169,12 +218,12 @@ physmem_available ()
 	double pagesize = sysconf (_SC_PAGESIZE);
 	double pages = realmem.availrmem;
 	if (0 <= pages && 0 <= pagesize)
-          return pages * pagesize;
+	  return pages * pagesize;
       }
   }
 #endif
 
-#if HAVE_TABLE && HAVE_SYS_TABLE_H
+#if HAVE_TABLE && defined TBL_VMSTATS
   { /* This works on Tru64 UNIX V4/5.  */
     struct tbl_vmstats vmstats;
 
@@ -192,12 +241,41 @@ physmem_available ()
 #if HAVE_SYSCTL && defined HW_USERMEM
   { /* This works on *bsd and darwin.  */
     unsigned int usermem;
-    size_t len = sizeof(usermem);
-    static int mib[2] = {CTL_HW, HW_USERMEM};
+    size_t len = sizeof usermem;
+    static int mib[2] = { CTL_HW, HW_USERMEM };
 
-    if (sysctl(mib, ARRAY_SIZE(mib), &usermem, &len, NULL, 0) == 0
+    if (sysctl (mib, ARRAY_SIZE (mib), &usermem, &len, NULL, 0) == 0
 	&& len == sizeof (usermem))
-      return (double)usermem;
+      return (double) usermem;
+  }
+#endif
+
+#if defined _WIN32
+  { /* this works on windows */
+    PFN_MS_EX pfnex;
+    HMODULE h = GetModuleHandle ("kernel32.dll");
+
+    if (!h)
+      return 0.0;
+
+    /*  Use GlobalMemoryStatusEx if available.  */
+    if ((pfnex = (PFN_MS_EX) GetProcAddress (h, "GlobalMemoryStatusEx")))
+      {
+	lMEMORYSTATUSEX lms_ex;
+	lms_ex.dwLength = sizeof lms_ex;
+	if (!pfnex (&lms_ex))
+	  return 0.0;
+	return (double) lms_ex.ullAvailPhys;
+      }
+
+    /*  Fall back to GlobalMemoryStatus which is always available.
+        but returns wrong results for physical memory > 4GB  */
+    else
+      {
+	MEMORYSTATUS ms;
+	GlobalMemoryStatus (&ms);
+	return (double) ms.dwAvailPhys;
+      }
   }
 #endif