Towards not reporting the same datarace twice

[c11tester.git] / datarace.h

diff --git a/datarace.h b/datarace.h
index 78903d336832bb7439d4a8ab61799dd48f2ceed5..7e4e68e22c3d01947ed50e4852242e32d6acdd66 100644 (file)
--- a/datarace.h
+++ b/datarace.h
@@ -2,15 +2,14 @@
  *  @brief Data race detection code.
  */
 
-#ifndef DATARACE_H
+#ifndef __DATARACE_H__
+#define __DATARACE_H__
+
 #include "config.h"
 #include <stdint.h>
 #include "modeltypes.h"
-#include "stl-model.h"
-
-/* Forward declaration */
-class ClockVector;
-class ModelAction;
+#include "classlist.h"
+#include "hashset.h"
 
 struct ShadowTable {
        void * array[65536];
@@ -22,7 +21,7 @@ struct ShadowBaseTable {
 
 struct DataRace {
        /* Clock and thread associated with first action.  This won't change in
-                response to synchronization. */
+                response to synchronization. */
 
        thread_id_t oldthread;
        modelclock_t oldclock;
@@ -30,13 +29,15 @@ struct DataRace {
        bool isoldwrite;
 
        /* Model action associated with second action.  This could change as
-                a result of synchronization. */
+                a result of synchronization. */
        ModelAction *newaction;
        /* Record whether this is a write, so we can tell the user. */
        bool isnewwrite;
 
        /* Address of data race. */
        const void *address;
+       void * backtrace[64];
+       int numframes;
 };
 
 #define MASK16BIT 0xffff
@@ -47,8 +48,6 @@ void raceCheckRead(thread_id_t thread, const void *location);
 bool checkDataRaces();
 void assert_race(struct DataRace *race);
 
-extern SnapVector<struct DataRace *> unrealizedraces;
-
 /**
  * @brief A record of information for detecting data races
  */
@@ -61,19 +60,22 @@ struct RaceRecord {
        modelclock_t writeClock;
 };
 
+unsigned int race_hash(struct DataRace *race);
+bool race_equals(struct DataRace *r1, struct DataRace *r2);
+
 #define INITCAPACITY 4
 
 #define ISSHORTRECORD(x) ((x)&0x1)
 
-#define THREADMASK 0xff
+#define THREADMASK 0x3f
 #define RDTHREADID(x) (((x)>>1)&THREADMASK)
-#define READMASK 0x07fffff
-#define READVECTOR(x) (((x)>>9)&READMASK)
+#define READMASK 0x1ffffff
+#define READVECTOR(x) (((x)>>7)&READMASK)
 
 #define WRTHREADID(x) (((x)>>32)&THREADMASK)
 
 #define WRITEMASK READMASK
-#define WRITEVECTOR(x) (((x)>>40)&WRITEMASK)
+#define WRITEVECTOR(x) (((x)>>38)&WRITEMASK)
 
 /**
  * The basic encoding idea is that (void *) either:
@@ -81,14 +83,17 @@ struct RaceRecord {
  *  -# 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
+ *     - next 6 bits are read thread id
+ *     - next 25 bits are read clock vector
+ *     - next 6 bits are write thread id
+ *     - next 25 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 ENCODEOP(rdthread, rdtime, wrthread, wrtime) (0x1ULL | ((rdthread)<<1) | ((rdtime) << 7) | (((uint64_t)wrthread)<<32) | (((uint64_t)wrtime)<<38))
 
 #define MAXTHREADID (THREADMASK-1)
 #define MAXREADVECTOR (READMASK-1)
 #define MAXWRITEVECTOR (WRITEMASK-1)
-#endif
+
+typedef HashSet<struct DataRace *, uintptr_t, 0, model_malloc, model_calloc, model_free, race_hash, race_equals> RaceSet;
+
+#endif /* __DATARACE_H__ */