From: Brian Norris <banorris@uci.edu>
Date: Fri, 16 Nov 2012 21:59:03 +0000 (-0800)
Subject: datarace: change "Datarace" to "Data race"
X-Git-Tag: oopsla2013~526
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3133d403d1abd0ac735b4d4662708fcef1cb5d5f;hp=99cf3d542dfda51e082db5058af0bf178ed9c464;p=model-checker.git

datarace: change "Datarace" to "Data race"
---

diff --git a/datarace.cc b/datarace.cc
index c292133..448929b 100644
--- a/datarace.cc
+++ b/datarace.cc
@@ -103,7 +103,7 @@ static void reportDataRace(thread_id_t oldthread, modelclock_t oldclock, bool is
 
 	/* If the race is realized, bail out now. */
 	if (checkDataRaces())
-		model->assert_bug("Datarace", true);
+		model->assert_bug("Data race", true);
 }
 
 /** This function goes through the list of unrealized data races,
@@ -136,7 +136,7 @@ bool checkDataRaces() {
 
 void printRace(struct DataRace *race)
 {
-	printf("Datarace detected @ address %p:\n", race->address);
+	printf("Data race 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);
diff --git a/model.cc b/model.cc
index a6804b6..ab16bf8 100644
--- a/model.cc
+++ b/model.cc
@@ -918,7 +918,7 @@ void ModelChecker::process_relseq_fixup(ModelAction *curr, work_queue_t *work_qu
 
 	/* See if we have realized a data race */
 	if (checkDataRaces())
-		assert_bug("Datarace");
+		assert_bug("Data race");
 }
 
 /**
@@ -1850,7 +1850,7 @@ bool ModelChecker::resolve_release_sequences(void *location, work_queue_t *work_
 
 	// If we resolved promises or data races, see if we have realized a data race.
 	if (checkDataRaces())
-		assert_bug("Datarace");
+		assert_bug("Data race");
 
 	return updated;
 }