X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=datarace.h;h=7c24b6d56c1b400a311b0eaae5ef32e9ad0e8c31;hb=28067adf4ed506b7e38ddf38e522d5a9621bef92;hp=627b8cc88c7016b27cc2660bdebdf4693e674c40;hpb=12b1a10eeff58161619bafcfd8e288b3e2c76621;p=c11tester.git diff --git a/datarace.h b/datarace.h index 627b8cc8..7c24b6d5 100644 --- a/datarace.h +++ b/datarace.h @@ -5,8 +5,8 @@ #ifndef DATARACE_H #include "config.h" #include -#include #include "modeltypes.h" +#include "stl-model.h" /* Forward declaration */ class ClockVector; @@ -36,18 +36,18 @@ 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 raceCheckRead(thread_id_t thread, const void *location, ClockVector *currClock); bool checkDataRaces(); -void printRace(struct DataRace *race); +void assert_race(struct DataRace *race); -extern std::vector unrealizedraces; +extern SnapVector unrealizedraces; /** Basic encoding idea: * (void *) Either: