util/ra: Use util_dynarray for handling the conflict lists.

[mesa.git] / src / util / simple_mtx.h

diff --git a/src/util/simple_mtx.h b/src/util/simple_mtx.h
index 94ab6fcef1ff469a340a5bb36c4e24c1f41aeaba..4fc8a0d4df49edb659dc7ae3457a351f61cd6ef8 100644 (file)
--- a/src/util/simple_mtx.h
+++ b/src/util/simple_mtx.h
@@ -25,6 +25,7 @@
 #define _SIMPLE_MTX_H
 
 #include "util/futex.h"
+#include "util/macros.h"
 
 #include "c11/threads.h"
 
@@ -60,6 +61,8 @@ typedef struct {
 
 #define _SIMPLE_MTX_INITIALIZER_NP { 0 }
 
+#define _SIMPLE_MTX_INVALID_VALUE 0xd0d0d0d0
+
 static inline void
 simple_mtx_init(simple_mtx_t *mtx, ASSERTED int type)
 {
@@ -69,8 +72,11 @@ simple_mtx_init(simple_mtx_t *mtx, ASSERTED int type)
 }
 
 static inline void
-simple_mtx_destroy(UNUSED simple_mtx_t *mtx)
+simple_mtx_destroy(ASSERTED simple_mtx_t *mtx)
 {
+#ifndef NDEBUG
+   mtx->val = _SIMPLE_MTX_INVALID_VALUE;
+#endif
 }
 
 static inline void
@@ -79,6 +85,9 @@ simple_mtx_lock(simple_mtx_t *mtx)
    uint32_t c;
 
    c = __sync_val_compare_and_swap(&mtx->val, 0, 1);
+
+   assert(c != _SIMPLE_MTX_INVALID_VALUE);
+
    if (__builtin_expect(c != 0, 0)) {
       if (c != 2)
          c = __sync_lock_test_and_set(&mtx->val, 2);
@@ -95,6 +104,9 @@ simple_mtx_unlock(simple_mtx_t *mtx)
    uint32_t c;
 
    c = __sync_fetch_and_sub(&mtx->val, 1);
+
+   assert(c != _SIMPLE_MTX_INVALID_VALUE);
+
    if (__builtin_expect(c != 1, 0)) {
       mtx->val = 0;
       futex_wake(&mtx->val, 1);