projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move license to LICENSE file
[c11tester.git]
/
cmodelint.cc
diff --git
a/cmodelint.cc
b/cmodelint.cc
index 6b20c2cc9c800378de4b2255fc94e7a7646516d7..47aef05f28a1c61e72101e171e59da02354c5f09 100644
(file)
--- a/
cmodelint.cc
+++ b/
cmodelint.cc
@@
-1,11
+1,11
@@
#include "model.h"
#include "model.h"
+#include "action.h"
#include "cmodelint.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) {
/** 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.*/
}
/** 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) {
* 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. */
}
/** Performs the write part of a RMW action. */