Fix bug by only putting reads or writes in objthrdmap

[c11tester.git] / cmodelint.cc

diff --git a/cmodelint.cc b/cmodelint.cc
index 8774c5b3f6a0124cbc3079d7de5bfcee79b5505d..ea34324b7a21a2742113268470c6b878b5f03b84 100644 (file)
--- a/cmodelint.cc
+++ b/cmodelint.cc
@@ -113,7 +113,7 @@ VOLATILELOAD(64)
                *((volatile uint ## size ## _t *)obj) = val;            \
                thread_id_t tid = thread_current()->get_id();           \
                for(int i=0;i < size / 8;i++) {                         \
-                       recordWrite(tid, (void *)(((char *)obj)+i));          \
+                       atomraceCheckWrite(tid, (void *)(((char *)obj)+i));          \
                }                                                       \
        }
 
@@ -130,7 +130,7 @@ VOLATILESTORE(64)
                *((volatile uint ## size ## _t *)obj) = val;                                 \
                thread_id_t tid = thread_current()->get_id();           \
                for(int i=0;i < size / 8;i++) {                       \
-                       recordWrite(tid, (void *)(((char *)obj)+i));          \
+                       atomraceCheckWrite(tid, (void *)(((char *)obj)+i));          \
                }                                                       \
        }
 
@@ -143,8 +143,13 @@ CDSATOMICINT(64)
 #define CDSATOMICLOAD(size)                                             \
        uint ## size ## _t cds_atomic_load ## size(void * obj, int atomic_index, const char * position) { \
                ensureModel();                                                      \
-               return (uint ## size ## _t)model->switch_to_master( \
+               uint ## size ## _t val = (uint ## size ## _t)model->switch_to_master( \
                        new ModelAction(ATOMIC_READ, position, orders[atomic_index], obj)); \
+               thread_id_t tid = thread_current()->get_id();           \
+               for(int i=0;i < size / 8;i++) {                         \
+                       atomraceCheckRead(tid, (void *)(((char *)obj)+i));    \
+               }                                                       \
+               return val; \
        }
 
 CDSATOMICLOAD(8)
@@ -160,7 +165,7 @@ CDSATOMICLOAD(64)
                *((volatile uint ## size ## _t *)obj) = val;                     \
                thread_id_t tid = thread_current()->get_id();           \
                for(int i=0;i < size / 8;i++) {                       \
-                       recordWrite(tid, (void *)(((char *)obj)+i));          \
+                       atomraceCheckWrite(tid, (void *)(((char *)obj)+i));          \
                }                                                       \
        }
 
@@ -180,9 +185,10 @@ CDSATOMICSTORE(64)
                *((volatile uint ## size ## _t *)addr) = _copy;                  \
                thread_id_t tid = thread_current()->get_id();           \
                for(int i=0;i < size / 8;i++) {                       \
+                       atomraceCheckRead(tid,  (void *)(((char *)addr)+i));  \
                        recordWrite(tid, (void *)(((char *)addr)+i));         \
                }                                                       \
-               return _old;                                                          \
+               return _old;                                            \
        })
 
 // cds atomic exchange
@@ -335,7 +341,6 @@ void cds_atomic_thread_fence(int atomic_index, const char * position) {
 
 void cds_func_entry(const char * funcName) {
        ensureModel();
-       /*
        Thread * th = thread_current();
        uint32_t func_id;
 
@@ -350,31 +355,31 @@ void cds_func_entry(const char * funcName) {
                ModelVector<const char *> * func_map_rev = history->getFuncMapRev();
                if ( func_map_rev->size() <= func_id )
                        func_map_rev->resize( func_id + 1 );
+
                func_map_rev->at(func_id) = funcName;
        } else {
                func_id = history->getFuncMap()->get(funcName);
        }
 
        history->enter_function(func_id, th->get_id());
-*/
 }
 
 void cds_func_exit(const char * funcName) {
        ensureModel();
 
-/*     Thread * th = thread_current();
+       Thread * th = thread_current();
        uint32_t func_id;
 
        ModelHistory *history = model->get_history();
        func_id = history->getFuncMap()->get(funcName);
-
-        * func_id not found; this could happen in the case where a function calls cds_func_entry
-        * when the model has been defined yet, but then an atomic inside the function initializes
-        * the model. And then cds_func_exit is called upon the function exiting.
-        *
+/*
+ * func_id not found; this could happen in the case where a function calls cds_func_entry
+ * when the model has been defined yet, but then an atomic inside the function initializes
+ * the model. And then cds_func_exit is called upon the function exiting.
+ *
+ */
        if (func_id == 0)
                return;
 
        history->exit_function(func_id, th->get_id());
-*/
 }