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>
* physmem.c (physmem_total): Add _WIN32 support.
......
......@@ -57,11 +57,12 @@
#endif
#ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
/* MEMORYSTATUSEX is missing from older windows headers, so define
a local replacement. */
typedef struct {
typedef struct
{
DWORD dwLength;
DWORD dwMemoryLoad;
DWORDLONG ullTotalPhys;
......@@ -82,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)
......@@ -134,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
......@@ -151,7 +152,7 @@ physmem_total ()
#if defined _WIN32
{ /* this works on windows */
PFN_MS_EX pfnex;
HMODULE h = GetModuleHandle("kernel32.dll");
HMODULE h = GetModuleHandle ("kernel32.dll");
if (!h)
return 0.0;
......@@ -163,7 +164,7 @@ physmem_total ()
lms_ex.dwLength = sizeof lms_ex;
if (!pfnex (&lms_ex))
return 0.0;
return (double)lms_ex.ullTotalPhys;
return (double) lms_ex.ullTotalPhys;
}
/* Fall back to GlobalMemoryStatus which is always available.
......@@ -172,7 +173,7 @@ physmem_total ()
{
MEMORYSTATUS ms;
GlobalMemoryStatus (&ms);
return (double)ms.dwTotalPhys;
return (double) ms.dwTotalPhys;
}
}
#endif
......@@ -186,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)
......@@ -240,12 +241,12 @@ 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
......@@ -273,7 +274,7 @@ physmem_available ()
{
MEMORYSTATUS ms;
GlobalMemoryStatus (&ms);
return (double)ms.dwAvailPhys;
return (double) ms.dwAvailPhys;
}
}
#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