datarace: simplify raceCheck{Read,Write}() function interfaces

[model-checker.git] / datarace.h

diff --git a/datarace.h b/datarace.h
index 627b8cc88c7016b27cc2660bdebdf4693e674c40..78903d336832bb7439d4a8ab61799dd48f2ceed5 100644 (file)
--- a/datarace.h
+++ b/datarace.h
@@ -5,8 +5,8 @@
 #ifndef DATARACE_H
 #include "config.h"
 #include <stdint.h>
-#include <vector>
 #include "modeltypes.h"
+#include "stl-model.h"
 
 /* Forward declaration */
 class ClockVector;
@@ -36,28 +36,22 @@ struct DataRace {
        bool isnewwrite;
 
        /* Address of data race. */
-       void *address;
+       const void *address;
 };
 
 #define MASK16BIT 0xffff
 
 void initRaceDetector();
-void raceCheckWrite(thread_id_t thread, void *location, ClockVector *currClock);
-void raceCheckRead(thread_id_t thread, void *location, ClockVector *currClock);
+void raceCheckWrite(thread_id_t thread, void *location);
+void raceCheckRead(thread_id_t thread, const void *location);
 bool checkDataRaces();
-void printRace(struct DataRace *race);
+void assert_race(struct DataRace *race);
 
-extern std::vector<struct DataRace *> unrealizedraces;
-
-/** Basic encoding idea:
- *      (void *) Either:
- *      (1) points to a full record or
- *
- * (2) encodes the information in a 64 bit word.  Encoding is as
- * follows: lowest bit set to 1, next 8 bits are read thread id, next
- * 23 bits are read clock vector, next 8 bites are write thread id,
- * next 23 bits are write clock vector.  */
+extern SnapVector<struct DataRace *> unrealizedraces;
 
+/**
+ * @brief A record of information for detecting data races
+ */
 struct RaceRecord {
        modelclock_t *readClock;
        thread_id_t *thread;
@@ -81,6 +75,17 @@ struct RaceRecord {
 #define WRITEMASK READMASK
 #define WRITEVECTOR(x) (((x)>>40)&WRITEMASK)
 
+/**
+ * The basic encoding idea is that (void *) either:
+ *  -# points to a full record (RaceRecord) or
+ *  -# encodes the information in a 64 bit word. Encoding is as
+ *     follows:
+ *     - lowest bit set to 1
+ *     - next 8 bits are read thread id
+ *     - next 23 bits are read clock vector
+ *     - next 8 bits are write thread id
+ *     - next 23 bits are write clock vector
+ */
 #define ENCODEOP(rdthread, rdtime, wrthread, wrtime) (0x1ULL | ((rdthread)<<1) | ((rdtime) << 9) | (((uint64_t)wrthread)<<32) | (((uint64_t)wrtime)<<40))
 
 #define MAXTHREADID (THREADMASK-1)