projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unistr/u*-next: Add missing dependencies.
[gnulib.git]
/
lib
/
physmem.c
diff --git
a/lib/physmem.c
b/lib/physmem.c
index
795a0a8
..
1b19ef3
100644
(file)
--- a/
lib/physmem.c
+++ b/
lib/physmem.c
@@
-1,10
+1,12
@@
/* Calculate the size of physical memory.
/* Calculate the size of physical memory.
- Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 2000-2001, 2003, 2005-2006, 2009-2010 Free Software
+ Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version
2, or (at your option)
- any later version.
+ the Free Software Foundation; either version
3 of the License, or
+
(at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-12,20
+14,15
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* Written by Paul Eggert. */
/* Written by Paul Eggert. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "physmem.h"
#include "physmem.h"
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
#if HAVE_SYS_PSTAT_H
# include <sys/pstat.h>
#if HAVE_SYS_PSTAT_H
# include <sys/pstat.h>
@@
-98,10
+95,10
@@
physmem_total (void)
struct pst_static pss;
if (0 <= pstat_getstatic (&pss, sizeof pss, 1, 0))
{
struct pst_static pss;
if (0 <= pstat_getstatic (&pss, sizeof pss, 1, 0))
{
- double pages = pss.physical_memory;
- double pagesize = pss.page_size;
- if (0 <= pages && 0 <= pagesize)
- return pages * pagesize;
+
double pages = pss.physical_memory;
+
double pagesize = pss.page_size;
+
if (0 <= pages && 0 <= pagesize)
+
return pages * pagesize;
}
}
#endif
}
}
#endif
@@
-111,10
+108,10
@@
physmem_total (void)
struct rminfo realmem;
if (sysmp (MP_SAGET, MPSA_RMINFO, &realmem, sizeof realmem) == 0)
{
struct rminfo realmem;
if (sysmp (MP_SAGET, MPSA_RMINFO, &realmem, sizeof realmem) == 0)
{
- double pagesize = sysconf (_SC_PAGESIZE);
- double pages = realmem.physmem;
- if (0 <= pages && 0 <= pagesize)
- return pages * pagesize;
+
double pagesize = sysconf (_SC_PAGESIZE);
+
double pages = realmem.physmem;
+
if (0 <= pages && 0 <= pagesize)
+
return pages * pagesize;
}
}
#endif
}
}
#endif
@@
-124,12
+121,12
@@
physmem_total (void)
int physmem;
if (getsysinfo (GSI_PHYSMEM, (caddr_t) &physmem, sizeof (physmem),
int physmem;
if (getsysinfo (GSI_PHYSMEM, (caddr_t) &physmem, sizeof (physmem),
- NULL, NULL, NULL) == 1)
+
NULL, NULL, NULL) == 1)
{
{
- double kbytes = physmem;
+
double kbytes = physmem;
- if (0 <= kbytes)
- return kbytes * 1024.0;
+
if (0 <= kbytes)
+
return kbytes * 1024.0;
}
}
#endif
}
}
#endif
@@
-141,7
+138,7
@@
physmem_total (void)
static int mib[2] = { CTL_HW, HW_PHYSMEM };
if (sysctl (mib, ARRAY_SIZE (mib), &physmem, &len, NULL, 0) == 0
static int mib[2] = { CTL_HW, HW_PHYSMEM };
if (sysctl (mib, ARRAY_SIZE (mib), &physmem, &len, NULL, 0) == 0
- && len == sizeof (physmem))
+
&& len == sizeof (physmem))
return (double) physmem;
}
#endif
return (double) physmem;
}
#endif
@@
-162,20
+159,20
@@
physmem_total (void)
/* Use GlobalMemoryStatusEx if available. */
if ((pfnex = (PFN_MS_EX) GetProcAddress (h, "GlobalMemoryStatusEx")))
{
/* 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;
+
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
{
}
/* 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;
+
MEMORYSTATUS ms;
+
GlobalMemoryStatus (&ms);
+
return (double) ms.dwTotalPhys;
}
}
#endif
}
}
#endif
@@
-202,12
+199,12
@@
physmem_available (void)
struct pst_static pss;
struct pst_dynamic psd;
if (0 <= pstat_getstatic (&pss, sizeof pss, 1, 0)
struct pst_static pss;
struct pst_dynamic psd;
if (0 <= pstat_getstatic (&pss, sizeof pss, 1, 0)
- && 0 <= pstat_getdynamic (&psd, sizeof psd, 1, 0))
+
&& 0 <= pstat_getdynamic (&psd, sizeof psd, 1, 0))
{
{
- double pages = psd.psd_free;
- double pagesize = pss.page_size;
- if (0 <= pages && 0 <= pagesize)
- return pages * pagesize;
+
double pages = psd.psd_free;
+
double pagesize = pss.page_size;
+
if (0 <= pages && 0 <= pagesize)
+
return pages * pagesize;
}
}
#endif
}
}
#endif
@@
-217,10
+214,10
@@
physmem_available (void)
struct rminfo realmem;
if (sysmp (MP_SAGET, MPSA_RMINFO, &realmem, sizeof realmem) == 0)
{
struct rminfo realmem;
if (sysmp (MP_SAGET, MPSA_RMINFO, &realmem, sizeof realmem) == 0)
{
- double pagesize = sysconf (_SC_PAGESIZE);
- double pages = realmem.availrmem;
- if (0 <= pages && 0 <= pagesize)
- return pages * pagesize;
+
double pagesize = sysconf (_SC_PAGESIZE);
+
double pages = realmem.availrmem;
+
if (0 <= pages && 0 <= pagesize)
+
return pages * pagesize;
}
}
#endif
}
}
#endif
@@
-231,11
+228,11
@@
physmem_available (void)
if (table (TBL_VMSTATS, 0, &vmstats, 1, sizeof (vmstats)) == 1)
{
if (table (TBL_VMSTATS, 0, &vmstats, 1, sizeof (vmstats)) == 1)
{
- double pages = vmstats.free_count;
- double pagesize = vmstats.pagesize;
+
double pages = vmstats.free_count;
+
double pagesize = vmstats.pagesize;
- if (0 <= pages && 0 <= pagesize)
- return pages * pagesize;
+
if (0 <= pages && 0 <= pagesize)
+
return pages * pagesize;
}
}
#endif
}
}
#endif
@@
-247,7
+244,7
@@
physmem_available (void)
static int mib[2] = { CTL_HW, HW_USERMEM };
if (sysctl (mib, ARRAY_SIZE (mib), &usermem, &len, NULL, 0) == 0
static int mib[2] = { CTL_HW, HW_USERMEM };
if (sysctl (mib, ARRAY_SIZE (mib), &usermem, &len, NULL, 0) == 0
- && len == sizeof (usermem))
+
&& len == sizeof (usermem))
return (double) usermem;
}
#endif
return (double) usermem;
}
#endif
@@
-263,20
+260,20
@@
physmem_available (void)
/* Use GlobalMemoryStatusEx if available. */
if ((pfnex = (PFN_MS_EX) GetProcAddress (h, "GlobalMemoryStatusEx")))
{
/* 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;
+
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
{
}
/* 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;
+
MEMORYSTATUS ms;
+
GlobalMemoryStatus (&ms);
+
return (double) ms.dwAvailPhys;
}
}
#endif
}
}
#endif
@@
-302,6
+299,6
@@
main (void)
/*
Local Variables:
/*
Local Variables:
-compile-command: "gcc -DDEBUG -
DHAVE_CONFIG_H -I.. -
g -O -Wall -W physmem.c"
+compile-command: "gcc -DDEBUG -g -O -Wall -W physmem.c"
End:
*/
End:
*/