projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
snapshot-interface: don't snapshot libmodel.so
[model-checker.git]
/
cmodelint.cc
diff --git
a/cmodelint.cc
b/cmodelint.cc
index 228c40f9ec8d02b1a7b9c599a6cf69fc1c4ebf78..1632581101e0c5801f8ba14c05d3d12e1fa4c94c 100644
(file)
--- a/
cmodelint.cc
+++ b/
cmodelint.cc
@@
-1,10
+1,11
@@
#include "model.h"
#include "model.h"
+#include "action.h"
#include "cmodelint.h"
#include "cmodelint.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.*/
@@
-23,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. */
@@
-39,5
+39,5
@@
void model_rmwc_action(void *obj, memory_order ord) {
/** Issues a fence operation. */
void model_fence_action(memory_order ord) {
/** Issues a fence operation. */
void model_fence_action(memory_order ord) {
- model->switch_to_master(new ModelAction(ATOMIC_FENCE, ord,
NULL
));
+ model->switch_to_master(new ModelAction(ATOMIC_FENCE, ord,
FENCE_LOCATION
));
}
}