#include <vector>
#include <cstddef>
#include <ucontext.h>
+#include <inttypes.h>
#include "mymemory.h"
-#include "action.h"
#include "hashtable.h"
#include "workqueue.h"
#include "config.h"
#include "modeltypes.h"
/* Forward declaration */
+class Node;
class NodeStack;
class CycleGraph;
class Promise;
class Scheduler;
class Thread;
+class ClockVector;
struct model_snapshot_members;
/** @brief Shorthand for a list of release sequence heads */
typedef std::vector< const ModelAction *, ModelAlloc<const ModelAction *> > rel_heads_list_t;
+typedef std::list< ModelAction *, SnapshotAlloc<ModelAction *> > action_list_t;
+
/**
* Model checker parameter structure. Holds run-time configuration options for
* the model checker.
void remove_thread(Thread *t);
Thread * get_thread(thread_id_t tid) const;
Thread * get_thread(const ModelAction *act) const;
+ int get_promise_number(const Promise *promise) const;
bool is_enabled(Thread *t) const;
bool is_enabled(thread_id_t tid) const;
unsigned int get_num_threads() const;
Thread * get_current_thread() const;
+ void switch_from_master(Thread *thread);
uint64_t switch_to_master(ModelAction *act);
ClockVector * get_cv(thread_id_t tid) const;
ModelAction * get_parent_action(thread_id_t tid) const;
void check_promises_thread_disabled();
- void mo_check_promises(thread_id_t tid, const ModelAction *write, const ModelAction * read);
void check_promises(thread_id_t tid, ClockVector *old_cv, ClockVector *merge_cv);
bool isfeasibleprefix() const;
MEMALLOC
private:
/** The scheduler to use: tracks the running/ready Threads */
- Scheduler *scheduler;
+ Scheduler * const scheduler;
bool sleep_can_read_from(ModelAction *curr, const ModelAction *write);
bool thin_air_constraint_may_allow(const ModelAction *writer, const ModelAction *reader);
void set_bad_synchronization();
bool promises_expired() const;
void execute_sleep_set();
+ 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();
- void set_current_action(ModelAction *act);
ModelAction * check_current_action(ModelAction *curr);
bool initialize_curr_action(ModelAction **curr);
- bool process_read(ModelAction *curr, bool second_part_of_rmw);
+ bool process_read(ModelAction *curr);
bool process_write(ModelAction *curr);
bool process_fence(ModelAction *curr);
bool process_mutex(ModelAction *curr);
bool read_from(ModelAction *act, const ModelAction *rf);
bool check_action_enabled(ModelAction *curr);
- bool take_step(ModelAction *curr);
+ Thread * take_step(ModelAction *curr);
- void check_recency(ModelAction *curr, const ModelAction *rf);
- ModelAction * get_last_conflict(ModelAction *act);
+ bool check_recency(ModelAction *curr, const ModelAction *rf) const;
+ ModelAction * get_last_fence_conflict(ModelAction *act) const;
+ ModelAction * get_last_conflict(ModelAction *act) const;
void set_backtracking(ModelAction *act);
Thread * get_next_thread(ModelAction *curr);
bool set_latest_backtrack(ModelAction *act);
ModelAction * get_next_backtrack();
void reset_to_initial_state();
- bool resolve_promises(ModelAction *curr);
+ int get_promise_to_resolve(const ModelAction *curr) const;
+ bool resolve_promise(ModelAction *curr, unsigned int promise_idx);
void compute_promises(ModelAction *curr);
void compute_relseq_breakwrites(ModelAction *curr);
+ void mo_check_promises(const ModelAction *act, bool is_read_check);
+ void thread_blocking_check_promises(Thread *blocker, Thread *waiting);
+
void check_curr_backtracking(ModelAction *curr);
void add_action_to_lists(ModelAction *act);
ModelAction * get_last_action(thread_id_t tid) const;
ModelAction * get_last_seq_cst_write(ModelAction *curr) const;
ModelAction * get_last_seq_cst_fence(thread_id_t tid, const ModelAction *before_fence) const;
ModelAction * get_last_unlock(ModelAction *curr) const;
- void build_reads_from_past(ModelAction *curr);
+ void build_may_read_from(ModelAction *curr);
ModelAction * process_rmw(ModelAction *curr);
- void post_r_modification_order(ModelAction *curr, const ModelAction *rf);
template <typename rf_type>
bool r_modification_order(ModelAction *curr, const rf_type *rf);
- bool w_modification_order(ModelAction *curr);
+ bool w_modification_order(ModelAction *curr, std::vector< ModelAction *, ModelAlloc<ModelAction *> > *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;
bool resolve_release_sequences(void *location, work_queue_t *work_queue);
ModelAction *earliest_diverge;
ucontext_t system_context;
- action_list_t *action_trace;
- HashTable<int, Thread *, int> *thread_map;
+ action_list_t * const action_trace;
+ HashTable<int, Thread *, int> * const thread_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> *obj_map;
+ HashTable<const void *, action_list_t *, uintptr_t, 4> * const 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> *lock_waiters_map;
+ HashTable<const void *, action_list_t *, uintptr_t, 4> * const lock_waiters_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, 4> * const condvar_waiters_map;
- HashTable<void *, std::vector<action_list_t> *, uintptr_t, 4 > *obj_thrd_map;
- std::vector< Promise *, SnapshotAlloc<Promise *> > *promises;
- std::vector< struct PendingFutureValue, SnapshotAlloc<struct PendingFutureValue> > *futurevalues;
+ HashTable<void *, std::vector<action_list_t> *, uintptr_t, 4 > * const obj_thrd_map;
+ std::vector< Promise *, SnapshotAlloc<Promise *> > * const promises;
+ std::vector< struct PendingFutureValue, SnapshotAlloc<struct PendingFutureValue> > * const futurevalues;
/**
* List of pending release sequences. Release sequences might be
* are established. Each entry in the list may only be partially
* filled, depending on its pending status.
*/
- std::vector< struct release_seq *, SnapshotAlloc<struct release_seq *> > *pending_rel_seqs;
+ std::vector< struct release_seq *, SnapshotAlloc<struct release_seq *> > * const pending_rel_seqs;
- std::vector< ModelAction *, SnapshotAlloc<ModelAction *> > *thrd_last_action;
- std::vector< ModelAction *, SnapshotAlloc<ModelAction *> > *thrd_last_fence_release;
- NodeStack *node_stack;
+ std::vector< ModelAction *, SnapshotAlloc<ModelAction *> > * const thrd_last_action;
+ std::vector< ModelAction *, SnapshotAlloc<ModelAction *> > * const thrd_last_fence_release;
+ NodeStack * const node_stack;
/** Private data members that should be snapshotted. They are grouped
* together for efficiency and maintainability. */
- struct model_snapshot_members *priv;
+ struct model_snapshot_members * const priv;
/** A special model-checker Thread; used for associating with
* model-checker-related ModelAcitons */
* such that <tt>a --> b</tt> means <tt>a</tt> was ordered before
* <tt>b</tt>.
*/
- CycleGraph *mo_graph;
+ CycleGraph * const mo_graph;
/** @brief The cumulative execution stats */
struct execution_stats stats;
projects / c11tester.git / blobdiff