Find a faster way to get currently executing thread's id

[c11tester.git] / cmodelint.cc

diff --git a/cmodelint.cc b/cmodelint.cc
index b7ff5913adddd63069857fac98dacab42f07f51d..0b9668d16a56c96f20322205e4a7a4cdb599fca4 100644 (file)
--- a/cmodelint.cc
+++ b/cmodelint.cc
@@ -10,7 +10,7 @@
 #include "threads-model.h"
 #include "datarace.h"
 
-memory_order orders[7] = {
+memory_order orders[6] = {
        memory_order_relaxed, memory_order_consume, memory_order_acquire,
        memory_order_release, memory_order_acq_rel, memory_order_seq_cst,
 };
@@ -23,55 +23,6 @@ static void ensureModel() {
        }
 }
 
-/** Performs a read action.*/
-uint64_t model_read_action(void * obj, memory_order ord) {
-       return model->switch_thread(new ModelAction(ATOMIC_READ, ord, obj));
-}
-
-/** Performs a write action.*/
-void model_write_action(void * obj, memory_order ord, uint64_t val) {
-       model->switch_thread(new ModelAction(ATOMIC_WRITE, ord, obj, val));
-}
-
-/** Performs an init action. */
-void model_init_action(void * obj, uint64_t val) {
-       model->switch_thread(new ModelAction(ATOMIC_INIT, memory_order_relaxed, obj, val));
-}
-
-/**
- * Performs the read part of a RMW action. The next action must either be the
- * write part of the RMW action or an explicit close out of the RMW action w/o
- * a write.
- */
-uint64_t model_rmwr_action(void *obj, memory_order ord) {
-       return model->switch_thread(new ModelAction(ATOMIC_RMWR, ord, obj));
-}
-
-/**
- * Performs the read part of a RMW CAS action. The next action must
- * either be the write part of the RMW action or an explicit close out
- * of the RMW action w/o a write.
- */
-uint64_t model_rmwrcas_action(void *obj, memory_order ord, uint64_t oldval, int size) {
-       return model->switch_thread(new ModelAction(ATOMIC_RMWRCAS, ord, obj, oldval, size));
-}
-
-
-/** Performs the write part of a RMW action. */
-void model_rmw_action(void *obj, memory_order ord, uint64_t val) {
-       model->switch_thread(new ModelAction(ATOMIC_RMW, ord, obj, val));
-}
-
-/** Closes out a RMW action without doing a write. */
-void model_rmwc_action(void *obj, memory_order ord) {
-       model->switch_thread(new ModelAction(ATOMIC_RMWC, ord, obj));
-}
-
-/** Issues a fence operation. */
-void model_fence_action(memory_order ord) {
-       model->switch_thread(new ModelAction(ATOMIC_FENCE, ord, FENCE_LOCATION));
-}
-
 /* ---  helper functions --- */
 uint64_t model_rmwrcas_action_helper(void *obj, int atomic_index, uint64_t oldval, int size, const char *position) {
        ensureModel();
@@ -111,7 +62,7 @@ VOLATILELOAD(64)
                ensureModel();                                                      \
                model->switch_thread(new ModelAction(ATOMIC_WRITE, position, memory_order_volatile_store, obj, (uint64_t) val)); \
                *((volatile uint ## size ## _t *)obj) = val;            \
-               thread_id_t tid = thread_current()->get_id();           \
+               thread_id_t tid = thread_current_id();           \
                for(int i=0;i < size / 8;i++) {                         \
                        atomraceCheckWrite(tid, (void *)(((char *)obj)+i));          \
                }                                                       \
@@ -128,7 +79,7 @@ VOLATILESTORE(64)
                ensureModel();                                                      \
                model->switch_thread(new ModelAction(ATOMIC_INIT, position, memory_order_relaxed, obj, (uint64_t) val)); \
                *((volatile uint ## size ## _t *)obj) = val;                                 \
-               thread_id_t tid = thread_current()->get_id();           \
+               thread_id_t tid = thread_current_id();           \
                for(int i=0;i < size / 8;i++) {                       \
                        atomraceCheckWrite(tid, (void *)(((char *)obj)+i));          \
                }                                                       \
@@ -145,7 +96,7 @@ CDSATOMICINT(64)
                ensureModel();                                                      \
                uint ## size ## _t val = (uint ## size ## _t)model->switch_thread( \
                        new ModelAction(ATOMIC_READ, position, orders[atomic_index], obj)); \
-               thread_id_t tid = thread_current()->get_id();           \
+               thread_id_t tid = thread_current_id();           \
                for(int i=0;i < size / 8;i++) {                         \
                        atomraceCheckRead(tid, (void *)(((char *)obj)+i));    \
                }                                                       \
@@ -163,7 +114,7 @@ CDSATOMICLOAD(64)
                ensureModel();                                                        \
                model->switch_thread(new ModelAction(ATOMIC_WRITE, position, orders[atomic_index], obj, (uint64_t) val)); \
                *((volatile uint ## size ## _t *)obj) = val;                     \
-               thread_id_t tid = thread_current()->get_id();           \
+               thread_id_t tid = thread_current_id();           \
                for(int i=0;i < size / 8;i++) {                       \
                        atomraceCheckWrite(tid, (void *)(((char *)obj)+i));          \
                }                                                       \
@@ -183,7 +134,7 @@ CDSATOMICSTORE(64)
                _copy __op__ _val;                                                    \
                model_rmw_action_helper(addr, (uint64_t) _copy, atomic_index, position);        \
                *((volatile uint ## size ## _t *)addr) = _copy;                  \
-               thread_id_t tid = thread_current()->get_id();           \
+               thread_id_t tid = thread_current_id();           \
                for(int i=0;i < size / 8;i++) {                       \
                        atomraceCheckRead(tid,  (void *)(((char *)addr)+i));  \
                        recordWrite(tid, (void *)(((char *)addr)+i));         \
@@ -269,7 +220,7 @@ CDSATOMICXOR(64)
                if (_old == _expected) {                                                                    \
                        model_rmw_action_helper(addr, (uint64_t) _desired, atomic_index, position); \
                        *((volatile uint ## size ## _t *)addr) = desired;                        \
-                       thread_id_t tid = thread_current()->get_id();           \
+                       thread_id_t tid = thread_current_id();           \
                        for(int i=0;i < size / 8;i++) {                       \
                                recordWrite(tid, (void *)(((char *)addr)+i));         \
                        }                                                       \
@@ -342,7 +293,7 @@ void cds_atomic_thread_fence(int atomic_index, const char * position) {
 void cds_func_entry(const char * funcName) {
 #ifdef NEWFUZZER
        ensureModel();
-       Thread * th = thread_current();
+       thread_id_t tid = thread_current_id();
        uint32_t func_id;
 
        ModelHistory *history = model->get_history();
@@ -362,15 +313,14 @@ void cds_func_entry(const char * funcName) {
                func_id = history->getFuncMap()->get(funcName);
        }
 
-       history->enter_function(func_id, th->get_id());
+       history->enter_function(func_id, tid);
 #endif
 }
 
 void cds_func_exit(const char * funcName) {
 #ifdef NEWFUZZER
        ensureModel();
-
-       Thread * th = thread_current();
+       thread_id_t tid = thread_current_id();
        uint32_t func_id;
 
        ModelHistory *history = model->get_history();
@@ -384,6 +334,6 @@ void cds_func_exit(const char * funcName) {
        if (func_id == 0)
                return;
 
-       history->exit_function(func_id, th->get_id());
+       history->exit_function(func_id, tid);
 #endif
 }