#include "clockvector.h"
#include "hashtable.h"
#include "workqueue.h"
+#include "config.h"
/* Forward declaration */
class NodeStack;
class CycleGraph;
class Promise;
+/** @brief Shorthand for a list of release sequence heads */
+typedef std::vector< const ModelAction *, ModelAlloc<const ModelAction *> > rel_heads_list_t;
+
/**
* Model checker parameter structure. Holds run-time configuration options for
* the model checker.
struct model_params {
int maxreads;
int maxfuturedelay;
+ unsigned int fairwindow;
+ unsigned int enabledcount;
};
struct PendingFutureValue {
modelclock_t used_sequence_numbers;
Thread *nextThread;
ModelAction *next_backtrack;
-
- /** @see ModelChecker::lazy_sync_size */
- unsigned int lazy_sync_size;
};
/** @brief The central structure for model-checking */
/** Prints an execution summary with trace information. */
void print_summary();
+#if SUPPORT_MOD_ORDER_DUMP
+ void dumpGraph(char *filename);
+#endif
void add_thread(Thread *t);
void remove_thread(Thread *t);
thread_id_t get_next_id();
int get_num_threads();
- modelclock_t get_next_seq_num();
-
- /** @return The currently executing Thread. */
- Thread * get_current_thread() { return scheduler->get_current_thread(); }
+ Thread * get_current_thread();
int switch_to_master(ModelAction *act);
ClockVector * get_cv(thread_id_t tid);
bool isfeasibleotherthanRMW();
bool isfinalfeasible();
void check_promises(ClockVector *old_cv, ClockVector * merge_cv);
- void get_release_seq_heads(ModelAction *act,
- std::vector< const ModelAction *, MyAlloc<const ModelAction *> > *release_heads);
+ void get_release_seq_heads(ModelAction *act, rel_heads_list_t *release_heads);
void finish_execution();
bool isfeasibleprefix();
void set_assert() {asserted=true;}
+ /** @brief Alert the model-checker that an incorrectly-ordered
+ * synchronization was made */
+ void set_bad_synchronization() { bad_synchronization = true; }
+
+ const model_params params;
+
MEMALLOC
private:
/** The scheduler to use: tracks the running/ready Threads */
int num_executions;
int num_feasible_executions;
bool promises_expired();
- const model_params params;
+
+ modelclock_t get_next_seq_num();
/**
* Stores the ModelAction for the current thread action. Call this
*/
void set_current_action(ModelAction *act) { priv->current_action = act; }
Thread * check_current_action(ModelAction *curr);
+ ModelAction * initialize_curr_action(ModelAction *curr);
bool process_read(ModelAction *curr, bool second_part_of_rmw);
bool process_write(ModelAction *curr);
+ bool process_mutex(ModelAction *curr);
+ bool process_thread_action(ModelAction *curr);
+ bool check_action_enabled(ModelAction *curr);
bool take_step();
- void check_recency(ModelAction *curr);
+ void check_recency(ModelAction *curr, const ModelAction *rf);
ModelAction * get_last_conflict(ModelAction *act);
void set_backtracking(ModelAction *act);
Thread * get_next_thread(ModelAction *curr);
void check_curr_backtracking(ModelAction * curr);
void add_action_to_lists(ModelAction *act);
- ModelAction * get_last_action(thread_id_t tid);
- ModelAction * get_last_seq_cst(ModelAction *curr);
+ ModelAction * get_last_action(thread_id_t tid) const;
+ ModelAction * get_last_seq_cst(ModelAction *curr) const;
+ ModelAction * get_last_unlock(ModelAction *curr) const;
void build_reads_from_past(ModelAction *curr);
ModelAction * process_rmw(ModelAction *curr);
void post_r_modification_order(ModelAction *curr, const ModelAction *rf);
bool r_modification_order(ModelAction *curr, const ModelAction *rf);
bool w_modification_order(ModelAction *curr);
- bool release_seq_head(const ModelAction *rf,
- std::vector< const ModelAction *, MyAlloc<const ModelAction *> > *release_heads) const;
+ bool release_seq_head(const ModelAction *rf, rel_heads_list_t *release_heads) const;
bool resolve_release_sequences(void *location, work_queue_t *work_queue);
+ void do_complete_join(ModelAction *join);
ModelAction *diverge;
+ ModelAction *earliest_diverge;
ucontext_t system_context;
action_list_t *action_trace;
* to a trace of all actions performed on the object. */
HashTable<const void *, action_list_t, uintptr_t, 4> *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<void *, std::vector<action_list_t>, uintptr_t, 4 > *obj_thrd_map;
std::vector<Promise *> *promises;
std::vector<struct PendingFutureValue> *futurevalues;
/**
- * Collection of lists of objects that might synchronize with one or
- * more release sequence. Release sequences might be determined lazily
- * as promises are fulfilled and modification orders are established.
- * This structure maps its lists by object location. Each ModelAction
- * in the lists should be an acquire operation.
- */
- HashTable<void *, std::list<ModelAction *>, uintptr_t, 4> *lazy_sync_with_release;
-
- /**
- * Represents the total size of the
- * ModelChecker::lazy_sync_with_release lists. This count should be
- * snapshotted, so it is actually a pointer to a location within
- * ModelChecker::priv
+ * List of acquire actions that might synchronize with one or more
+ * release sequence. Release sequences might be determined lazily as
+ * promises are fulfilled and modification orders are established. Each
+ * ModelAction in this list must be an acquire operation.
*/
- unsigned int *lazy_sync_size;
+ std::vector<ModelAction *> *pending_acq_rel_seq;
std::vector<ModelAction *> *thrd_last_action;
NodeStack *node_stack;
bool failed_promise;
bool too_many_reads;
bool asserted;
+ /** @brief Incorrectly-ordered synchronization was made */
+ bool bad_synchronization;
};
extern ModelChecker *model;
projects / model-checker.git / blobdiff