Thread * take_step(ModelAction *curr);
- void print_summary() const;
+ void print_summary();
#if SUPPORT_MOD_ORDER_DUMP
- void dumpGraph(char *filename) const;
+ void dumpGraph(char *filename);
#endif
void add_thread(Thread *t);
ClockVector * get_cv(thread_id_t tid) const;
ModelAction * get_parent_action(thread_id_t tid) const;
- bool isfeasibleprefix() const;
ModelAction * get_last_action(thread_id_t tid) const;
bool check_action_enabled(ModelAction *curr);
- bool assert_bug(const char *msg);
+ void assert_bug(const char *msg);
+
bool have_bug_reports() const;
+
SnapVector<bug_message *> * get_bugs() const;
bool has_asserted() const;
void set_assert();
bool is_complete_execution() const;
- void print_infeasibility(const char *prefix) const;
- bool is_infeasible() const;
bool is_deadlocked() const;
action_list_t * get_action_trace() { return &action_trace; }
HashTable<pthread_mutex_t *, cdsc::snapmutex *, uintptr_t, 4> * getMutexMap() {return &mutex_map;}
ModelAction * check_current_action(ModelAction *curr);
- SnapVector<func_id_list_t *> * get_thrd_func_list() { return &thrd_func_list; }
- SnapVector< SnapList<func_inst_list_t *> *> * get_thrd_func_inst_lists() { return &thrd_func_inst_lists; }
+ SnapVector<func_id_list_t> * get_thrd_func_list() { return &thrd_func_list; }
+ SnapVector<uint32_t> * get_thrd_last_entered_func() { return &thrd_last_entered_func; }
+ SnapVector< SnapList<action_list_t *> *> * get_thrd_func_act_lists() { return &thrd_func_act_lists; }
+ bool isFinished() {return isfinished;}
+ void setFinished() {isfinished = true;}
+ void restore_last_seq_num();
+#ifdef TLS
+ pthread_key_t getPthreadKey() {return pthreadkey;}
+#endif
SNAPSHOTALLOC
private:
int get_execution_number() const;
-
- ModelChecker *model;
-
- struct model_params * params;
-
- /** The scheduler to use: tracks the running/ready Threads */
- Scheduler * const scheduler;
-
bool mo_may_allow(const ModelAction *writer, const ModelAction *reader);
- void set_bad_synchronization();
bool should_wake_up(const ModelAction *curr, const Thread *thread) const;
void wake_up_sleeping_actions(ModelAction *curr);
modelclock_t get_next_seq_num();
-
bool next_execution();
bool initialize_curr_action(ModelAction **curr);
- void process_read(ModelAction *curr, SnapVector<ModelAction *> * rf_set);
+ bool process_read(ModelAction *curr, SnapVector<ModelAction *> * rf_set);
void process_write(ModelAction *curr);
bool process_fence(ModelAction *curr);
bool process_mutex(ModelAction *curr);
-
- bool process_thread_action(ModelAction *curr);
+ void process_thread_action(ModelAction *curr);
void read_from(ModelAction *act, ModelAction *rf);
bool synchronize(const ModelAction *first, ModelAction *second);
-
+ void add_uninit_action_to_lists(ModelAction *act);
void add_action_to_lists(ModelAction *act);
+ void add_normal_write_to_lists(ModelAction *act);
void add_write_to_lists(ModelAction *act);
ModelAction * get_last_fence_release(thread_id_t tid) const;
ModelAction * get_last_seq_cst_write(ModelAction *curr) const;
ModelAction * get_last_unlock(ModelAction *curr) const;
SnapVector<ModelAction *> * build_may_read_from(ModelAction *curr);
ModelAction * process_rmw(ModelAction *curr);
-
- bool r_modification_order(ModelAction *curr, const ModelAction *rf, SnapVector<const ModelAction *> *priorset, bool *canprune);
+ bool r_modification_order(ModelAction *curr, const ModelAction *rf, SnapVector<const ModelAction *> *priorset, bool *canprune, bool check_only = false);
void w_modification_order(ModelAction *curr);
ClockVector * get_hb_from_write(ModelAction *rf) const;
ModelAction * get_uninitialized_action(ModelAction *curr) const;
+ ModelAction * convertNonAtomicStore(void*);
+#ifdef TLS
+ pthread_key_t pthreadkey;
+#endif
+ ModelChecker *model;
+ struct model_params * params;
+
+ /** The scheduler to use: tracks the running/ready Threads */
+ Scheduler * const scheduler;
action_list_t action_trace;
+
+
SnapVector<Thread *> thread_map;
SnapVector<Thread *> pthread_map;
uint32_t pthread_counter;
+
/** Per-object list of actions. Maps an object (i.e., memory location)
- * to a trace of all actions performed on the object. */
- HashTable<const void *, action_list_t *, uintptr_t, 4> obj_map;
+ * to a trace of all actions performed on the object.
+ * Used only for SC fences, unlocks, & wait.
+ */
+ HashTable<const void *, action_list_t *, uintptr_t, 2> obj_map;
/** Per-object list of actions. Maps an object (i.e., memory location)
* to a trace of all actions performed on the object. */
- HashTable<const void *, action_list_t *, uintptr_t, 4> condvar_waiters_map;
+ HashTable<const void *, action_list_t *, uintptr_t, 2> condvar_waiters_map;
- HashTable<const void *, SnapVector<action_list_t> *, uintptr_t, 4> obj_thrd_map;
+ /** Per-object list of actions that each thread performed. */
+ HashTable<const void *, SnapVector<action_list_t> *, uintptr_t, 2> obj_thrd_map;
- HashTable<const void *, SnapVector<action_list_t> *, uintptr_t, 4> obj_wr_thrd_map;
+ /** Per-object list of writes that each thread performed. */
+ HashTable<const void *, SnapVector<action_list_t> *, uintptr_t, 2> obj_wr_thrd_map;
HashTable<const void *, ModelAction *, uintptr_t, 4> obj_last_sc_map;
Fuzzer * fuzzer;
Thread * action_select_next_thread(const ModelAction *curr) const;
+ bool paused_by_fuzzer(const ModelAction * act) const;
- /* thrd_func_list stores a list of function ids for each thread.
+ /* thrd_func_list stores a list of function ids for each thread.
* Each element in thrd_func_list stores the functions that
- * thread i has entered and yet to exit from
+ * thread i has entered and yet to exit from
*
* This data structure is handled by ModelHistory
*/
- SnapVector< func_id_list_t * > thrd_func_list;
+ SnapVector<func_id_list_t> thrd_func_list;
+ SnapVector<uint32_t> thrd_last_entered_func;
/* Keeps track of atomic actions that thread i has performed in some
- * function. Index of SnapVector is thread id. SnapList simulates
- * the call stack.
- *
- * This data structure is handled by ModelHistory
+ * function. Index of SnapVector is thread id. SnapList simulates
+ * the call stack.
*/
- SnapVector< SnapList< func_inst_list_t *> *> thrd_func_inst_lists;
+ SnapVector< SnapList<action_list_t *> *> thrd_func_act_lists;
+ bool isfinished;
};
#endif /* __EXECUTION_H__ */
projects / c11tester.git / blobdiff