#include "threads-model.h"
#include "datarace.h"
-memory_order orders[8] = {
+memory_order orders[7] = {
memory_order_relaxed, memory_order_consume, memory_order_acquire,
memory_order_release, memory_order_acq_rel, memory_order_seq_cst,
};
void cds_volatile_store ## size (void * obj, uint ## size ## _t val, const char * position) { \
ensureModel(); \
model->switch_to_master(new ModelAction(ATOMIC_WRITE, position, memory_order_relaxed, obj, (uint64_t) val)); \
- *((volatile uint ## size ## _t *)obj) = val; \
+ *((volatile uint ## size ## _t *)obj) = val; \
+ thread_id_t tid = thread_current()->get_id(); \
+ for(int i=0;i < size / 8;i++) { \
+ recordWrite(tid, (void *)(((char *)obj)+i)); \
+ } \
}
VOLATILESTORE(8)
*/
void cds_func_entry(const char * funcName) {
- if (!model) return;
-
+ ensureModel();
+ /*
Thread * th = thread_current();
uint32_t func_id;
}
history->enter_function(func_id, th->get_id());
+*/
}
void cds_func_exit(const char * funcName) {
- if (!model) return;
+ ensureModel();
- Thread * th = thread_current();
+/* Thread * th = thread_current();
uint32_t func_id;
ModelHistory *history = model->get_history();
func_id = history->getFuncMap()->get(funcName);
- /* func_id not found; this could happen in the case where a function calls cds_func_entry
+ * func_id not found; this could happen in the case where a function calls cds_func_entry
* when the model has been defined yet, but then an atomic inside the function initializes
* the model. And then cds_func_exit is called upon the function exiting.
- */
+ *
if (func_id == 0)
return;
history->exit_function(func_id, th->get_id());
+*/
}