Mercurial > hg > graal-jvmci-8
changeset 12805:2bd38d594b9a
8025283: Nits in os_bsd file breaks compilation of open hotspot
Summary: Couple of nits in os_bsd.cpp brake compilation of open hotspot on non-apple platforms
Reviewed-by: sla, sspitsyn
author | dsamersoff |
---|---|
date | Wed, 02 Oct 2013 20:58:44 +0400 |
parents | f21415c32ca1 |
children | 9855f17334d8 |
files | src/os/bsd/vm/os_bsd.cpp |
diffstat | 1 files changed, 14 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/os/bsd/vm/os_bsd.cpp Tue Oct 01 15:41:39 2013 -0400 +++ b/src/os/bsd/vm/os_bsd.cpp Wed Oct 02 20:58:44 2013 +0400 @@ -100,6 +100,7 @@ # include <stdint.h> # include <inttypes.h> # include <sys/ioctl.h> +# include <sys/syscall.h> #if defined(__FreeBSD__) || defined(__NetBSD__) # include <elf.h> @@ -152,6 +153,7 @@ // utility functions static int SR_initialize(); +static void unpackTime(timespec* absTime, bool isAbsolute, jlong time); julong os::available_memory() { return Bsd::available_memory(); @@ -247,7 +249,17 @@ * since it returns a 64 bit value) */ mib[0] = CTL_HW; + +#if defined (HW_MEMSIZE) // Apple mib[1] = HW_MEMSIZE; +#elif defined(HW_PHYSMEM) // Most of BSD + mib[1] = HW_PHYSMEM; +#elif defined(HW_REALMEM) // Old FreeBSD + mib[1] = HW_REALMEM; +#else + #error No ways to get physmem +#endif + len = sizeof(mem_val); if (sysctl(mib, 2, &mem_val, &len, NULL, 0) != -1) { assert(len == sizeof(mem_val), "unexpected data size"); @@ -1904,7 +1916,7 @@ bool timedwait(unsigned int sec, int nsec); private: jlong currenttime() const; - semaphore_t _semaphore; + os_semaphore_t _semaphore; }; Semaphore::Semaphore() : _semaphore(0) { @@ -1972,7 +1984,7 @@ bool Semaphore::timedwait(unsigned int sec, int nsec) { struct timespec ts; - jlong endtime = unpackTime(&ts, false, (sec * NANOSECS_PER_SEC) + nsec); + unpackTime(&ts, false, (sec * NANOSECS_PER_SEC) + nsec); while (1) { int result = sem_timedwait(&_semaphore, &ts);