X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=model.h;h=1a2f6a145715fb7b8318eca7522048475ef9b436;hp=9235f8f7f306a88a857361e281157148f102bf4f;hb=1bc8782b55cab0503f1b64529f993f0b9e3a1846;hpb=c5b57f3d98d1d14b4546995a0882753cf71a1c4b

diff --git a/model.h b/model.h
index 9235f8f7..1a2f6a14 100644
--- a/model.h
+++ b/model.h
@@ -28,6 +28,22 @@ class Promise;
  * the model checker.
  */
 struct model_params {
+	int maxreads;
+	int maxfuturedelay;
+};
+
+/**
+ * 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 */
@@ -45,6 +61,7 @@ public:
 	void add_thread(Thread *t);
 	void remove_thread(Thread *t);
 	Thread * get_thread(thread_id_t tid) { return thread_map->get(id_to_int(tid)); }
+	Thread * get_thread(ModelAction *act) { return get_thread(act->get_tid()); }
 
 	thread_id_t get_next_id();
 	int get_num_threads();
@@ -53,7 +70,6 @@ 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);
@@ -66,16 +82,17 @@ public:
 
 	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;
-
+	bool promises_expired();
 	const model_params params;
 
 	/**
@@ -84,14 +101,16 @@ 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 process_read(ModelAction *curr, Thread * th, bool second_part_of_rmw);
 
 	bool take_step();
 
+	void check_recency(ModelAction *curr, bool already_added);
 	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);
@@ -109,9 +128,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;
@@ -133,14 +150,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
@@ -152,8 +180,9 @@ private:
 	 * <tt>b</tt>.
 	 */
 	CycleGraph *mo_graph;
-
 	bool failed_promise;
+	bool too_many_reads;
+	bool asserted;
 };
 
 extern ModelChecker *model;