MFC - Fix an errno leak in libthread_xu's calls to umtx.

diff --git a/lib/libthread_xu/arch/Makefile.inc b/lib/libthread_xu/arch/Makefile.inc
index 9fa3c0d..72b37a3 100644 (file)
--- a/lib/libthread_xu/arch/Makefile.inc
+++ b/lib/libthread_xu/arch/Makefile.inc
@@ -2,4 +2,4 @@
 
 .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
-SRCS+= pthread_md.c
+SRCS+= pthread_md.c _umtx_sleep_wakeup_err.S

diff --git a/lib/libthread_xu/arch/amd64/Makefile.inc b/lib/libthread_xu/arch/amd64/Makefile.inc
index c641b7b..5dac39d 100644 (file)
--- a/lib/libthread_xu/arch/amd64/Makefile.inc
+++ b/lib/libthread_xu/arch/amd64/Makefile.inc
@@ -2,4 +2,4 @@
 
 .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
-SRCS+= pthread_md.c
+SRCS+= pthread_md.c _umtx_sleep_wakeup_err.S

diff --git a/lib/libthread_xu/arch/i386/Makefile.inc b/lib/libthread_xu/arch/i386/Makefile.inc
index cea024c..188e45d 100644 (file)
--- a/lib/libthread_xu/arch/i386/Makefile.inc
+++ b/lib/libthread_xu/arch/i386/Makefile.inc
@@ -2,4 +2,4 @@
 
 .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
-SRCS+= pthread_md.c
+SRCS+= pthread_md.c _umtx_sleep_wakeup_err.S

diff --git a/lib/libthread_xu/thread/thr_private.h b/lib/libthread_xu/thread/thr_private.h
index 980e657..df2f968 100644 (file)
--- a/lib/libthread_xu/thread/thr_private.h
+++ b/lib/libthread_xu/thread/thr_private.h
@@ -686,6 +686,8 @@ void        _thread_bp_death(void);
 int    _thr_getscheduler(lwpid_t, int *, struct sched_param *);
 int    _thr_setscheduler(lwpid_t, int, const struct sched_param *);
 int    _thr_set_sched_other_prio(struct pthread *, int);
+int    _umtx_sleep_err(volatile const int *, int, int);
+int    _umtx_wakeup_err(volatile const int *, int);
 
 /* #include <sys/aio.h> */
 #ifdef _SYS_AIO_H_

diff --git a/lib/libthread_xu/thread/thr_umtx.c b/lib/libthread_xu/thread/thr_umtx.c
index 4dd61a3..2b7b125 100644 (file)
--- a/lib/libthread_xu/thread/thr_umtx.c
+++ b/lib/libthread_xu/thread/thr_umtx.c
@@ -41,16 +41,16 @@
 int
 __thr_umtx_lock(volatile umtx_t *mtx, int timo)
 {
-       int v, ret = 0;
+       int v, errval, ret = 0;
 
        /* contested */
        do {
                v = *mtx;
                if (v == 2 || atomic_cmpset_acq_int(mtx, 1, 2)) {
                        if (timo == 0)
-                               umtx_sleep(mtx, 2, timo);
-                       else if (umtx_sleep(mtx, 2, timo) < 0) {
-                               if (errno == EAGAIN) {
+                               _umtx_sleep_err(mtx, 2, timo);
+                       else if ( (errval = _umtx_sleep_err(mtx, 2, timo)) != 0) {
+                               if (errval == EAGAIN) {
                                        if (atomic_cmpset_acq_int(mtx, 0, 2))
                                                ret = 0;
                                        else
@@ -74,7 +74,7 @@ __thr_umtx_unlock(volatile umtx_t *mtx)
                if (atomic_cmpset_acq_int(mtx, v, v-1)) {
                        if (v != 1) {
                                *mtx = 0;
-                               umtx_wakeup(mtx, 1);
+                               _umtx_wakeup_err(mtx, 1);
                        }
                        break;
                }
@@ -122,20 +122,20 @@ _thr_umtx_wait(volatile umtx_t *mtx, int exp, const struct timespec *timeout,
               int clockid)
 {
     struct timespec ts, ts2, ts3;
-    int timo, ret = 0;
+    int timo, errval, ret = 0;
 
     if (*mtx != exp)
        return (0);
 
     if (timeout == NULL) {
-       while (umtx_sleep(mtx, exp, 10000000) < 0) {
-           if (errno == EBUSY) 
+       while ( (errval = _umtx_sleep_err(mtx, exp, 10000000)) < 0) {
+           if (errval == EBUSY)
                break;
-           if (errno == EINTR) {
+           if (errval == EINTR) {
                ret = EINTR;
                break;
            }
-           if (errno == ETIMEDOUT || errno == EWOULDBLOCK) {
+           if (errval == ETIMEDOUT || errval == EWOULDBLOCK) {
                if (*mtx != exp) {
                    fprintf(stderr, "thr_umtx_wait: FAULT VALUE CHANGE %d -> %d oncond %p\n", exp, *mtx, mtx);
                }
@@ -162,11 +162,11 @@ _thr_umtx_wait(volatile umtx_t *mtx, int exp, const struct timespec *timeout,
        } else {
            timo = 1000000;
        }
-       if (umtx_sleep(mtx, exp, timo) < 0) {
-           if (errno == EBUSY) {
+       if ( (errval = _umtx_sleep_err(mtx, exp, timo)) < 0) {
+           if (errval == EBUSY) {
                ret = 0;
                break;
-           } else if (errno == EINTR) {
+           } else if (errval == EINTR) {
                ret = EINTR;
                break;
            }
@@ -183,5 +183,5 @@ _thr_umtx_wait(volatile umtx_t *mtx, int exp, const struct timespec *timeout,
 
 void _thr_umtx_wake(volatile umtx_t *mtx, int count)
 {
-    umtx_wakeup(mtx, count);
+    _umtx_wakeup_err(mtx, count);
 }