Skip to contentSkip to conversation

: Fix conditional compilation for OpenBSD

PATCH In review Michael W. Bombardieri 2 participants 4 messages Mar 31, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 : Fix conditional compilation for OpenBSD

Hi,

This morning I tried building Qemu 1.4.0 on my Lenovo ThinkPad T61 running OpenBSD/i386 5.1. The thread code didn't build due to a missing library function. Looking at the code, #if statements for NetBSD should also be followed for OpenBSD. Using the following patch I was able to build Qemu using clang 3.0 (gcc 4.2.1 ran out of memory). Please consider committing this patch.

- Michael

include/qemu/thread-posix.h +1 -1
index 0f30dcc..772d925 100644
@@ -12,7 +12,7 @@ struct QemuCond {
 };
 
 struct QemuSemaphore {
-#if defined(__APPLE__) || defined(__NetBSD__)
+#if defined(__APPLE__) || defined(__NetBSD__) || defined(__OpenBSD__)
     pthread_mutex_t lock;
     pthread_cond_t cond;
     int count;
util/qemu-thread-posix.c +5 -5
index 4489abf..fa8a3d8 100644
@@ -122,7 +122,7 @@ void qemu_sem_init(QemuSemaphore *sem, int init)
 {
     int rc;
 
-#if defined(__APPLE__) || defined(__NetBSD__)
+#if defined(__APPLE__) || defined(__NetBSD__) || defined(__OpenBSD__)
     rc = pthread_mutex_init(&sem->lock, NULL);
     if (rc != 0) {
         error_exit(rc, __func__);
@@ -147,7 +147,7 @@ void qemu_sem_destroy(QemuSemaphore *sem)
 {
     int rc;
 
-#if defined(__APPLE__) || defined(__NetBSD__)
+#if defined(__APPLE__) || defined(__NetBSD__) || defined(__OpenBSD__)
     rc = pthread_cond_destroy(&sem->cond);
     if (rc < 0) {
         error_exit(rc, __func__);
@@ -168,7 +168,7 @@ void qemu_sem_post(QemuSemaphore *sem)
 {
     int rc;
 
-#if defined(__APPLE__) || defined(__NetBSD__)
+#if defined(__APPLE__) || defined(__NetBSD__) || defined(__OpenBSD__)
     pthread_mutex_lock(&sem->lock);
     if (sem->count == INT_MAX) {
         rc = EINVAL;
@@ -206,7 +206,7 @@ int qemu_sem_timedwait(QemuSemaphore *sem, int ms)
     int rc;
     struct timespec ts;
 
-#if defined(__APPLE__) || defined(__NetBSD__)
+#if defined(__APPLE__) || defined(__NetBSD__) || defined(__OpenBSD__)
     compute_abs_deadline(&ts, ms);
     pthread_mutex_lock(&sem->lock);
     --sem->count;
@@ -249,7 +249,7 @@ int qemu_sem_timedwait(QemuSemaphore *sem, int ms)
 
 void qemu_sem_wait(QemuSemaphore *sem)
 {
-#if defined(__APPLE__) || defined(__NetBSD__)
+#if defined(__APPLE__) || defined(__NetBSD__) || defined(__OpenBSD__)
     pthread_mutex_lock(&sem->lock);
     --sem->count;
     while (sem->count < 0) {
#1 lore raw
Quoted 9 lines · Michael W. Bombardieri

This morning I tried building Qemu 1.4.0 on my Lenovo ThinkPad T61 running OpenBSD/i386 5.1. The thread code didn't build due to a missing library function. Looking at the code, #if statements for NetBSD should also be followed for OpenBSD. Using the following patch I was able to build Qemu using clang 3.0 (gcc 4.2.1 ran out of memory). Please consider committing this patch.

Hi Michael; thanks for the patch. However I think we should fix this by having a configure check for sem_timedwait [or whatever the functions we need are], rather than by piling up another OS ifdef check.

(If you want to have a go at that it would probably be useful to read the wiki.qemu.org page on submitting patches; in particular without a Signed-off-by: line we can't apply a patch at all.)

-- PMM

#2 lore raw
Quoted 6 lines · Peter Maydell

Hi Michael; thanks for the patch. However I think we should fix this by having a configure check for sem_timedwait [or whatever the functions we need are], rather than by piling up another OS ifdef check.

Quoted 6 lines

(If you want to have a go at that it would probably be useful to read the wiki.qemu.org page on submitting patches; in particular without a Signed-off-by: line we can't apply a patch at all.)

-- PMM

What about this?

Re-use the exting the pthread checker code in 'configure', define HAS_PTHREAD and use this instead of OS specific #if checks. I have built this on

1. Ubuntu 10.04.3 LTS (Linux 2.6.32-36-generic i686)
2. OpenBSD 5.1 (OpenBSD 5.1 GENERIC.MP#188 i386)
3. OpenBSD 5.1 (OpenBSD 5.1 GENERIC#243 amd64)

- Michael

configure +4 -0
index f2af714..2e521e2 100755
@@ -2296,6 +2296,10 @@ else
   done
 fi
 
+if [ $pthread = 'yes' ]; then
+  QEMU_CFLAGS="-DHAS_PTHREAD $QEMU_CFLAGS"
+fi
+
 if test "$mingw32" != yes -a "$pthread" = no; then
   echo
   echo "Error: pthread check failed"
include/qemu/thread-posix.h +1 -1
index 0f30dcc..f547f29 100644
@@ -12,7 +12,7 @@ struct QemuCond {
 };
 
 struct QemuSemaphore {
-#if defined(__APPLE__) || defined(__NetBSD__)
+#ifdef HAS_PTHREAD
     pthread_mutex_t lock;
     pthread_cond_t cond;
     int count;
util/qemu-thread-posix.c +5 -5
index 4489abf..edf4715 100644
@@ -122,7 +122,7 @@ void qemu_sem_init(QemuSemaphore *sem, int init)
 {
     int rc;
 
-#if defined(__APPLE__) || defined(__NetBSD__)
+#ifdef HAS_PTHREAD
     rc = pthread_mutex_init(&sem->lock, NULL);
     if (rc != 0) {
         error_exit(rc, __func__);
@@ -147,7 +147,7 @@ void qemu_sem_destroy(QemuSemaphore *sem)
 {
     int rc;
 
-#if defined(__APPLE__) || defined(__NetBSD__)
+#ifdef HAS_PTHREAD
     rc = pthread_cond_destroy(&sem->cond);
     if (rc < 0) {
         error_exit(rc, __func__);
@@ -168,7 +168,7 @@ void qemu_sem_post(QemuSemaphore *sem)
 {
     int rc;
 
-#if defined(__APPLE__) || defined(__NetBSD__)
+#ifdef HAS_PTHREAD
     pthread_mutex_lock(&sem->lock);
     if (sem->count == INT_MAX) {
         rc = EINVAL;
@@ -206,7 +206,7 @@ int qemu_sem_timedwait(QemuSemaphore *sem, int ms)
     int rc;
     struct timespec ts;
 
-#if defined(__APPLE__) || defined(__NetBSD__)
+#ifdef HAS_PTHREAD
     compute_abs_deadline(&ts, ms);
     pthread_mutex_lock(&sem->lock);
     --sem->count;
@@ -249,7 +249,7 @@ int qemu_sem_timedwait(QemuSemaphore *sem, int ms)
 
 void qemu_sem_wait(QemuSemaphore *sem)
 {
-#if defined(__APPLE__) || defined(__NetBSD__)
+#ifdef HAS_PTHREAD
     pthread_mutex_lock(&sem->lock);
     --sem->count;
     while (sem->count < 0) {
#3 lore raw
Quoted 8 lines · Michael W. Bombardieri

What about this?

Re-use the exting the pthread checker code in 'configure', define HAS_PTHREAD and use this instead of OS specific #if checks. I have built this on

1. Ubuntu 10.04.3 LTS (Linux 2.6.32-36-generic i686)
2. OpenBSD 5.1 (OpenBSD 5.1 GENERIC.MP#188 i386)
3. OpenBSD 5.1 (OpenBSD 5.1 GENERIC#243 amd64)

This doesn't look right, because it means we'll use the fallback code even for OSes like Linux which do have the ability to use the (preferable) semaphore code. You want a config check for sem_timedwait, which will succeed on Linux and fail on the BSDs, and then instead of #if defined(various BSDs) you have #ifndef CONFIG_SEM_TIMEDWAIT.

configure else · line 2302

Quoted 4 lines
configure +4 -0
+if [ $pthread = 'yes' ]; then
+  QEMU_CFLAGS="-DHAS_PTHREAD $QEMU_CFLAGS"
+fi
+

Have a look in configure at how we handle the preadv() check as an example. There's a little test program which is compiled to see if the function exists, and we set a shell variable. Then later on we write CONFIG_PREADV=y to the config-host.mak file. This avoids enormous compiler command lines for every config check.

Also you still aren't providing a Signed-off-by: line for your patch, and it would be nice if you could submit it in the git format-patch format that makes it trivial to apply.

thanks
-- PMM