Commit 434fa0b8 by Kaveh R. Ghazi Committed by Kaveh Ghazi

* physmem.c: Formatting changes from upstream.

From-SVN: r63519
parent 678e68fc
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> 2003-02-24 Danny Smith <dannysmith@users.source.forge.net>
* physmem.c (physmem_total): Add _WIN32 support. * physmem.c (physmem_total): Add _WIN32 support.
......
...@@ -57,20 +57,21 @@ ...@@ -57,20 +57,21 @@
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
#define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
#include <windows.h> # include <windows.h>
/* MEMORYSTATUSEX is missing from older windows headers, so define /* MEMORYSTATUSEX is missing from older windows headers, so define
a local replacement. */ a local replacement. */
typedef struct { typedef struct
DWORD dwLength; {
DWORD dwMemoryLoad; DWORD dwLength;
DWORDLONG ullTotalPhys; DWORD dwMemoryLoad;
DWORDLONG ullAvailPhys; DWORDLONG ullTotalPhys;
DWORDLONG ullTotalPageFile; DWORDLONG ullAvailPhys;
DWORDLONG ullAvailPageFile; DWORDLONG ullTotalPageFile;
DWORDLONG ullTotalVirtual; DWORDLONG ullAvailPageFile;
DWORDLONG ullAvailVirtual; DWORDLONG ullTotalVirtual;
DWORDLONG ullAvailExtendedVirtual; DWORDLONG ullAvailVirtual;
DWORDLONG ullAvailExtendedVirtual;
} lMEMORYSTATUSEX; } lMEMORYSTATUSEX;
typedef WINBOOL (WINAPI *PFN_MS_EX) (lMEMORYSTATUSEX*); typedef WINBOOL (WINAPI *PFN_MS_EX) (lMEMORYSTATUSEX*);
#endif #endif
...@@ -82,7 +83,7 @@ double ...@@ -82,7 +83,7 @@ double
physmem_total () physmem_total ()
{ {
#if defined _SC_PHYS_PAGES && defined _SC_PAGESIZE #if defined _SC_PHYS_PAGES && defined _SC_PAGESIZE
{ { /* This works on linux-gnu, solaris2 and cygwin. */
double pages = sysconf (_SC_PHYS_PAGES); double pages = sysconf (_SC_PHYS_PAGES);
double pagesize = sysconf (_SC_PAGESIZE); double pagesize = sysconf (_SC_PAGESIZE);
if (0 <= pages && 0 <= pagesize) if (0 <= pages && 0 <= pagesize)
...@@ -111,7 +112,7 @@ physmem_total () ...@@ -111,7 +112,7 @@ physmem_total ()
double pagesize = sysconf (_SC_PAGESIZE); double pagesize = sysconf (_SC_PAGESIZE);
double pages = realmem.physmem; double pages = realmem.physmem;
if (0 <= pages && 0 <= pagesize) if (0 <= pages && 0 <= pagesize)
return pages * pagesize; return pages * pagesize;
} }
} }
#endif #endif
...@@ -134,12 +135,12 @@ physmem_total () ...@@ -134,12 +135,12 @@ physmem_total ()
#if HAVE_SYSCTL && defined HW_PHYSMEM #if HAVE_SYSCTL && defined HW_PHYSMEM
{ /* This works on *bsd and darwin. */ { /* This works on *bsd and darwin. */
unsigned int physmem; unsigned int physmem;
size_t len = sizeof(physmem); size_t len = sizeof physmem;
static int mib[2] = {CTL_HW, HW_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)) && len == sizeof (physmem))
return (double)physmem; return (double) physmem;
} }
#endif #endif
...@@ -150,31 +151,31 @@ physmem_total () ...@@ -150,31 +151,31 @@ physmem_total ()
#if defined _WIN32 #if defined _WIN32
{ /* this works on windows */ { /* this works on windows */
PFN_MS_EX pfnex; PFN_MS_EX pfnex;
HMODULE h = GetModuleHandle("kernel32.dll"); HMODULE h = GetModuleHandle ("kernel32.dll");
if (!h) if (!h)
return 0.0; return 0.0;
/* Use GlobalMemoryStatusEx if available. */ /* Use GlobalMemoryStatusEx if available. */
if ((pfnex = (PFN_MS_EX) GetProcAddress (h, "GlobalMemoryStatusEx"))) if ((pfnex = (PFN_MS_EX) GetProcAddress (h, "GlobalMemoryStatusEx")))
{ {
lMEMORYSTATUSEX lms_ex; lMEMORYSTATUSEX lms_ex;
lms_ex.dwLength = sizeof lms_ex; lms_ex.dwLength = sizeof lms_ex;
if (!pfnex (&lms_ex)) if (!pfnex (&lms_ex))
return 0.0; return 0.0;
return (double)lms_ex.ullTotalPhys; return (double) lms_ex.ullTotalPhys;
} }
/* Fall back to GlobalMemoryStatus which is always available. /* Fall back to GlobalMemoryStatus which is always available.
but returns wrong results for physical memory > 4GB. */ but returns wrong results for physical memory > 4GB. */
else else
{ {
MEMORYSTATUS ms; MEMORYSTATUS ms;
GlobalMemoryStatus (&ms); GlobalMemoryStatus (&ms);
return (double)ms.dwTotalPhys; return (double) ms.dwTotalPhys;
} }
} }
#endif #endif
/* Return 0 if we can't determine the value. */ /* Return 0 if we can't determine the value. */
...@@ -186,7 +187,7 @@ double ...@@ -186,7 +187,7 @@ double
physmem_available () physmem_available ()
{ {
#if defined _SC_AVPHYS_PAGES && defined _SC_PAGESIZE #if defined _SC_AVPHYS_PAGES && defined _SC_PAGESIZE
{ { /* This works on linux-gnu, solaris2 and cygwin. */
double pages = sysconf (_SC_AVPHYS_PAGES); double pages = sysconf (_SC_AVPHYS_PAGES);
double pagesize = sysconf (_SC_PAGESIZE); double pagesize = sysconf (_SC_PAGESIZE);
if (0 <= pages && 0 <= pagesize) if (0 <= pages && 0 <= pagesize)
...@@ -217,7 +218,7 @@ physmem_available () ...@@ -217,7 +218,7 @@ physmem_available ()
double pagesize = sysconf (_SC_PAGESIZE); double pagesize = sysconf (_SC_PAGESIZE);
double pages = realmem.availrmem; double pages = realmem.availrmem;
if (0 <= pages && 0 <= pagesize) if (0 <= pages && 0 <= pagesize)
return pages * pagesize; return pages * pagesize;
} }
} }
#endif #endif
...@@ -240,24 +241,24 @@ physmem_available () ...@@ -240,24 +241,24 @@ physmem_available ()
#if HAVE_SYSCTL && defined HW_USERMEM #if HAVE_SYSCTL && defined HW_USERMEM
{ /* This works on *bsd and darwin. */ { /* This works on *bsd and darwin. */
unsigned int usermem; unsigned int usermem;
size_t len = sizeof(usermem); size_t len = sizeof usermem;
static int mib[2] = {CTL_HW, HW_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)) && len == sizeof (usermem))
return (double)usermem; return (double) usermem;
} }
#endif #endif
#if defined _WIN32 #if defined _WIN32
{ /* this works on windows */ { /* this works on windows */
PFN_MS_EX pfnex; PFN_MS_EX pfnex;
HMODULE h = GetModuleHandle ("kernel32.dll"); HMODULE h = GetModuleHandle ("kernel32.dll");
if (!h) if (!h)
return 0.0; return 0.0;
/* Use GlobalMemoryStatusEx if available. */ /* Use GlobalMemoryStatusEx if available. */
if ((pfnex = (PFN_MS_EX) GetProcAddress (h, "GlobalMemoryStatusEx"))) if ((pfnex = (PFN_MS_EX) GetProcAddress (h, "GlobalMemoryStatusEx")))
{ {
lMEMORYSTATUSEX lms_ex; lMEMORYSTATUSEX lms_ex;
...@@ -268,12 +269,12 @@ physmem_available () ...@@ -268,12 +269,12 @@ physmem_available ()
} }
/* Fall back to GlobalMemoryStatus which is always available. /* Fall back to GlobalMemoryStatus which is always available.
but returns wrong results for physical memory > 4GB */ but returns wrong results for physical memory > 4GB */
else else
{ {
MEMORYSTATUS ms; MEMORYSTATUS ms;
GlobalMemoryStatus (&ms); GlobalMemoryStatus (&ms);
return (double)ms.dwAvailPhys; return (double) ms.dwAvailPhys;
} }
} }
#endif #endif
......
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