* src/threads/native/threads.c (threads_sem_wait): New function.

[cacao.git] / src / threads / native / threads.c

diff --git a/src/threads/native/threads.c b/src/threads/native/threads.c
index 13900d50ed4c8fad50d77024ba0b92a7e1da2df0..de389dc58798ac283f3e471d97326529eec70fcc 100644 (file)
--- a/src/threads/native/threads.c
+++ b/src/threads/native/threads.c
@@ -29,7 +29,7 @@
    Changes: Christian Thalinger
                        Edwin Steiner
 
-   $Id: threads.c 4728 2006-04-04 09:17:05Z twisti $
+   $Id: threads.c 4865 2006-05-01 12:40:18Z edwin $
 
 */
 
@@ -151,6 +151,33 @@ static void pthread_mutex_unlock_rec(pthread_mutex_rec_t *m)
 
 #endif /* MUTEXSIM */
 
+/* threads_sem_wait ************************************************************
+ 
+   Wait for a semaphore, non-interruptible.
+
+   IMPORTANT: Always use this function instead of `sem_wait` directly, as
+              `sem_wait` may be interrupted by signals!
+  
+   IN:
+       sem..............the semaphore to wait on
+   
+*******************************************************************************/
+
+void threads_sem_wait(sem_t *sem)
+{
+       int r;
+
+       do {
+               r = sem_wait(sem);
+               if (r == 0)
+                       return;
+       } while (errno == EINTR);
+
+       fprintf(stderr,"error: sem_wait returned unexpected error %d: %s\n",
+                       errno, strerror(errno));
+       abort();
+}
+
 static void setPriority(pthread_t tid, int priority)
 {
        struct sched_param schedp;
@@ -394,7 +421,7 @@ void cast_stopworld()
 #else
        count = cast_sendsignals(GC_signum1(), 0);
        for (i=0; i<count; i++)
-               sem_wait(&suspend_ack);
+               threads_sem_wait(&suspend_ack);
 #endif
        pthread_mutex_unlock(&threadlistlock);
 }
@@ -725,7 +752,7 @@ static void *threads_startup_thread(void *t)
        /* Seems like we've encountered a situation where info->tid was not set by
         * pthread_create. We alleviate this problem by waiting for pthread_create
         * to return. */
-       sem_wait(startup->psem_first);
+       threads_sem_wait(startup->psem_first);
 
        t = NULL;
 #if defined(__DARWIN__)
@@ -838,7 +865,7 @@ void threads_start_thread(thread *t, functionptr function)
 
        /* wait here until the thread has entered itself into the thread list */
 
-       sem_wait(&sem);
+       threads_sem_wait(&sem);
        sem_destroy(&sem);
        sem_destroy(&sem_first);
 }
@@ -1032,7 +1059,7 @@ static void queueOnLockRecord(monitorLockRecord *lr, java_objectheader *o)
        MEMORY_BARRIER_AFTER_ATOMIC();
 
        if (lr->o == o)
-               sem_wait(&lr->queueSem);
+               threads_sem_wait(&lr->queueSem);
 
        atomic_add(&lr->queuers, -1);
 }
@@ -1085,7 +1112,7 @@ monitorLockRecord *monitorEnter(threadobject *t, java_objectheader *o)
 
                                /* if the object still refers to lr, replace it by the new mlr */
                                MEMORY_BARRIER_BEFORE_ATOMIC();
-                               nlr = (void*) compare_and_swap((long*) &o->monitorPtr, (long) lr, (long) mlr);
+                               nlr = (monitorLockRecord *) compare_and_swap((long*) &o->monitorPtr, (long) lr, (long) mlr);
                        }
 
                        if (nlr == lr) {