diff options
| author | Lasse Collin <lasse.collin@tukaani.org> | 2010-05-10 19:54:15 +0300 |
|---|---|---|
| committer | Lasse Collin <lasse.collin@tukaani.org> | 2010-05-10 19:54:15 +0300 |
| commit | 6548e304657e77d3a972053db3c41c5daf591113 (patch) | |
| tree | c8ae4f8c278d244d9d4f17084b7095beea9ea9dc /src | |
| parent | Show both elapsed time and estimated remaining time in xz -v. (diff) | |
| download | xz-6548e304657e77d3a972053db3c41c5daf591113.tar.xz | |
Updates to tuklib_physmem and tuklib_cpucores.
Don't use #error to generate compile error, because some
compilers actually don't take it as an error. This fixes
tuklib_physmem on IRIX.
Fix incorrect error check for sysconf() return values.
Add AIX, HP-UX, and Tru64 specific code to detect the
amount RAM.
Add HP-UX specific code to detect the number of CPU cores.
Thanks a lot to Peter O'Gorman for initial patches,
testing, and debugging these fixes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/tuklib_cpucores.c | 14 | ||||
| -rw-r--r-- | src/common/tuklib_physmem.c | 33 |
2 files changed, 44 insertions, 3 deletions
diff --git a/src/common/tuklib_cpucores.c b/src/common/tuklib_cpucores.c index e35d9bc7..1da13df7 100644 --- a/src/common/tuklib_cpucores.c +++ b/src/common/tuklib_cpucores.c @@ -20,6 +20,11 @@ #elif defined(TUKLIB_CPUCORES_SYSCONF) # include <unistd.h> + +// HP-UX +#elif defined(TUKLIB_CPUCORES_PSTAT_GETDYNAMIC) +# include <sys/param.h> +# include <sys/pstat.h> #endif @@ -34,7 +39,7 @@ tuklib_cpucores(void) size_t cpus_size = sizeof(cpus); if (sysctl(name, 2, &cpus, &cpus_size, NULL, 0) != -1 && cpus_size == sizeof(cpus) && cpus > 0) - ret = (uint32_t)cpus; + ret = cpus; #elif defined(TUKLIB_CPUCORES_SYSCONF) # ifdef _SC_NPROCESSORS_ONLN @@ -45,7 +50,12 @@ tuklib_cpucores(void) const long cpus = sysconf(_SC_NPROC_ONLN); # endif if (cpus > 0) - ret = (uint32_t)cpus; + ret = cpus; + +#elif defined(TUKLIB_CPUCORES_PSTAT_GETDYNAMIC) + struct pst_dynamic pst; + if (pstat_getdynamic(&pst, sizeof(pst), 1, 0) != -1) + ret = pst.psd_proc_cnt; #endif return ret; diff --git a/src/common/tuklib_physmem.c b/src/common/tuklib_physmem.c index 1536e6e5..623b6e70 100644 --- a/src/common/tuklib_physmem.c +++ b/src/common/tuklib_physmem.c @@ -33,6 +33,10 @@ # include <syidef.h> # include <ssdef.h> +// AIX +#elif defined(TUKLIB_PHYSMEM_AIX) +# include <sys/systemcfg.h> + #elif defined(TUKLIB_PHYSMEM_SYSCONF) # include <unistd.h> @@ -42,6 +46,16 @@ # endif # include <sys/sysctl.h> +// Tru64 +#elif defined(TUKLIB_PHYSMEM_GETSYSINFO) +# include <sys/sysinfo.h> +# include <machine/hal_sysinfo.h> + +// HP-UX +#elif defined(TUKLIB_PHYSMEM_PSTAT_GETSTATIC) +# include <sys/param.h> +# include <sys/pstat.h> + // IRIX #elif defined(TUKLIB_PHYSMEM_GETINVENT_R) # include <invent.h> @@ -105,10 +119,13 @@ tuklib_physmem(void) if (LIB$GETSYI(&val, &vms_mem, 0, 0, 0, 0) == SS$_NORMAL) ret = (uint64_t)vms_mem * 8192; +#elif defined(TUKLIB_PHYSMEM_AIX) + ret = _system_configuration.physmem; + #elif defined(TUKLIB_PHYSMEM_SYSCONF) const long pagesize = sysconf(_SC_PAGESIZE); const long pages = sysconf(_SC_PHYS_PAGES); - if (pagesize != -1 || pages != -1) + if (pagesize != -1 && pages != -1) // According to docs, pagesize * pages can overflow. // Simple case is 32-bit box with 4 GiB or more RAM, // which may report exactly 4 GiB of RAM, and "long" @@ -140,6 +157,20 @@ tuklib_physmem(void) ret = mem.u32; } +#elif defined(TUKLIB_PHYSMEM_GETSYSINFO) + // Docs are unclear if "start" is needed, but it doesn't hurt + // much to have it. + int memkb; + int start = 0; + if (getsysinfo(GSI_PHYSMEM, (caddr_t)&memkb, sizeof(memkb), &start) + != -1) + ret = (uint64_t)memkb * 1024; + +#elif defined(TUKLIB_PHYSMEM_PSTAT_GETSTATIC) + struct pst_static pst; + if (pstat_getstatic(&pst, sizeof(pst), 1, 0) != -1) + ret = (uint64_t)pst.physical_memory * (uint64_t)pst.page_size; + #elif defined(TUKLIB_PHYSMEM_GETINVENT_R) inv_state_t *st = NULL; if (setinvent_r(&st) != -1) { |