action: add 'reads_from' member variable

[model-checker.git] / libatomic.cc

diff --git a/libatomic.cc b/libatomic.cc
index 6734148dc2cdd117998c111903c83b2457b4be29..531731966a862cacd2f704fa26163f6851cd6d52 100644 (file)
--- a/libatomic.cc
+++ b/libatomic.cc
@@ -5,13 +5,20 @@
 void atomic_store_explicit(struct atomic_object *obj, int value, memory_order order)
 {
        DBG();
-       model->switch_to_master(new ModelAction(ATOMIC_WRITE, order, obj, value));
        obj->value = value;
+       model->switch_to_master(new ModelAction(ATOMIC_WRITE, order, obj, value));
 }
 
 int atomic_load_explicit(struct atomic_object *obj, memory_order order)
 {
        DBG();
-       model->switch_to_master(new ModelAction(ATOMIC_READ, order, obj, VALUE_NONE));
-       return obj->value;
+       model->switch_to_master(new ModelAction(ATOMIC_READ, order, obj));
+       return thread_current()->get_return_value();
+}
+
+void atomic_init(struct atomic_object *obj, int value)
+{
+       DBG();
+       obj->value = value;
+       model->switch_to_master(new ModelAction(ATOMIC_INIT, memory_order_relaxed, obj, value));
 }