struct model_params {
};
+/**
+ * Structure for holding small ModelChecker members that should be snapshotted
+ */
+struct model_snapshot_members {
+ ModelAction *current_action;
+ int next_thread_id;
+ 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 */
class ModelChecker {
public:
/** @return The currently executing Thread. */
Thread * get_current_thread() { return scheduler->get_current_thread(); }
- void assert_thread();
int switch_to_master(ModelAction *act);
ClockVector * get_cv(thread_id_t tid);
ModelAction * get_parent_action(thread_id_t tid);
void finish_execution();
bool isfeasibleprefix();
+ void set_assert() {asserted=true;}
MEMALLOC
private:
/** The scheduler to use: tracks the running/ready Threads */
Scheduler *scheduler;
- int next_thread_id;
- modelclock_t used_sequence_numbers;
+ bool has_asserted() {return asserted;}
+ void reset_asserted() {asserted=false;}
int num_executions;
const model_params params;
* data between them.
* @param act The ModelAction created by the user-thread action
*/
- void set_current_action(ModelAction *act) { current_action = act; }
+ void set_current_action(ModelAction *act) { priv->current_action = act; }
Thread * check_current_action(ModelAction *curr);
bool take_step();
ModelAction * get_last_conflict(ModelAction *act);
void set_backtracking(ModelAction *act);
- Thread * get_next_replay_thread();
+ Thread * get_next_thread(ModelAction *curr);
ModelAction * get_next_backtrack();
void reset_to_initial_state();
bool resolve_promises(ModelAction *curr);
std::vector<const ModelAction *> *release_heads) const;
bool resolve_release_sequences(void *location);
- ModelAction *current_action;
ModelAction *diverge;
- Thread *nextThread;
ucontext_t system_context;
action_list_t *action_trace;
*/
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
+ */
+ unsigned int *lazy_sync_size;
+
std::vector<ModelAction *> *thrd_last_action;
NodeStack *node_stack;
- ModelAction *next_backtrack;
+
+ /** Private data members that should be snapshotted. They are grouped
+ * together for efficiency and maintainability. */
+ struct model_snapshot_members *priv;
/**
* @brief The modification order graph
*
- * A direceted acyclic graph recording observations of the modification
+ * A directed acyclic graph recording observations of the modification
* order on all the atomic objects in the system. This graph should
* never contain any cycles, as that represents a violation of the
* memory model (total ordering). This graph really consists of many
* <tt>b</tt>.
*/
CycleGraph *mo_graph;
-
bool failed_promise;
+ bool asserted;
};
extern ModelChecker *model;