fix mutex_trylock bug

[c11tester.git] / action.cc

diff --git a/action.cc b/action.cc
index b654a35422a6cb3533a3236159d9048f5ab661a7..4cdca0d7a7272b2f4c6eef265ef34ca613bc0c3f 100644 (file)
--- a/action.cc
+++ b/action.cc
@@ -36,18 +36,17 @@ ModelAction::ModelAction(action_type_t type, memory_order order, void *loc,
        position(NULL),
        reads_from(NULL),
        last_fence_release(NULL),
-       uninitaction(NULL),
        cv(NULL),
        rf_cv(NULL),
+       action_ref(NULL),
        value(value),
-       reads_from_value(VALUE_NONE),
        type(type),
        order(order),
        original_order(order),
        seq_number(ACTION_INITIAL_CLOCK)
 {
        /* References to NULL atomic variables can end up here */
-       ASSERT(loc || type == ATOMIC_FENCE || type == NOOP);
+       ASSERT(loc || type == ATOMIC_FENCE || type == ATOMIC_NOP);
 
        Thread *t = thread ? thread : thread_current();
        this->tid = t!= NULL ? t->get_id() : -1;
@@ -69,11 +68,10 @@ ModelAction::ModelAction(action_type_t type, memory_order order, uint64_t value,
        position(NULL),
        time(_time),
        last_fence_release(NULL),
-       uninitaction(NULL),
        cv(NULL),
        rf_cv(NULL),
+       action_ref(NULL),
        value(value),
-        reads_from_value(VALUE_NONE),
        type(type),
        order(order),
        original_order(order),
@@ -101,11 +99,10 @@ ModelAction::ModelAction(action_type_t type, memory_order order, void *loc,
        position(NULL),
        reads_from(NULL),
        last_fence_release(NULL),
-       uninitaction(NULL),
        cv(NULL),
        rf_cv(NULL),
+       action_ref(NULL),
        value(value),
-        reads_from_value(VALUE_NONE),
        type(type),
        order(order),
        original_order(order),
@@ -114,8 +111,7 @@ ModelAction::ModelAction(action_type_t type, memory_order order, void *loc,
        /* References to NULL atomic variables can end up here */
        ASSERT(loc);
        this->size = size;
-       Thread *t = thread_current();
-       this->tid = t->get_id();
+       this->tid = thread_current_id();
 }
 
 
@@ -137,11 +133,10 @@ ModelAction::ModelAction(action_type_t type, const char * position, memory_order
        position(position),
        reads_from(NULL),
        last_fence_release(NULL),
-       uninitaction(NULL),
        cv(NULL),
        rf_cv(NULL),
+       action_ref(NULL),
        value(value),
-        reads_from_value(VALUE_NONE),
        type(type),
        order(order),
        original_order(order),
@@ -150,8 +145,7 @@ ModelAction::ModelAction(action_type_t type, const char * position, memory_order
        /* References to NULL atomic variables can end up here */
        ASSERT(loc);
        this->size = size;
-       Thread *t = thread_current();
-       this->tid = t->get_id();
+       this->tid = thread_current_id();
 }
 
 
@@ -174,11 +168,10 @@ ModelAction::ModelAction(action_type_t type, const char * position, memory_order
        position(position),
        reads_from(NULL),
        last_fence_release(NULL),
-       uninitaction(NULL),
        cv(NULL),
        rf_cv(NULL),
+       action_ref(NULL),
        value(value),
-        reads_from_value(VALUE_NONE),
        type(type),
        order(order),
        original_order(order),
@@ -202,9 +195,11 @@ ModelAction::~ModelAction()
         * vectors which have already been rolled back to an unallocated state.
         */
 
-       /*
-          if (cv)
-               delete cv; */
+
+       if (cv)
+               delete cv;
+       if (rf_cv)
+               delete rf_cv;
 }
 
 int ModelAction::getSize() const {
@@ -218,12 +213,15 @@ void ModelAction::copy_from_new(ModelAction *newaction)
 
 void ModelAction::set_seq_number(modelclock_t num)
 {
-       /* ATOMIC_UNINIT actions should never have non-zero clock */
-       ASSERT(!is_uninitialized());
        ASSERT(seq_number == ACTION_INITIAL_CLOCK);
        seq_number = num;
 }
 
+void ModelAction::reset_seq_number()
+{
+       seq_number = 0;
+}
+
 bool ModelAction::is_thread_start() const
 {
        return type == THREAD_START;
@@ -236,7 +234,7 @@ bool ModelAction::is_thread_join() const
 
 bool ModelAction::is_mutex_op() const
 {
-       return type == ATOMIC_LOCK || type == ATOMIC_TRYLOCK || type == ATOMIC_UNLOCK || type == ATOMIC_WAIT || type == ATOMIC_NOTIFY_ONE || type == ATOMIC_NOTIFY_ALL;
+       return type == ATOMIC_LOCK || type == ATOMIC_TRYLOCK || type == ATOMIC_UNLOCK || type == ATOMIC_WAIT || type == ATOMIC_TIMEDWAIT || type == ATOMIC_NOTIFY_ONE || type == ATOMIC_NOTIFY_ALL;
 }
 
 bool ModelAction::is_lock() const
@@ -250,7 +248,7 @@ bool ModelAction::is_sleep() const
 }
 
 bool ModelAction::is_wait() const {
-       return type == ATOMIC_WAIT;
+       return type == ATOMIC_WAIT || type == ATOMIC_TIMEDWAIT;
 }
 
 bool ModelAction::is_notify() const {
@@ -287,11 +285,6 @@ bool ModelAction::is_atomic_var() const
        return is_read() || could_be_write();
 }
 
-bool ModelAction::is_uninitialized() const
-{
-       return type == ATOMIC_UNINIT;
-}
-
 bool ModelAction::is_read() const
 {
        return type == ATOMIC_READ || type == ATOMIC_RMWR || type == ATOMIC_RMWRCAS || type == ATOMIC_RMW;
@@ -299,7 +292,17 @@ bool ModelAction::is_read() const
 
 bool ModelAction::is_write() const
 {
-       return type == ATOMIC_WRITE || type == ATOMIC_RMW || type == ATOMIC_INIT || type == ATOMIC_UNINIT || type == NONATOMIC_WRITE;
+       return type == ATOMIC_WRITE || type == ATOMIC_RMW || type == ATOMIC_INIT || type == NONATOMIC_WRITE;
+}
+
+bool ModelAction::is_create() const
+{
+       return type == THREAD_CREATE || type == PTHREAD_CREATE;
+}
+
+bool ModelAction::is_free() const
+{
+       return type == READY_FREE;
 }
 
 bool ModelAction::could_be_write() const
@@ -576,12 +579,8 @@ void ModelAction::set_try_lock(bool obtainedlock)
 uint64_t ModelAction::get_reads_from_value() const
 {
        ASSERT(is_read());
-       if (reads_from) {
-               if (reads_from->is_uninitialized())
-                       return reads_from_value;
-               else
-                       return reads_from->get_write_value();
-       }
+       if (reads_from)
+               return reads_from->get_write_value();
 
        return VALUE_NONE;      // Only for new actions with no reads-from
 }
@@ -632,20 +631,6 @@ void ModelAction::set_read_from(ModelAction *act)
        ASSERT(act);
 
        reads_from = act;
-       if (act->is_uninitialized()) {  // WL
-               uint64_t val = *((uint64_t *) location);
-               ModelAction * act_uninitialized = (ModelAction *)act;
-               act_uninitialized->set_value(val);
-               reads_from = act_uninitialized;
-               reads_from_value = val;
-
-// disabled by WL, because LLVM IR is unable to detect atomic init
-/*             model->assert_bug("May read from uninitialized atomic:\n"
-                                "    action %d, thread %d, location %p (%s, %s)",
-                                seq_number, id_to_int(tid), location,
-                                get_type_str(), get_mo_str());
- */
-       }
 }
 
 /**
@@ -692,7 +677,6 @@ const char * ModelAction::get_type_str() const
        case PTHREAD_CREATE: return "pthread create";
        case PTHREAD_JOIN: return "pthread join";
 
-       case ATOMIC_UNINIT: return "uninitialized";
        case NONATOMIC_WRITE: return "nonatomic write";
        case ATOMIC_READ: return "atomic read";
        case ATOMIC_WRITE: return "atomic write";
@@ -706,6 +690,7 @@ const char * ModelAction::get_type_str() const
        case ATOMIC_UNLOCK: return "unlock";
        case ATOMIC_TRYLOCK: return "trylock";
        case ATOMIC_WAIT: return "wait";
+       case ATOMIC_TIMEDWAIT: return "timed wait";
        case ATOMIC_NOTIFY_ONE: return "notify one";
        case ATOMIC_NOTIFY_ALL: return "notify all";
        case ATOMIC_ANNOTATION: return "annotation";
@@ -733,6 +718,9 @@ void ModelAction::print() const
        model_print("%-4d %-2d   %-14s  %7s  %14p   %-#18" PRIx64,
                                                        seq_number, id_to_int(tid), type_str, mo_str, location, get_return_value());
        if (is_read()) {
+               if (is_write()) {
+                       model_print("(%" PRIx64 ")", get_write_value());
+               }
                if (reads_from)
                        model_print("  %-3d", reads_from->get_seq_number());
                else