hook up the race detector...

diff --git a/librace.cc b/librace.cc
index fa9a1101c07c0b05868ea60165d354a9588ef3c5..38434de70f44d4694ed2a268094e19370a2f87d1 100644 (file)
--- a/librace.cc
+++ b/librace.cc
@@ -3,51 +3,99 @@
 
 #include "librace.h"
 #include "common.h"
+#include "datarace.h"
+#include "model.h"
 
 void store_8(void *addr, uint8_t val)
 {
        DEBUG("addr = %p, val = %" PRIu8 "\n", addr, val);
+       thread_id_t tid=thread_current()->get_id();
+       ClockVector * cv=model->get_cv(tid);
+       raceCheckWrite(tid, addr, cv);
        (*(uint8_t *)addr) = val;
 }
 
 void store_16(void *addr, uint16_t val)
 {
        DEBUG("addr = %p, val = %" PRIu16 "\n", addr, val);
+       thread_id_t tid=thread_current()->get_id();
+       ClockVector * cv=model->get_cv(tid);
+       raceCheckWrite(tid, addr, cv);
+       raceCheckWrite(tid, (void *)(((uintptr_t)addr)+1), cv);
        (*(uint16_t *)addr) = val;
 }
 
 void store_32(void *addr, uint32_t val)
 {
        DEBUG("addr = %p, val = %" PRIu32 "\n", addr, val);
+       thread_id_t tid=thread_current()->get_id();
+       ClockVector * cv=model->get_cv(tid);
+       raceCheckWrite(tid, addr, cv);
+       raceCheckWrite(tid, (void *)(((uintptr_t)addr)+1), cv);
+       raceCheckWrite(tid, (void *)(((uintptr_t)addr)+2), cv);
+       raceCheckWrite(tid, (void *)(((uintptr_t)addr)+3), cv);
        (*(uint32_t *)addr) = val;
 }
 
 void store_64(void *addr, uint64_t val)
 {
        DEBUG("addr = %p, val = %" PRIu64 "\n", addr, val);
+       thread_id_t tid=thread_current()->get_id();
+       ClockVector * cv=model->get_cv(tid);
+       raceCheckWrite(tid, addr, cv);
+       raceCheckWrite(tid, (void *)(((uintptr_t)addr)+1), cv);
+       raceCheckWrite(tid, (void *)(((uintptr_t)addr)+2), cv);
+       raceCheckWrite(tid, (void *)(((uintptr_t)addr)+3), cv);
+       raceCheckWrite(tid, (void *)(((uintptr_t)addr)+4), cv);
+       raceCheckWrite(tid, (void *)(((uintptr_t)addr)+5), cv);
+       raceCheckWrite(tid, (void *)(((uintptr_t)addr)+6), cv);
+       raceCheckWrite(tid, (void *)(((uintptr_t)addr)+7), cv);
        (*(uint64_t *)addr) = val;
 }
 
 uint8_t load_8(void *addr)
 {
        DEBUG("addr = %p\n", addr);
+       thread_id_t tid=thread_current()->get_id();
+       ClockVector * cv=model->get_cv(tid);
+       raceCheckRead(tid, addr, cv);
        return *((uint8_t *)addr);
 }
 
 uint16_t load_16(void *addr)
 {
        DEBUG("addr = %p\n", addr);
+       thread_id_t tid=thread_current()->get_id();
+       ClockVector * cv=model->get_cv(tid);
+       raceCheckRead(tid, addr, cv);
+       raceCheckRead(tid, (void *)(((uintptr_t)addr)+1), cv);
        return *((uint16_t *)addr);
 }
 
 uint32_t load_32(void *addr)
 {
        DEBUG("addr = %p\n", addr);
+       thread_id_t tid=thread_current()->get_id();
+       ClockVector * cv=model->get_cv(tid);
+       raceCheckRead(tid, addr, cv);
+       raceCheckRead(tid, (void *)(((uintptr_t)addr)+1), cv);
+       raceCheckRead(tid, (void *)(((uintptr_t)addr)+2), cv);
+       raceCheckRead(tid, (void *)(((uintptr_t)addr)+3), cv);
        return *((uint32_t *)addr);
 }
 
 uint64_t load_64(void *addr)
 {
        DEBUG("addr = %p\n", addr);
+       thread_id_t tid=thread_current()->get_id();
+       ClockVector * cv=model->get_cv(tid);
+       raceCheckRead(tid, addr, cv);
+       raceCheckRead(tid, (void *)(((uintptr_t)addr)+1), cv);
+       raceCheckRead(tid, (void *)(((uintptr_t)addr)+2), cv);
+       raceCheckRead(tid, (void *)(((uintptr_t)addr)+3), cv);
+       raceCheckRead(tid, (void *)(((uintptr_t)addr)+4), cv);
+       raceCheckRead(tid, (void *)(((uintptr_t)addr)+5), cv);
+       raceCheckRead(tid, (void *)(((uintptr_t)addr)+6), cv);
+       raceCheckRead(tid, (void *)(((uintptr_t)addr)+7), cv);
        return *((uint64_t *)addr);
 }

diff --git a/model.cc b/model.cc
index 884ed64d0b30b51ec73954e3797f10a2e70fe793..41e4421c52f3c8b8c932330523771c7a32622649 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -309,6 +309,10 @@ ModelAction * ModelChecker::get_parent_action(thread_id_t tid)
        return parent;
 }
 
+ClockVector * ModelChecker::get_cv(thread_id_t tid) {
+       return get_parent_action(tid)->get_cv();
+}
+
 /**
  * Build up an initial set of all past writes that this 'read' action may read
  * from. This set is determined by the clock vector's "happens before"

diff --git a/model.h b/model.h
index fbf1b3f0909ff3fd67fbb10e905d1c0b7ff9003b..97e9849f0bbb441c5af72999e3453bc9adbe5745 100644 (file)
--- a/model.h
+++ b/model.h
@@ -54,7 +54,7 @@ public:
        modelclock_t get_next_seq_num();
 
        int switch_to_master(ModelAction *act);
-
+       ClockVector * get_cv(thread_id_t tid);
        bool next_execution();
 
        MEMALLOC