From: Rob Clark <robdclark@chromium.org>
Date: Tue, 28 Apr 2020 19:39:32 +0000 (-0700)
Subject: util/simple_mtx: add assert_locked()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8aacaeca685c4e705a3237c2187f2f9bcef23339;p=mesa.git

util/simple_mtx: add assert_locked()

Signed-off-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4810>
---

diff --git a/src/util/simple_mtx.h b/src/util/simple_mtx.h
index 4fc8a0d4df4..ec3889497f3 100644
--- a/src/util/simple_mtx.h
+++ b/src/util/simple_mtx.h
@@ -113,6 +113,12 @@ simple_mtx_unlock(simple_mtx_t *mtx)
    }
 }
 
+static inline void
+simple_mtx_assert_locked(simple_mtx_t *mtx)
+{
+   assert(mtx->val);
+}
+
 #else
 
 typedef mtx_t simple_mtx_t;
@@ -143,6 +149,22 @@ simple_mtx_unlock(simple_mtx_t *mtx)
    mtx_unlock(mtx);
 }
 
+static inline void
+simple_mtx_assert_locked(simple_mtx_t *mtx)
+{
+#ifdef DEBUG
+   /* NOTE: this would not work for recursive mutexes, but
+    * mtx_t doesn't support those
+    */
+   int ret = mtx_trylock(mtx);
+   assert(ret == thrd_busy);
+   if (ret == thrd_success)
+      mtx_unlock(mtx);
+#else
+   (void)mtx;
+#endif
+}
+
 #endif
 
 #endif