X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=datarace.cc;h=af70041b231fbccbba9f109a8c4b282267e4a022;hb=92dd847e38280a3bb0ec93781c47173a3848f1d7;hp=5f007f36522754960db4c4588c80ee75c2a49ad5;hpb=765b77b9d1dff55d4f43b03c5aef52e514a8a4cf;p=cdsspec-compiler.git

diff --git a/datarace.cc b/datarace.cc
index 5f007f3..af70041 100644
--- a/datarace.cc
+++ b/datarace.cc
@@ -7,12 +7,17 @@
 #include "clockvector.h"
 #include "config.h"
 #include "action.h"
+#include "execution.h"
 
 static struct ShadowTable *root;
 SnapVector<struct DataRace *> unrealizedraces;
 static void *memory_base;
 static void *memory_top;
 
+static const ModelExecution * get_execution()
+{
+	return model->get_execution();
+}
 
 /** This function initialized the data race detector. */
 void initRaceDetector()
@@ -123,7 +128,7 @@ static void reportDataRace(thread_id_t oldthread, modelclock_t oldclock, bool is
  */
 bool checkDataRaces()
 {
-	if (model->isfeasibleprefix()) {
+	if (get_execution()->isfeasibleprefix()) {
 		bool race_asserted = false;
 		/* Prune the non-racing unrealized dataraces */
 		for (unsigned i = 0; i < unrealizedraces.size(); i++) {
@@ -180,7 +185,7 @@ void fullRaceCheckWrite(thread_id_t thread, void *location, uint64_t *shadow, Cl
 
 		if (clock_may_race(currClock, thread, readClock, readThread)) {
 			/* We have a datarace */
-			reportDataRace(readThread, readClock, false, model->get_parent_action(thread), true, location);
+			reportDataRace(readThread, readClock, false, get_execution()->get_parent_action(thread), true, location);
 		}
 	}
 
@@ -191,7 +196,7 @@ void fullRaceCheckWrite(thread_id_t thread, void *location, uint64_t *shadow, Cl
 
 	if (clock_may_race(currClock, thread, writeClock, writeThread)) {
 		/* We have a datarace */
-		reportDataRace(writeThread, writeClock, true, model->get_parent_action(thread), true, location);
+		reportDataRace(writeThread, writeClock, true, get_execution()->get_parent_action(thread), true, location);
 	}
 
 	record->numReads = 0;
@@ -201,10 +206,11 @@ void fullRaceCheckWrite(thread_id_t thread, void *location, uint64_t *shadow, Cl
 }
 
 /** This function does race detection on a write. */
-void raceCheckWrite(thread_id_t thread, void *location, ClockVector *currClock)
+void raceCheckWrite(thread_id_t thread, void *location)
 {
 	uint64_t *shadow = lookupAddressEntry(location);
 	uint64_t shadowval = *shadow;
+	ClockVector *currClock = get_execution()->get_cv(thread);
 
 	/* Do full record */
 	if (shadowval != 0 && !ISSHORTRECORD(shadowval)) {
@@ -229,7 +235,7 @@ void raceCheckWrite(thread_id_t thread, void *location, ClockVector *currClock)
 
 	if (clock_may_race(currClock, thread, readClock, readThread)) {
 		/* We have a datarace */
-		reportDataRace(readThread, readClock, false, model->get_parent_action(thread), true, location);
+		reportDataRace(readThread, readClock, false, get_execution()->get_parent_action(thread), true, location);
 	}
 
 	/* Check for datarace against last write. */
@@ -239,7 +245,7 @@ void raceCheckWrite(thread_id_t thread, void *location, ClockVector *currClock)
 
 	if (clock_may_race(currClock, thread, writeClock, writeThread)) {
 		/* We have a datarace */
-		reportDataRace(writeThread, writeClock, true, model->get_parent_action(thread), true, location);
+		reportDataRace(writeThread, writeClock, true, get_execution()->get_parent_action(thread), true, location);
 	}
 	*shadow = ENCODEOP(0, 0, threadid, ourClock);
 }
@@ -256,7 +262,7 @@ void fullRaceCheckRead(thread_id_t thread, const void *location, uint64_t *shado
 
 	if (clock_may_race(currClock, thread, writeClock, writeThread)) {
 		/* We have a datarace */
-		reportDataRace(writeThread, writeClock, true, model->get_parent_action(thread), false, location);
+		reportDataRace(writeThread, writeClock, true, get_execution()->get_parent_action(thread), false, location);
 	}
 
 	/* Shorten vector when possible */
@@ -304,10 +310,11 @@ void fullRaceCheckRead(thread_id_t thread, const void *location, uint64_t *shado
 }
 
 /** This function does race detection on a read. */
-void raceCheckRead(thread_id_t thread, const void *location, ClockVector *currClock)
+void raceCheckRead(thread_id_t thread, const void *location)
 {
 	uint64_t *shadow = lookupAddressEntry(location);
 	uint64_t shadowval = *shadow;
+	ClockVector *currClock = get_execution()->get_cv(thread);
 
 	/* Do full record */
 	if (shadowval != 0 && !ISSHORTRECORD(shadowval)) {
@@ -332,7 +339,7 @@ void raceCheckRead(thread_id_t thread, const void *location, ClockVector *currCl
 
 	if (clock_may_race(currClock, thread, writeClock, writeThread)) {
 		/* We have a datarace */
-		reportDataRace(writeThread, writeClock, true, model->get_parent_action(thread), false, location);
+		reportDataRace(writeThread, writeClock, true, get_execution()->get_parent_action(thread), false, location);
 	}
 
 	modelclock_t readClock = READVECTOR(shadowval);