projects
/
cdsspec-compiler.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
99cf3d5
)
datarace: change "Datarace" to "Data race"
author
Brian Norris
<banorris@uci.edu>
Fri, 16 Nov 2012 21:59:03 +0000
(13:59 -0800)
committer
Brian Norris
<banorris@uci.edu>
Fri, 16 Nov 2012 21:59:03 +0000
(13:59 -0800)
datarace.cc
patch
|
blob
|
history
model.cc
patch
|
blob
|
history
diff --git
a/datarace.cc
b/datarace.cc
index c29213308cf2713ba3c1dd2d39c5c751bce31a2b..448929b295641d7546cdcdbf7524ae69b206b43f 100644
(file)
--- 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())
/* 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,
}
/** This function goes through the list of unrealized data races,
@@
-136,7
+136,7
@@
bool checkDataRaces() {
void printRace(struct DataRace *race)
{
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);
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 a6804b64f2f073645bacc4a246ba91a1b16baa24..ab16bf82528ea5ebf30766970b37faca5a6ada1f 100644
(file)
--- 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())
/* 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())
// 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;
}
return updated;
}