X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=ca1de85c980cfa19b2179f9f68ee779bc90097e7;hb=d48c1867f8e5b2a3f9695a6bc8f1b5394dcda8e7;hp=54144f38fc322df9a79edf2e8d0c542f25d027d8;hpb=bf37fce04c3e1bec9d2173a6e2127c6fbb6fd794;p=c11tester.git

diff --git a/model.h b/model.h
index 54144f38..ca1de85c 100644
--- a/model.h
+++ b/model.h
@@ -31,9 +31,9 @@ public:
 	thread_id_t get_tid() { return tid; }
 	action_type get_type() { return type; }
 	memory_order get_mo() { return order; }
-	void *get_location() { return location; }
+	void * get_location() { return location; }
 
-	TreeNode *get_node() { return node; }
+	TreeNode * get_node() { return node; }
 	void set_node(TreeNode *n) { node = n; }
 private:
 	action_type type;
@@ -49,15 +49,19 @@ public:
 	Backtrack(ModelAction *d, action_list_t *t) {
 		diverge = d;
 		actionTrace = t;
-		//currentIterator = actionTrace->getFirst();
+		iter = actionTrace->begin();
+	}
+	ModelAction * get_diverge() { return diverge; }
+	action_list_t * get_trace() { return actionTrace; }
+	void advance_state() { iter++; }
+	ModelAction * get_state() {
+		return iter == actionTrace->end() ? NULL : *iter;
 	}
-	ModelAction *get_diverge() { return diverge; }
-	action_list_t *get_trace() { return actionTrace; }
 private:
 	ModelAction *diverge;
-	/* unused for now; will be used when re-exploring this path? */
-	//MyListElement *currentIterator;
 	action_list_t *actionTrace;
+	/* points to position in actionTrace as we replay */
+	action_list_t::iterator iter;
 };
 
 class ModelChecker {
@@ -70,20 +74,32 @@ public:
 	void add_system_thread(Thread *t);
 
 	void set_current_action(ModelAction *act) { current_action = act; }
-	ModelAction *get_last_conflict(ModelAction *act);
 	void check_current_action(void);
-	void set_backtracking(ModelAction *act);
 	void print_trace(void);
+	Thread * schedule_next_thread();
 
 	int add_thread(Thread *t);
-	Thread *get_thread(thread_id_t tid) { return thread_map[tid]; }
+	void remove_thread(Thread *t);
+	Thread * get_thread(thread_id_t tid) { return thread_map[tid]; }
 
-	void assign_id(Thread *t);
+	int get_next_id();
 
 	int switch_to_master(ModelAction *act);
+
+	bool next_execution();
 private:
 	int used_thread_id;
+	int num_executions;
+
+	ModelAction * get_last_conflict(ModelAction *act);
+	void set_backtracking(ModelAction *act);
+	thread_id_t advance_backtracking_state();
+	thread_id_t get_next_replay_thread();
+
 	class ModelAction *current_action;
+	Backtrack *exploring;
+	thread_id_t nextThread;
+
 	action_list_t *action_trace;
 	std::map<thread_id_t, class Thread *> thread_map;
 	class TreeNode *rootNode, *currentNode;