model: fully utilize Promise nodes in CycleGraph

[model-checker.git] / impatomic.cc

diff --git a/impatomic.cc b/impatomic.cc
index df11202d8ade74f9e677bd8ebb46b2fc1bf062cd..c10c43e596682a960896f1cef7380e1dea5de9f7 100644 (file)
--- a/impatomic.cc
+++ b/impatomic.cc
@@ -1,13 +1,13 @@
 #include "impatomic.h"
 #include "common.h"
 #include "model.h"
+#include "threads-model.h"
 
 namespace std {
 
 bool atomic_flag_test_and_set_explicit ( volatile atomic_flag * __a__, memory_order __x__ ) {
        volatile bool * __p__ = &((__a__)->__f__);
-       model->switch_to_master(new ModelAction(ATOMIC_RMWR, __x__, (void *) __p__));
-       bool result = (bool) thread_current()->get_return_value();
+       bool result = (bool) model->switch_to_master(new ModelAction(ATOMIC_RMWR, __x__, (void *) __p__));
        model->switch_to_master(new ModelAction(ATOMIC_RMW, __x__, (void *) __p__, true));
        return result;
 }
@@ -25,11 +25,6 @@ void atomic_flag_clear_explicit
 void atomic_flag_clear( volatile atomic_flag* __a__ )
 { atomic_flag_clear_explicit( __a__, memory_order_seq_cst ); }
 
-void atomic_flag_fence( const volatile atomic_flag* __a__, memory_order __x__ )
-{
-       ASSERT(0);
-}
-
 void __atomic_flag_wait__( volatile atomic_flag* __a__ )
 { while ( atomic_flag_test_and_set( __a__ ) ); }