X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=execution.h;h=72efcd6743ae34db51a0a9b75d3f2ce0c08975fc;hb=236e7f6ba12d26eb02a1348858168ed939bcfa0a;hp=421781272c0aa3ae8743bac1b2b85d23460102ff;hpb=0fd64e09bb7a48d62eb724507f8716f1af4dc8d7;p=c11tester.git

diff --git a/execution.h b/execution.h
index 42178127..72efcd67 100644
--- a/execution.h
+++ b/execution.h
@@ -87,8 +87,9 @@ public:
 
 	bool isFinished() {return isfinished;}
 	void setFinished() {isfinished = true;}
-
 	void restore_last_seq_num();
+	void collectActions();
+	modelclock_t get_curr_seq_num();
 #ifdef TLS
 	pthread_key_t getPthreadKey() {return pthreadkey;}
 #endif
@@ -108,8 +109,7 @@ private:
 	void process_thread_action(ModelAction *curr);
 	void read_from(ModelAction *act, ModelAction *rf);
 	bool synchronize(const ModelAction *first, ModelAction *second);
-	void add_uninit_action_to_lists(ModelAction *act);
-	void add_action_to_lists(ModelAction *act);
+	void add_action_to_lists(ModelAction *act, bool canprune);
 	void add_normal_write_to_lists(ModelAction *act);
 	void add_write_to_lists(ModelAction *act);
 	ModelAction * get_last_fence_release(thread_id_t tid) const;
@@ -118,11 +118,12 @@ private:
 	ModelAction * get_last_unlock(ModelAction *curr) const;
 	SnapVector<ModelAction *> * build_may_read_from(ModelAction *curr);
 	ModelAction * process_rmw(ModelAction *curr);
-	bool r_modification_order(ModelAction *curr, const ModelAction *rf, SnapVector<const ModelAction *> *priorset, bool *canprune, bool check_only = false);
+	bool r_modification_order(ModelAction *curr, const ModelAction *rf, SnapVector<ModelAction *> *priorset, bool *canprune, bool check_only = false);
 	void w_modification_order(ModelAction *curr);
 	ClockVector * get_hb_from_write(ModelAction *rf) const;
-	ModelAction * get_uninitialized_action(ModelAction *curr) const;
 	ModelAction * convertNonAtomicStore(void*);
+	ClockVector * computeMinimalCV();
+	void removeAction(ModelAction *act);
 
 #ifdef TLS
 	pthread_key_t pthreadkey;
@@ -132,13 +133,14 @@ private:
 
 	/** The scheduler to use: tracks the running/ready Threads */
 	Scheduler * const scheduler;
-	action_list_t action_trace;
 
 
 	SnapVector<Thread *> thread_map;
 	SnapVector<Thread *> pthread_map;
 	uint32_t pthread_counter;
 
+	action_list_t action_trace;
+
 
 	/** Per-object list of actions. Maps an object (i.e., memory location)
 	 * to a trace of all actions performed on the object.