X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=datarace.cc;h=270e52310730febec1e97956c787a06c7b670b7e;hb=0b9a8924695870c15bc39feb6ec96d525954eaba;hp=d6e0875c1a5562315b26367a3582452d5c41b07d;hpb=12b1a10eeff58161619bafcfd8e288b3e2c76621;p=model-checker.git

diff --git a/datarace.cc b/datarace.cc
index d6e0875..270e523 100644
--- a/datarace.cc
+++ b/datarace.cc
@@ -1,6 +1,6 @@
 #include "datarace.h"
 #include "model.h"
-#include "threads.h"
+#include "threads-model.h"
 #include <stdio.h>
 #include <cstring>
 #include "mymemory.h"
@@ -120,11 +120,15 @@ bool checkDataRaces() {
 	return false;
 }
 
-void printRace(struct DataRace * race) {
-	printf("Datarace detected\n");
-	printf("Location %p\n", race->address);
-	printf("Initial access: thread %u clock %u, iswrite %u\n",race->oldthread,race->oldclock, race->isoldwrite);
-	printf("Second access: thread %u clock %u, iswrite %u\n", race->newaction->get_tid(), race->newaction->get_seq_number() , race->isnewwrite);
+void printRace(struct DataRace *race)
+{
+	printf("Datarace detected @ address %p:\n", race->address);
+	printf("    Access 1: %5s in thread %2d @ clock %3u\n",
+			race->isoldwrite ? "write" : "read",
+			id_to_int(race->oldthread), race->oldclock);
+	printf("    Access 2: %5s in thread %2d @ clock %3u\n",
+			race->isnewwrite ? "write" : "read",
+			id_to_int(race->newaction->get_tid()), race->newaction->get_seq_number());
 }
 
 /** This function does race detection for a write on an expanded record. */