gallium/gallivm: enable linking lp_bld_printf function with C++ code

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

diff --git a/src/util/simple_mtx.h b/src/util/simple_mtx.h
index cfb82ba56c18ed14ec7c81aff4f16a990f368b8e..b23c8d2133dd5e446dbaaac813141cf411416ea4 100644 (file)
--- a/src/util/simple_mtx.h
+++ b/src/util/simple_mtx.h
@@ -60,8 +60,10 @@ typedef struct {
 
 #define _SIMPLE_MTX_INITIALIZER_NP { 0 }
 
+#define _SIMPLE_MTX_INVALID_VALUE 0xd0d0d0d0
+
 static inline void
-simple_mtx_init(simple_mtx_t *mtx, MAYBE_UNUSED int type)
+simple_mtx_init(simple_mtx_t *mtx, ASSERTED int type)
 {
    assert(type == mtx_plain);
 
@@ -69,8 +71,11 @@ simple_mtx_init(simple_mtx_t *mtx, MAYBE_UNUSED 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 +84,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 +103,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);