X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=model.h;h=b2f7897a310f7dc66fa88ce970893c43c252059c;hp=9eb9aa655c0285914c48be1414c17d4061171f64;hb=46bea910632f80a1565e50060b0d0444637dfe14;hpb=0accacf66b9f7bb4479205a0840f208dd8da6960

diff --git a/model.h b/model.h
index 9eb9aa6..b2f7897 100644
--- a/model.h
+++ b/model.h
@@ -30,6 +30,20 @@ class Promise;
 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:
@@ -64,14 +78,16 @@ public:
 	                std::vector<const ModelAction *> *release_heads);
 
 	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;
@@ -82,7 +98,7 @@ private:
 	 * 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();
@@ -107,9 +123,7 @@ private:
 	                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;
@@ -131,14 +145,25 @@ private:
 	 */
 	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
@@ -150,8 +175,8 @@ private:
 	 * <tt>b</tt>.
 	 */
 	CycleGraph *mo_graph;
-
 	bool failed_promise;
+	bool asserted;
 };
 
 extern ModelChecker *model;