ms-queue: remove more externs and unintended shared data

[model-checker-benchmarks.git] / mcs-lock / mcs-lock.cc

diff --git a/mcs-lock/mcs-lock.cc b/mcs-lock/mcs-lock.cc
index 135085f95b9d26bb43e40815a04e36f4452980f6..ec0cc5df9d55c904d3a5cf9a677f42488371a7bb 100644 (file)
--- a/mcs-lock/mcs-lock.cc
+++ b/mcs-lock/mcs-lock.cc
@@ -3,12 +3,41 @@
 
 #include "mcs-lock.h"
 
+/* For data race instrumentation */
+#include "librace.h"
+
 struct mcs_mutex *mutex;
+static uint32_t shared;
+
+void threadA(void *arg)
+{
+       mcs_mutex::guard g(mutex);
+       printf("store: %d\n", 17);
+       store_32(&shared, 17);
+       mutex->unlock(&g);
+       mutex->lock(&g);
+       printf("load: %u\n", load_32(&shared));
+}
+
+void threadB(void *arg)
+{
+       mcs_mutex::guard g(mutex);
+       printf("load: %u\n", load_32(&shared));
+       mutex->unlock(&g);
+       mutex->lock(&g);
+       printf("store: %d\n", 17);
+       store_32(&shared, 17);
+}
 
 int user_main(int argc, char **argv)
 {
-       mcs_mutex::guard *g = new mcs_mutex::guard(mutex);
-       mutex->lock(g);
-       mutex->unlock(g);
+       thrd_t A, B;
+
+       mutex = new mcs_mutex();
+
+       thrd_create(&A, &threadA, NULL);
+       thrd_create(&B, &threadB, NULL);
+       thrd_join(A);
+       thrd_join(B);
        return 0;
 }