Merge branch 'branch-weiyu' of /home/git/random-fuzzer into new_fuzzer

[c11tester.git] / execution.cc

diff --git a/execution.cc b/execution.cc
index 290a262..de2cace 100644 (file)
--- a/execution.cc
+++ b/execution.cc
@@ -277,7 +277,6 @@ ModelAction * ModelExecution::convertNonAtomicStore(void * location) {
        return act;
 }
 
        return act;
 }
 

-

 /**
  * Processes a read model action.
  * @param curr is the read model action to process.
 /**
  * Processes a read model action.
  * @param curr is the read model action to process.


@@ -1632,7 +1631,7 @@ Thread * ModelExecution::take_step(ModelAction *curr)
        ASSERT(curr);
 
        /* Process this action in ModelHistory for records*/
        ASSERT(curr);
 
        /* Process this action in ModelHistory for records*/

-       model->get_history()->process_action( curr, curr_thrd->get_id() );
+       model->get_history()->process_action( curr, curr->get_tid() );

 
        if (curr_thrd->is_blocked() || curr_thrd->is_complete())
                scheduler->remove_thread(curr_thrd);
 
        if (curr_thrd->is_blocked() || curr_thrd->is_complete())
                scheduler->remove_thread(curr_thrd);