Lock model check when we terminate proxy thread

[c11tester.git] / execution.cc

diff --git a/execution.cc b/execution.cc
index 3f8a78cf0dbf6f1643e0f896852d668d992a1b07..422b82a988255d4b7b1125ec75d7f6f8f21159f0 100644 (file)
--- a/execution.cc
+++ b/execution.cc
@@ -191,6 +191,16 @@ bool ModelExecution::have_bug_reports() const
        return priv->bugs.size() != 0;
 }
 
+/** @return True, if any fatal bugs have been reported for this execution.
+ *  Any bug other than a data race is considered a fatal bug. Data races
+ *  are not considered fatal unless the number of races is exceeds
+ *  a threshold (temporarily set as 15).
+ */
+bool ModelExecution::have_fatal_bug_reports() const
+{
+       return priv->bugs.size() != 0;
+}
+
 SnapVector<bug_message *> * ModelExecution::get_bugs() const
 {
        return &priv->bugs;
@@ -260,6 +270,7 @@ ModelAction * ModelExecution::convertNonAtomicStore(void * location) {
        getStoreThreadAndClock(location, &storethread, &storeclock);
        setAtomicStoreFlag(location);
        ModelAction * act = new ModelAction(NONATOMIC_WRITE, memory_order_relaxed, location, value, get_thread(storethread));
+       act->set_seq_number(storeclock);
        add_normal_write_to_lists(act);
        add_write_to_lists(act);
        w_modification_order(act);
@@ -276,13 +287,13 @@ ModelAction * ModelExecution::convertNonAtomicStore(void * location) {
 void ModelExecution::process_read(ModelAction *curr, SnapVector<ModelAction *> * rf_set)
 {
        SnapVector<const ModelAction *> * priorset = new SnapVector<const ModelAction *>();
-       while(true) {
-               bool hasnonatomicstore = hasNonAtomicStore(curr->get_location());
-               if (hasnonatomicstore) {
-                       ModelAction * nonatomicstore = convertNonAtomicStore(curr->get_location());
-                       rf_set->push_back(nonatomicstore);
-               }
+       bool hasnonatomicstore = hasNonAtomicStore(curr->get_location());
+       if (hasnonatomicstore) {
+               ModelAction * nonatomicstore = convertNonAtomicStore(curr->get_location());
+               rf_set->push_back(nonatomicstore);
+       }
 
+       while(true) {
                int index = fuzzer->selectWrite(curr, rf_set);
                ModelAction *rf = (*rf_set)[index];
 
@@ -450,8 +461,8 @@ bool ModelExecution::process_fence(ModelAction *curr)
                                continue;
 
                        /* Establish hypothetical release sequences */
-                       ClockVector *cv = get_hb_from_write(act);
-                       if (curr->get_cv()->merge(cv))
+                       ClockVector *cv = get_hb_from_write(act->get_reads_from());
+                       if (cv != NULL && curr->get_cv()->merge(cv))
                                updated = true;
                }
        }
@@ -841,7 +852,7 @@ bool ModelExecution::r_modification_order(ModelAction *curr, const ModelAction *
                        if (act->happens_before(curr)) {
                                if (i==0) {
                                        if (last_sc_fence_local == NULL ||
-                                                       (*last_sc_fence_local < *prev_same_thread)) {
+                                                       (*last_sc_fence_local < *act)) {
                                                prev_same_thread = act;
                                        }
                                }
@@ -1138,8 +1149,6 @@ void insertIntoActionList(action_list_t *list, ModelAction *act) {
                for(;rit != list->rend();rit++) {
                        if ((*rit)->get_seq_number() == next_seq) {
                                action_list_t::iterator it = rit.base();
-                               it++;   //get to right sequence number
-                               it++;   //get to item after it
                                list->insert(it, act);
                                break;
                        }
@@ -1160,8 +1169,6 @@ void insertIntoActionListAndSetCV(action_list_t *list, ModelAction *act) {
                        if ((*rit)->get_seq_number() == next_seq) {
                                act->create_cv((*rit));
                                action_list_t::iterator it = rit.base();
-                               it++;   //get to right sequence number
-                               it++;   //get to item after it
                                list->insert(it, act);
                                break;
                        }
@@ -1180,9 +1187,10 @@ void insertIntoActionListAndSetCV(action_list_t *list, ModelAction *act) {
 void ModelExecution::add_normal_write_to_lists(ModelAction *act)
 {
        int tid = id_to_int(act->get_tid());
+       insertIntoActionListAndSetCV(&action_trace, act);
+
        action_list_t *list = get_safe_ptr_action(&obj_map, act->get_location());
        insertIntoActionList(list, act);
-       insertIntoActionListAndSetCV(&action_trace, act);
 
        // Update obj_thrd_map, a per location, per thread, order of actions
        SnapVector<action_list_t> *vec = get_safe_ptr_vect_action(&obj_thrd_map, act->get_location());
@@ -1623,8 +1631,8 @@ Thread * ModelExecution::take_step(ModelAction *curr)
        curr = check_current_action(curr);
        ASSERT(curr);
 
-       // model_print("poitner loc: %p, thread: %d, type: %d, order: %d, position: %s\n", curr, curr->get_tid(), curr->get_type(), curr->get_mo(), curr->get_position() );
-       model->get_history()->add_func_atomic( curr, curr_thrd->get_id() );
+       /* Process this action in ModelHistory for records*/
+       model->get_history()->process_action( curr, curr_thrd->get_id() );
 
        if (curr_thrd->is_blocked() || curr_thrd->is_complete())
                scheduler->remove_thread(curr_thrd);