X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=execution.h;h=5e80e186e01d95677c11e46d677d437a87b60386;hb=HEAD;hp=5158b2a677e9df79e41bd050e045cc0ec15c48ce;hpb=c7a5091afba87a67423c0797fa001914ce9e2ff4;p=c11tester.git

diff --git a/execution.h b/execution.h
index 5158b2a6..5e80e186 100644
--- a/execution.h
+++ b/execution.h
@@ -19,6 +19,9 @@
 #include <condition_variable>
 #include "classlist.h"
 
+#define INITIAL_THREAD_ID	0
+#define MAIN_THREAD_ID		1
+
 struct PendingFutureValue {
 	PendingFutureValue(ModelAction *writer, ModelAction *reader) :
 		writer(writer), reader(reader)
@@ -99,9 +102,8 @@ public:
 	SNAPSHOTALLOC
 private:
 	int get_execution_number() const;
-	bool mo_may_allow(const ModelAction *writer, const ModelAction *reader);
-	bool should_wake_up(const ModelAction *curr, const Thread *thread) const;
-	void wake_up_sleeping_actions(ModelAction *curr);
+	bool should_wake_up(const ModelAction * asleep) const;
+	void wake_up_sleeping_actions();
 	modelclock_t get_next_seq_num();
 	bool next_execution();
 	bool initialize_curr_action(ModelAction **curr);
@@ -121,7 +123,7 @@ 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<ModelAction *> *priorset, bool *canprune, bool check_only = false);
+	bool r_modification_order(ModelAction *curr, const ModelAction *rf, SnapVector<ModelAction *> *priorset, bool *canprune);
 	void w_modification_order(ModelAction *curr);
 	ClockVector * get_hb_from_write(ModelAction *rf) const;
 	ModelAction * convertNonAtomicStore(void*);