Optimize data race detector

[c11tester.git] / datarace.h

diff --git a/datarace.h b/datarace.h
index 7e4e68e22c3d01947ed50e4852242e32d6acdd66..a9bc92f6625d30c54a2a50da995b543085471079 100644 (file)
--- a/datarace.h
+++ b/datarace.h
@@ -44,9 +44,26 @@ struct DataRace {
 
 void initRaceDetector();
 void raceCheckWrite(thread_id_t thread, void *location);
+void atomraceCheckWrite(thread_id_t thread, void *location);
 void raceCheckRead(thread_id_t thread, const void *location);
-bool checkDataRaces();
+
+void atomraceCheckRead(thread_id_t thread, const void *location);
+void recordWrite(thread_id_t thread, void *location);
+void recordCalloc(void *location, size_t size);
 void assert_race(struct DataRace *race);
+bool hasNonAtomicStore(const void *location);
+void setAtomicStoreFlag(const void *location);
+void getStoreThreadAndClock(const void *address, thread_id_t * thread, modelclock_t * clock);
+
+void raceCheckRead8(thread_id_t thread, const void *location);
+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);
 
 /**
  * @brief A record of information for detecting data races
@@ -54,8 +71,8 @@ void assert_race(struct DataRace *race);
 struct RaceRecord {
        modelclock_t *readClock;
        thread_id_t *thread;
-       int capacity;
-       int numReads;
+       int numReads : 31;
+       int isAtomic : 1;
        thread_id_t writeThread;
        modelclock_t writeClock;
 };
@@ -77,6 +94,9 @@ bool race_equals(struct DataRace *r1, struct DataRace *r2);
 #define WRITEMASK READMASK
 #define WRITEVECTOR(x) (((x)>>38)&WRITEMASK)
 
+#define ATOMICMASK (0x1ULL << 63)
+#define NONATOMICMASK ~(0x1ULL << 63)
+
 /**
  * The basic encoding idea is that (void *) either:
  *  -# points to a full record (RaceRecord) or
@@ -87,6 +107,7 @@ bool race_equals(struct DataRace *r1, struct DataRace *r2);
  *     - next 25 bits are read clock vector
  *     - next 6 bits are write thread id
  *     - next 25 bits are write clock vector
+ *     - highest bit is 1 if the write is from an atomic
  */
 #define ENCODEOP(rdthread, rdtime, wrthread, wrtime) (0x1ULL | ((rdthread)<<1) | ((rdtime) << 7) | (((uint64_t)wrthread)<<32) | (((uint64_t)wrtime)<<38))