2 files changed, 27 insertions, 47 deletions

diff --git a/erts/lib_src/pthread/ethr_event.c b/erts/lib_src/pthread/ethr_event.c
index 6731c0eb46..9434d60d0a 100644
--- a/erts/lib_src/pthread/ethr_event.c
+++ b/erts/lib_src/pthread/ethr_event.c
@@ -24,6 +24,10 @@
 #define ETHR_INLINE_FUNC_NAME_(X) X ## __
 #define ETHR_EVENT_IMPL__
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "ethread.h"
 
 #if defined(ETHR_LINUX_FUTEX_IMPL__)
@@ -37,7 +41,7 @@
 int
 ethr_event_init(ethr_event *e)
 {
-    ethr_atomic_init(&e->futex, ETHR_EVENT_OFF__);
+    ethr_atomic32_init(&e->futex, ETHR_EVENT_OFF__);
     return 0;
 }
 
@@ -52,7 +56,7 @@ wait__(ethr_event *e, int spincount)
 {
     unsigned sc = spincount;
     int res;
-    long val;
+    ethr_sint32_t val;
     int until_yield = ETHR_YIELD_AFTER_BUSY_LOOPS;
 
     if (spincount < 0)
@@ -60,7 +64,7 @@ wait__(ethr_event *e, int spincount)
 
     while (1) {
 	while (1) {
-	    val = ethr_atomic_read(&e->futex);
+	    val = ethr_atomic32_read(&e->futex);
 	    if (val == ETHR_EVENT_ON__)
 		return 0;
 	    if (sc == 0)
@@ -76,16 +80,18 @@ wait__(ethr_event *e, int spincount)
 	}
 
 	if (val != ETHR_EVENT_OFF_WAITER__) {
-	    val = ethr_atomic_cmpxchg(&e->futex,
-				      ETHR_EVENT_OFF_WAITER__,
-				      ETHR_EVENT_OFF__);
+	    val = ethr_atomic32_cmpxchg(&e->futex,
+					ETHR_EVENT_OFF_WAITER__,
+					ETHR_EVENT_OFF__);
 
 	    if (val == ETHR_EVENT_ON__)
 		return 0;
 	    ETHR_ASSERT(val == ETHR_EVENT_OFF__);
 	}
 
-	res = ETHR_FUTEX__(&e->futex, ETHR_FUTEX_WAIT__, ETHR_EVENT_OFF_WAITER__);
+	res = ETHR_FUTEX__(&e->futex,
+			   ETHR_FUTEX_WAIT__,
+			   ETHR_EVENT_OFF_WAITER__);
 	if (res == EINTR)
 	    break;
 	if (res != 0 && res != EWOULDBLOCK)
@@ -102,7 +108,7 @@ int
 ethr_event_init(ethr_event *e)
 {
     int res;
-    ethr_atomic_init(&e->state, ETHR_EVENT_OFF__);
+    ethr_atomic32_init(&e->state, ETHR_EVENT_OFF__);
     res = pthread_mutex_init(&e->mtx, NULL);
     if (res != 0)
 	return res;
@@ -131,7 +137,7 @@ static ETHR_INLINE int
 wait__(ethr_event *e, int spincount)
 {
     int sc = spincount;
-    long val;
+    ethr_sint32_t val;
     int res, ulres;
     int until_yield = ETHR_YIELD_AFTER_BUSY_LOOPS;
 
@@ -139,7 +145,7 @@ wait__(ethr_event *e, int spincount)
 	ETHR_FATAL_ERROR__(EINVAL);
 
     while (1) {
-	val = ethr_atomic_read(&e->state);
+	val = ethr_atomic32_read(&e->state);
 	if (val == ETHR_EVENT_ON__)
 	    return 0;
 	if (sc == 0)
@@ -155,9 +161,9 @@ wait__(ethr_event *e, int spincount)
     }
 
     if (val != ETHR_EVENT_OFF_WAITER__) {
-	val = ethr_atomic_cmpxchg(&e->state,
-				  ETHR_EVENT_OFF_WAITER__,
-				  ETHR_EVENT_OFF__);
+	val = ethr_atomic32_cmpxchg(&e->state,
+				    ETHR_EVENT_OFF_WAITER__,
+				    ETHR_EVENT_OFF__);
 	if (val == ETHR_EVENT_ON__)
 	    return 0;
 	ETHR_ASSERT(val == ETHR_EVENT_OFF__);
@@ -172,7 +178,7 @@ wait__(ethr_event *e, int spincount)
 
     while (1) {
 
-	val = ethr_atomic_read(&e->state);
+	val = ethr_atomic32_read(&e->state);
 	if (val == ETHR_EVENT_ON__)
 	    break;
 
diff --git a/erts/lib_src/pthread/ethread.c b/erts/lib_src/pthread/ethread.c
index ea1d9d43f0..f047104103 100644
--- a/erts/lib_src/pthread/ethread.c
+++ b/erts/lib_src/pthread/ethread.c
@@ -72,7 +72,7 @@ static void thr_exit_cleanup(void)
 
 /* Argument passed to thr_wrapper() */
 typedef struct {
-    ethr_atomic_t result;
+    ethr_atomic32_t result;
     ethr_ts_event *tse;
     void *(*thr_func)(void *);
     void *arg;
@@ -81,14 +81,14 @@ typedef struct {
 
 static void *thr_wrapper(void *vtwd)
 {
-    long result;
+    ethr_sint32_t result;
     void *res;
     ethr_thr_wrap_data__ *twd = (ethr_thr_wrap_data__ *) vtwd;
     void *(*thr_func)(void *) = twd->thr_func;
     void *arg = twd->arg;
     ethr_ts_event *tsep = NULL;
 
-    result = (long) ethr_make_ts_event__(&tsep);
+    result = (ethr_sint32_t) ethr_make_ts_event__(&tsep);
 
     if (result == 0) {
 	tsep->iflgs |= ETHR_TS_EV_ETHREAD;
@@ -99,7 +99,7 @@ static void *thr_wrapper(void *vtwd)
     tsep = twd->tse; /* We aren't allowed to follow twd after
 			result has been set! */
 
-    ethr_atomic_set(&twd->result, result);
+    ethr_atomic32_set(&twd->result, result);
 
     ethr_event_set(&tsep->event);
 
@@ -191,7 +191,7 @@ ethr_thr_create(ethr_tid *tid, void * (*func)(void *), void *arg,
     }
 #endif
 
-    ethr_atomic_init(&twd.result, -1);
+    ethr_atomic32_init(&twd.result, (ethr_sint32_t) -1);
     twd.tse = ethr_get_ts_event();
     twd.thr_func = func;
     twd.arg = arg;
@@ -252,10 +252,10 @@ ethr_thr_create(ethr_tid *tid, void * (*func)(void *), void *arg,
 
 	/* Wait for child to initialize... */
 	while (1) {
-	    long result;
+	    ethr_sint32_t result;
 	    ethr_event_reset(&twd.tse->event);
 
-	    result = ethr_atomic_read(&twd.result);
+	    result = ethr_atomic32_read(&twd.result);
 	    if (result == 0)
 		break;
 
@@ -349,32 +349,6 @@ ethr_leave_ts_event(ethr_ts_event *tsep)
 }
 
 /*
- * Current time
- */
-
-int
-ethr_time_now(ethr_timeval *time)
-{
-    int res;
-    struct timeval tv;
-#if ETHR_XCHK
-    if (ethr_not_inited__) {
-	ETHR_ASSERT(0);
-	return EACCES;
-    }
-    if (!time) {
-	ETHR_ASSERT(0);
-	return EINVAL;
-    }
-#endif
-
-    res = gettimeofday(&tv, NULL);
-    time->tv_sec = (long) tv.tv_sec;
-    time->tv_nsec = ((long) tv.tv_usec)*1000;
-    return res;
-}
-
-/*
  * Thread specific data
  */