2 files changed, 16 insertions, 4 deletions
diff --git a/erts/include/internal/ethr_mutex.h b/erts/include/internal/ethr_mutex.h
index ee861065c5..6c931e0cd4 100644
--- a/erts/include/internal/ethr_mutex.h
+++ b/erts/include/internal/ethr_mutex.h
@@ -354,7 +354,7 @@ void ethr_rwmutex_rwunlock(ethr_rwmutex *);
 
 #ifdef ETHR_MTX_HARD_DEBUG
 #define ETHR_MTX_HARD_ASSERT(A) \
-  ((void) ((A) ? 1 : ethr_assert_failed(__FILE__, __LINE__, #A)))
+  ((void) ((A) ? 1 : ethr_assert_failed(__FILE__, __LINE__, __func__,#A)))
 #else
 #define ETHR_MTX_HARD_ASSERT(A) ((void) 1)
 #endif
diff --git a/erts/include/internal/ethread.h b/erts/include/internal/ethread.h
index a3558167ed..31d19902f5 100644
--- a/erts/include/internal/ethread.h
+++ b/erts/include/internal/ethread.h
@@ -404,6 +404,18 @@ extern ethr_runtime_t ethr_runtime__;
 
 #include "ethr_atomics.h" /* The atomics API */
 
+#if defined (ETHR_OSE_THREADS)
+static ETHR_INLINE void
+ose_yield(void)
+{
+    if (get_ptype(current_process()) == OS_PRI_PROC) {
+        set_pri(get_pri(current_process()));
+    } else {
+        delay(1);
+    }
+}
+#endif
+
 #if defined(__GNUC__) && !defined(ETHR_OSE_THREADS)
 #  ifndef ETHR_SPIN_BODY
 #    if defined(__i386__) || defined(__x86_64__)
@@ -422,9 +434,9 @@ extern ethr_runtime_t ethr_runtime__;
 #  endif
 #elif defined(ETHR_OSE_THREADS)
 #  ifndef ETHR_SPIN_BODY
-#    define ETHR_SPIN_BODY set_pri(get_pri(current_process()))
+#    define ETHR_SPIN_BODY ose_yield()
 #  else
-#    error "OSE should use set_pri(get_pri(current_process()))"
+#    error "OSE should use ose_yield()"
 #  endif
 #endif
 
@@ -457,7 +469,7 @@ extern ethr_runtime_t ethr_runtime__;
 #      define ETHR_YIELD() (pthread_yield(), 0)
 #    endif
 #  elif defined(ETHR_OSE_THREADS)
-#    define ETHR_YIELD() (set_pri(get_pri(current_process())), 0)
+#    define ETHR_YIELD() (ose_yield(), 0)
 #  else
 #    define ETHR_YIELD() (ethr_compiler_barrier(), 0)
 #  endif