X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=execution.h;h=9322f55b4c3e0de4ab37502e328d812bf479be68;hb=refs%2Fheads%2Fmaster;hp=7f63e6d99812c98f5732d35c52a1e04f8691ac17;hpb=50e0465f724dc182d5d7504004e93f1a1b4644b9;p=model-checker.git diff --git a/execution.h b/execution.h index 7f63e6d..9322f55 100644 --- a/execution.h +++ b/execution.h @@ -116,6 +116,8 @@ public: action_list_t * get_action_trace() { return &action_trace; } + CycleGraph * const get_mo_graph() { return mo_graph; } + SNAPSHOTALLOC private: int get_execution_number() const; @@ -132,6 +134,7 @@ private: bool mo_may_allow(const ModelAction *writer, const ModelAction *reader); bool promises_may_allow(const ModelAction *writer, const ModelAction *reader) const; void set_bad_synchronization(); + void set_bad_sc_read(); bool promises_expired() const; bool should_wake_up(const ModelAction *curr, const Thread *thread) const; void wake_up_sleeping_actions(ModelAction *curr); @@ -141,7 +144,7 @@ private: ModelAction * check_current_action(ModelAction *curr); bool initialize_curr_action(ModelAction **curr); bool process_read(ModelAction *curr); - bool process_write(ModelAction *curr); + bool process_write(ModelAction *curr, work_queue_t *work); bool process_fence(ModelAction *curr); bool process_mutex(ModelAction *curr); bool process_thread_action(ModelAction *curr); @@ -160,7 +163,8 @@ private: void set_backtracking(ModelAction *act); bool set_latest_backtrack(ModelAction *act); Promise * pop_promise_to_resolve(const ModelAction *curr); - bool resolve_promise(ModelAction *curr, Promise *promise); + bool resolve_promise(ModelAction *curr, Promise *promise, + work_queue_t *work); void compute_promises(ModelAction *curr); void compute_relseq_breakwrites(ModelAction *curr); @@ -183,9 +187,10 @@ private: bool w_modification_order(ModelAction *curr, ModelVector *send_fv); void get_release_seq_heads(ModelAction *acquire, ModelAction *read, rel_heads_list_t *release_heads); bool release_seq_heads(const ModelAction *rf, rel_heads_list_t *release_heads, struct release_seq *pending) const; + void propagate_clockvector(ModelAction *acquire, work_queue_t *work); bool resolve_release_sequences(void *location, work_queue_t *work_queue); void add_future_value(const ModelAction *writer, ModelAction *reader); - + bool check_coherence_promise(const ModelAction *write, const ModelAction *read); ModelAction * get_uninitialized_action(const ModelAction *curr) const; action_list_t action_trace; @@ -200,6 +205,13 @@ private: HashTable condvar_waiters_map; HashTable *, uintptr_t, 4> obj_thrd_map; + + /** + * @brief List of currently-pending promises + * + * Promises are sorted by the execution order of the read(s) which + * created them + */ SnapVector promises; SnapVector futurevalues;