X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=cmodelint.cc;h=47aef05f28a1c61e72101e171e59da02354c5f09;hp=6b20c2cc9c800378de4b2255fc94e7a7646516d7;hb=92dd847e38280a3bb0ec93781c47173a3848f1d7;hpb=81ea453e58cbb85fddff3aa8919dfbc59c3140eb

diff --git a/cmodelint.cc b/cmodelint.cc
index 6b20c2cc..47aef05f 100644
--- a/cmodelint.cc
+++ b/cmodelint.cc
@@ -1,11 +1,11 @@
 #include "model.h"
+#include "action.h"
 #include "cmodelint.h"
-#include "threads.h"
+#include "threads-model.h"
 
 /** Performs a read action.*/
 uint64_t model_read_action(void * obj, memory_order ord) {
-	model->switch_to_master(new ModelAction(ATOMIC_READ, ord, obj));
-	return thread_current()->get_return_value();
+	return model->switch_to_master(new ModelAction(ATOMIC_READ, ord, obj));
 }
 
 /** Performs a write action.*/
@@ -24,8 +24,7 @@ void model_init_action(void * obj, uint64_t val) {
  * a write.
  */
 uint64_t model_rmwr_action(void *obj, memory_order ord) {
-	model->switch_to_master(new ModelAction(ATOMIC_RMWR, ord, obj));
-	return thread_current()->get_return_value();
+	return model->switch_to_master(new ModelAction(ATOMIC_RMWR, ord, obj));
 }
 
 /** Performs the write part of a RMW action. */