#define VOLATILELOAD(size) \
uint ## size ## _t cds_volatile_load ## size(void * obj, const char * position) { \
ensureModel(); \
- return (uint ## size ## _t)model->switch_to_master(new ModelAction(ATOMIC_READ, position, memory_order_relaxed, obj)); \
+ return (uint ## size ## _t)model->switch_to_master(new ModelAction(ATOMIC_READ, position, memory_order_volatile_load, obj)); \
}
VOLATILELOAD(8)
#define VOLATILESTORE(size) \
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)); \
+ model->switch_to_master(new ModelAction(ATOMIC_WRITE, position, memory_order_volatile_store, obj, (uint64_t) val)); \
*((volatile uint ## size ## _t *)obj) = val; \
thread_id_t tid = thread_current()->get_id(); \
for(int i=0;i < size / 8;i++) { \
*/
void cds_func_entry(const char * funcName) {
+#ifdef NEWFUZZER
ensureModel();
Thread * th = thread_current();
uint32_t func_id;
}
history->enter_function(func_id, th->get_id());
+#endif
}
void cds_func_exit(const char * funcName) {
+#ifdef NEWFUZZER
ensureModel();
Thread * th = thread_current();
return;
history->exit_function(func_id, th->get_id());
+#endif
}
/** Enable mitigations against fork handlers that call into locks... */
#define FORK_HANDLER_HACK
+/** Enable smart fuzzer */
+//#define NEWFUZZER
+
+/** Define semantics of volatile memory operations. */
+#define memory_order_volatile_load memory_order_acquire
+#define memory_order_volatile_store memory_order_release
+
+//#define memory_order_volatile_load memory_order_relaxed
+//#define memory_order_volatile_store memory_order_relaxed
+
#endif
thrd_last_fence_release(),
priv(new struct model_snapshot_members ()),
mo_graph(new CycleGraph()),
+#ifdef NEWFUZZER
+ fuzzer(new NewFuzzer()),
+#else
fuzzer(new Fuzzer()),
+#endif
isfinished(false)
{
/* Initialize a model-checker thread, for special ModelActions */
add_normal_write_to_lists(act);
add_write_to_lists(act);
w_modification_order(act);
+#ifdef NEWFUZZER
model->get_history()->process_action(act, act->get_tid());
+#endif
return act;
}
ASSERT(curr);
/* Process this action in ModelHistory for records */
+#ifdef NEWFUZZER
model->get_history()->process_action( curr, curr->get_tid() );
-
+#endif
if (curr_thrd->is_blocked() || curr_thrd->is_complete())
scheduler->remove_thread(curr_thrd);