mirror of
https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git
synced 2025-09-07 19:30:47 -04:00
111 lines
3.6 KiB
Plaintext
111 lines
3.6 KiB
Plaintext
$NetBSD: patch-aa,v 1.11 2014/01/14 17:24:42 abs Exp $
|
|
|
|
DragonFly support.
|
|
Add workaround for missing sem_timedwait() in NetBSD < 6.99.4
|
|
|
|
--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig 2014-01-01 05:50:05.000000000 +0000
|
|
+++ hotspot/src/os/bsd/vm/os_bsd.cpp
|
|
@@ -126,8 +126,11 @@
|
|
# include <inttypes.h>
|
|
# include <sys/ioctl.h>
|
|
|
|
-#if defined(__FreeBSD__) || defined(__NetBSD__)
|
|
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
|
|
# include <elf.h>
|
|
+#if !defined(EM_ALPHA)
|
|
+#define EM_ALPHA 0x9026
|
|
+#endif
|
|
#endif
|
|
|
|
#ifdef __APPLE__
|
|
@@ -340,6 +343,7 @@ void os::Bsd::initialize_system_info() {
|
|
size_t len;
|
|
int cpu_val;
|
|
julong mem_val;
|
|
+ struct rlimit limits;
|
|
|
|
/* get processors count via hw.ncpus sysctl */
|
|
mib[0] = CTL_HW;
|
|
@@ -370,14 +374,11 @@ void os::Bsd::initialize_system_info() {
|
|
_physical_memory = 256*1024*1024; // fallback (XXXBSD?)
|
|
}
|
|
|
|
-#ifdef __OpenBSD__
|
|
- {
|
|
- // limit _physical_memory memory view on OpenBSD since
|
|
- // datasize rlimit restricts us anyway.
|
|
- struct rlimit limits;
|
|
- getrlimit(RLIMIT_DATA, &limits);
|
|
- _physical_memory = MIN2(_physical_memory, (julong)limits.rlim_cur);
|
|
- }
|
|
+ getrlimit(RLIMIT_DATA, &limits);
|
|
+ _physical_memory = MIN2(_physical_memory, (julong)limits.rlim_cur);
|
|
+#if defined(RLIMIT_AS)
|
|
+ getrlimit(RLIMIT_AS, &limits);
|
|
+ _physical_memory = MIN2(_physical_memory, (julong)limits.rlim_cur);
|
|
#endif
|
|
}
|
|
#else
|
|
@@ -2222,7 +2223,9 @@ void * os::dll_load(const char *filename
|
|
{EM_PPC, EM_PPC, ELFCLASS32, ELFDATA2MSB, (char*)"Power PC 32"},
|
|
{EM_PPC64, EM_PPC64, ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"},
|
|
{EM_ARM, EM_ARM, ELFCLASS32, ELFDATA2LSB, (char*)"ARM"},
|
|
+#if 0
|
|
{EM_S390, EM_S390, ELFCLASSNONE, ELFDATA2MSB, (char*)"IBM System/390"},
|
|
+#endif
|
|
{EM_ALPHA, EM_ALPHA, ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"},
|
|
{EM_MIPS_RS3_LE, EM_MIPS_RS3_LE, ELFCLASS32, ELFDATA2LSB, (char*)"MIPSel"},
|
|
{EM_MIPS, EM_MIPS, ELFCLASS32, ELFDATA2MSB, (char*)"MIPS"},
|
|
@@ -2818,6 +2821,33 @@ bool Semaphore::timedwait(unsigned int s
|
|
|
|
#else
|
|
|
|
+#if defined(__NetBSD__) && (__NetBSD_Version__ < 699000400)
|
|
+static inline int sem_timedwait(sem_t *sem, struct timespec *ts) {
|
|
+ struct timespec onems = { 0, 1000000 };
|
|
+ struct timespec total = { 0, 0 };
|
|
+ struct timespec unslept;
|
|
+ struct timespec elapsed;
|
|
+ struct timespec tmp;
|
|
+
|
|
+ while (timespeccmp(ts, &total, >)) {
|
|
+ if (sem_trywait(sem) == 0)
|
|
+ return 0;
|
|
+
|
|
+ if (errno != EAGAIN)
|
|
+ return -1;
|
|
+
|
|
+ (void)nanosleep(&onems, &unslept);
|
|
+
|
|
+ timespecsub(&onems, &unslept, &elapsed);
|
|
+ timespecadd(&total, &elapsed, &tmp);
|
|
+ total.tv_sec = tmp.tv_sec;
|
|
+ total.tv_nsec = tmp.tv_nsec;
|
|
+ }
|
|
+ errno = ETIMEDOUT;
|
|
+ return -1;
|
|
+}
|
|
+#endif /* __NetBSD__ */
|
|
+
|
|
bool Semaphore::trywait() {
|
|
return sem_trywait(&_semaphore) == 0;
|
|
}
|
|
@@ -3880,7 +3910,7 @@ OSReturn os::set_native_priority(Thread*
|
|
#ifdef __OpenBSD__
|
|
// OpenBSD pthread_setprio starves low priority threads
|
|
return OS_OK;
|
|
-#elif defined(__FreeBSD__)
|
|
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
|
|
int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri);
|
|
return (ret == 0) ? OS_OK : OS_ERR;
|
|
#elif defined(__APPLE__) || defined(__NetBSD__)
|
|
@@ -3909,7 +3939,7 @@ OSReturn os::get_native_priority(const T
|
|
}
|
|
|
|
errno = 0;
|
|
-#if defined(__OpenBSD__) || defined(__FreeBSD__)
|
|
+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
|
|
*priority_ptr = pthread_getprio(thread->osthread()->pthread_id());
|
|
#elif defined(__APPLE__) || defined(__NetBSD__)
|
|
int policy;
|