datarace: don't export unrealized race vector

diff --git a/datarace.cc b/datarace.cc
index af70041b231fbccbba9f109a8c4b282267e4a022..41bfbe0eaa5679d77faa111502833205c936e540 100644 (file)
--- a/datarace.cc
+++ b/datarace.cc
@@ -8,9 +8,10 @@
 #include "config.h"
 #include "action.h"
 #include "execution.h"
+#include "stl-model.h"
 
 static struct ShadowTable *root;
-SnapVector<struct DataRace *> unrealizedraces;
+static SnapVector<DataRace *> unrealizedraces;
 static void *memory_base;
 static void *memory_top;
 
@@ -354,3 +355,8 @@ void raceCheckRead(thread_id_t thread, const void *location)
 
        *shadow = ENCODEOP(threadid, ourClock, id_to_int(writeThread), writeClock);
 }
+
+bool haveUnrealizedRaces()
+{
+       return !unrealizedraces.empty();
+}

diff --git a/datarace.h b/datarace.h
index 78903d336832bb7439d4a8ab61799dd48f2ceed5..89db3335998db371dc3ecced1a840086ac4fa9e6 100644 (file)
--- a/datarace.h
+++ b/datarace.h
@@ -6,10 +6,8 @@
 #include "config.h"
 #include <stdint.h>
 #include "modeltypes.h"
-#include "stl-model.h"
 
 /* Forward declaration */
-class ClockVector;
 class ModelAction;
 
 struct ShadowTable {
@@ -46,8 +44,7 @@ void raceCheckWrite(thread_id_t thread, void *location);
 void raceCheckRead(thread_id_t thread, const void *location);
 bool checkDataRaces();
 void assert_race(struct DataRace *race);
-
-extern SnapVector<struct DataRace *> unrealizedraces;
+bool haveUnrealizedRaces();
 
 /**
  * @brief A record of information for detecting data races

diff --git a/execution.cc b/execution.cc
index a74147be4bbe7e068a9ddd05a58ff459ccb1a7c8..c8c4b89ac2910abd7024b531ea1bed5e97187faa 100644 (file)
--- a/execution.cc
+++ b/execution.cc
@@ -2816,7 +2816,7 @@ void ModelExecution::fixup_release_sequences()
 {
        while (!pending_rel_seqs.empty() &&
                        is_feasible_prefix_ignore_relseq() &&
-                       !unrealizedraces.empty()) {
+                       haveUnrealizedRaces()) {
                model_print("*** WARNING: release sequence fixup action "
                                "(%zu pending release seuqence(s)) ***\n",
                                pending_rel_seqs.size());