From 1e3cce83f208da50a267c163841f12d491aeec86 Mon Sep 17 00:00:00 2001 From: weiyu Date: Wed, 22 Apr 2020 11:54:10 -0700 Subject: [PATCH] Tiny fix --- datarace.cc | 21 --------------------- datarace.h | 8 ++++---- 2 files changed, 4 insertions(+), 25 deletions(-) diff --git a/datarace.cc b/datarace.cc index 0bfaaff7..28ebcf6d 100644 --- a/datarace.cc +++ b/datarace.cc @@ -160,7 +160,6 @@ unsigned int race_hash(struct DataRace *race) { return hash; } - bool race_equals(struct DataRace *r1, struct DataRace *r2) { if (r1->numframes != r2->numframes) return false; @@ -232,7 +231,6 @@ struct DataRace * fullRaceCheckWrite(thread_id_t thread, const void *location, u } /* Check for datarace against last write. */ - { modelclock_t writeClock = record->writeClock; thread_id_t writeThread = record->writeThread; @@ -279,8 +277,6 @@ void raceCheckWrite(thread_id_t thread, void *location) goto Exit; } - - { /* Check for datarace against last read. */ modelclock_t readClock = READVECTOR(shadowval); @@ -295,7 +291,6 @@ void raceCheckWrite(thread_id_t thread, void *location) { /* Check for datarace against last write. */ - modelclock_t writeClock = WRITEVECTOR(shadowval); thread_id_t writeThread = int_to_id(WRTHREADID(shadowval)); @@ -319,7 +314,6 @@ Exit: } } - /** This function does race detection for a write on an expanded record. */ struct DataRace * atomfullRaceCheckWrite(thread_id_t thread, const void *location, uint64_t *shadow, ClockVector *currClock) { @@ -399,7 +393,6 @@ void atomraceCheckWrite(thread_id_t thread, void *location) { /* Check for datarace against last read. */ - modelclock_t readClock = READVECTOR(shadowval); thread_id_t readThread = int_to_id(RDTHREADID(shadowval)); @@ -412,7 +405,6 @@ void atomraceCheckWrite(thread_id_t thread, void *location) { /* Check for datarace against last write. */ - modelclock_t writeClock = WRITEVECTOR(shadowval); thread_id_t writeThread = int_to_id(WRTHREADID(shadowval)); @@ -508,8 +500,6 @@ void recordCalloc(void *location, size_t size) { } } - - /** This function does race detection on a read for an expanded record. */ struct DataRace * fullRaceCheckRead(thread_id_t thread, const void *location, uint64_t *shadow, ClockVector *currClock) { @@ -682,7 +672,6 @@ void atomraceCheckRead(thread_id_t thread, const void *location) { /* Check for datarace against last write. */ - modelclock_t writeClock = WRITEVECTOR(shadowval); thread_id_t writeThread = int_to_id(WRTHREADID(shadowval)); @@ -732,7 +721,6 @@ static inline uint64_t * raceCheckRead_firstIt(thread_id_t thread, const void * } /* Check for datarace against last write. */ - modelclock_t writeClock = WRITEVECTOR(shadowval); thread_id_t writeThread = int_to_id(WRTHREADID(shadowval)); @@ -833,14 +821,11 @@ Exit: } } - - void raceCheckRead64(thread_id_t thread, const void *location) { uint64_t old_shadowval, new_shadowval; old_shadowval = new_shadowval = INVALIDSHADOWVAL; - uint64_t * shadow = raceCheckRead_firstIt(thread, location, &old_shadowval, &new_shadowval); if (CHECKBOUNDARY(location, 7)) { if (shadow[1]==old_shadowval) @@ -888,7 +873,6 @@ void raceCheckRead32(thread_id_t thread, const void *location) uint64_t old_shadowval, new_shadowval; old_shadowval = new_shadowval = INVALIDSHADOWVAL; - uint64_t * shadow = raceCheckRead_firstIt(thread, location, &old_shadowval, &new_shadowval); if (CHECKBOUNDARY(location, 3)) { if (shadow[1]==old_shadowval) @@ -932,7 +916,6 @@ void raceCheckRead8(thread_id_t thread, const void *location) uint64_t old_shadowval, new_shadowval; old_shadowval = new_shadowval = INVALIDSHADOWVAL; - raceCheckRead_firstIt(thread, location, &old_shadowval, &new_shadowval); } @@ -1073,7 +1056,6 @@ void raceCheckWrite64(thread_id_t thread, const void *location) uint64_t old_shadowval, new_shadowval; old_shadowval = new_shadowval = INVALIDSHADOWVAL; - uint64_t * shadow = raceCheckWrite_firstIt(thread, location, &old_shadowval, &new_shadowval); if (CHECKBOUNDARY(location, 7)) { if (shadow[1]==old_shadowval) @@ -1121,7 +1103,6 @@ void raceCheckWrite32(thread_id_t thread, const void *location) uint64_t old_shadowval, new_shadowval; old_shadowval = new_shadowval = INVALIDSHADOWVAL; - uint64_t * shadow = raceCheckWrite_firstIt(thread, location, &old_shadowval, &new_shadowval); if (CHECKBOUNDARY(location, 3)) { if (shadow[1]==old_shadowval) @@ -1149,7 +1130,6 @@ void raceCheckWrite16(thread_id_t thread, const void *location) uint64_t old_shadowval, new_shadowval; old_shadowval = new_shadowval = INVALIDSHADOWVAL; - uint64_t * shadow = raceCheckWrite_firstIt(thread, location, &old_shadowval, &new_shadowval); if (CHECKBOUNDARY(location, 1)) { if (shadow[1]==old_shadowval) { @@ -1165,6 +1145,5 @@ void raceCheckWrite8(thread_id_t thread, const void *location) uint64_t old_shadowval, new_shadowval; old_shadowval = new_shadowval = INVALIDSHADOWVAL; - raceCheckWrite_firstIt(thread, location, &old_shadowval, &new_shadowval); } diff --git a/datarace.h b/datarace.h index 2518464a..c36af066 100644 --- a/datarace.h +++ b/datarace.h @@ -60,10 +60,10 @@ void raceCheckRead16(thread_id_t thread, const void *location); void raceCheckRead32(thread_id_t thread, const void *location); void raceCheckRead64(thread_id_t thread, const void *location); -void raceCheckWrite8(thread_id_t thread, void *location); -void raceCheckWrite16(thread_id_t thread, void *location); -void raceCheckWrite32(thread_id_t thread, void *location); -void raceCheckWrite64(thread_id_t thread, void *location); +void raceCheckWrite8(thread_id_t thread, const void *location); +void raceCheckWrite16(thread_id_t thread, const void *location); +void raceCheckWrite32(thread_id_t thread, const void *location); +void raceCheckWrite64(thread_id_t thread, const void *location); /** * @brief A record of information for detecting data races -- 2.34.1