Add some documentation for WaitObj

[c11tester.git] / newfuzzer.cc

diff --git a/newfuzzer.cc b/newfuzzer.cc
index 00219b637550d9a6b77d8a768935a2ff37631508..6810d022a990fc6f50765a653b21ce2de5bc2745 100644 (file)
--- a/newfuzzer.cc
+++ b/newfuzzer.cc
@@ -6,6 +6,7 @@
 #include "funcinst.h"
 #include "predicate.h"
 #include "concretepredicate.h"
+#include "waitobj.h"
 
 #include "model.h"
 #include "schedule.h"
@@ -16,7 +17,7 @@ NewFuzzer::NewFuzzer() :
        thrd_curr_pred(),
        thrd_selected_child_branch(),
        thrd_pruned_writes(),
-       paused_thread_set(),
+       paused_thread_list(),
        paused_thread_table(128)
 {}
 
@@ -44,18 +45,18 @@ int NewFuzzer::selectWrite(ModelAction *read, SnapVector<ModelAction *> * rf_set
                thrd_last_read_act[thread_id] = read;
 
                FuncNode * func_node = history->get_curr_func_node(tid);
-               inst_act_map_t * inst_act_map = func_node->get_inst_act_map(tid);
                Predicate * curr_pred = func_node->get_predicate_tree_position(tid);
                FuncInst * read_inst = func_node->get_inst(read);
-
                Predicate * selected_branch = selectBranch(tid, curr_pred, read_inst);
+
+               inst_act_map_t * inst_act_map = func_node->get_inst_act_map(tid);
                prune_writes(tid, selected_branch, rf_set, inst_act_map);
        }
 
        // No write satisfies the selected predicate, so pause this thread.
        if ( rf_set->size() == 0 ) {
                Thread * read_thread = execution->get_thread(tid);
-               model_print("the %d read action of thread %d is unsuccessful\n", read->get_seq_number(), read_thread->get_id());
+               model_print("the %d read action of thread %d at %p is unsuccessful\n", read->get_seq_number(), read_thread->get_id(), read->get_location());
 
                // reset thread pending action and revert sequence numbers
                read_thread->set_pending(read);
@@ -63,6 +64,7 @@ int NewFuzzer::selectWrite(ModelAction *read, SnapVector<ModelAction *> * rf_set
                execution->restore_last_seq_num();
 
                conditional_sleep(read_thread);
+
                return -1;
 /*
                SnapVector<ModelAction *> * pruned_writes = thrd_pruned_writes[thread_id];
@@ -208,13 +210,13 @@ bool NewFuzzer::prune_writes(thread_id_t tid, Predicate * pred,
  */
 void NewFuzzer::conditional_sleep(Thread * thread)
 {
-       int index = paused_thread_set.size();
+       int index = paused_thread_list.size();
 
        model->getScheduler()->add_sleep(thread);
-       paused_thread_set.push_back(thread);
+       paused_thread_list.push_back(thread);
        paused_thread_table.put(thread, index); // Update table
 
-       /*  */
+       /* Add the waiting condition to ModelHistory */
        ModelAction * read = thread->get_pending();
        thread_id_t tid = thread->get_id();
        FuncNode * func_node = history->get_curr_func_node(tid);
@@ -225,19 +227,21 @@ void NewFuzzer::conditional_sleep(Thread * thread)
        concrete->set_location(read->get_location());
 
        history->add_waiting_write(concrete);
+
+       /* history->add_waiting_thread is called in find_threads */
+       find_threads(read);
 }
 
 bool NewFuzzer::has_paused_threads()
 {
-       return paused_thread_set.size() != 0;
+       return paused_thread_list.size() != 0;
 }
 
 Thread * NewFuzzer::selectThread(int * threadlist, int numthreads)
 {
        if (numthreads == 0 && has_paused_threads()) {
                wake_up_paused_threads(threadlist, &numthreads);
-               model_print("list size: %d\n", numthreads);
-               model_print("active t id: %d\n", threadlist[0]);
+               //model_print("list size: %d, active t id: %d\n", numthreads, threadlist[0]);
        }
 
        int random_index = random() % numthreads;
@@ -251,18 +255,19 @@ Thread * NewFuzzer::selectThread(int * threadlist, int numthreads)
  */
 void NewFuzzer::wake_up_paused_threads(int * threadlist, int * numthreads)
 {
-       int random_index = random() % paused_thread_set.size();
-       Thread * thread = paused_thread_set[random_index];
+       int random_index = random() % paused_thread_list.size();
+       Thread * thread = paused_thread_list[random_index];
        model->getScheduler()->remove_sleep(thread);
 
-       Thread * last_thread = paused_thread_set.back();
-       paused_thread_set[random_index] = last_thread;
-       paused_thread_set.pop_back();
+       Thread * last_thread = paused_thread_list.back();
+       paused_thread_list[random_index] = last_thread;
+       paused_thread_list.pop_back();
        paused_thread_table.put(last_thread, random_index);     // Update table
        paused_thread_table.remove(thread);
 
        thread_id_t tid = thread->get_id();
        history->remove_waiting_write(tid);
+       history->remove_waiting_thread(tid);
 
        model_print("thread %d is woken up\n", tid);
        threadlist[*numthreads] = tid;
@@ -277,14 +282,47 @@ void NewFuzzer::notify_paused_thread(Thread * thread)
        int index = paused_thread_table.get(thread);
        model->getScheduler()->remove_sleep(thread);
 
-       Thread * last_thread = paused_thread_set.back();
-       paused_thread_set[index] = last_thread;
-       paused_thread_set.pop_back();
+       Thread * last_thread = paused_thread_list.back();
+       paused_thread_list[index] = last_thread;
+       paused_thread_list.pop_back();
        paused_thread_table.put(last_thread, index);    // Update table
        paused_thread_table.remove(thread);
 
        thread_id_t tid = thread->get_id();
        history->remove_waiting_write(tid);
+       history->remove_waiting_thread(tid);
+}
+
+/* Find threads that may write values that the pending read action is waiting for */
+void NewFuzzer::find_threads(ModelAction * pending_read)
+{
+       ASSERT(pending_read->is_read());
+
+       void * location = pending_read->get_location();
+       thread_id_t self_id = pending_read->get_tid();
+
+       SnapVector<FuncNode *> * func_node_list = history->getWrFuncNodes(location);
+       for (uint i = 0; i < func_node_list->size(); i++) {
+               FuncNode * target_node = (*func_node_list)[i];
+               for (uint i = 1; i < execution->get_num_threads(); i++) {
+                       thread_id_t tid = int_to_id(i);
+                       if (tid == self_id)
+                               continue;
+
+                       FuncNode * node = history->get_curr_func_node(tid);
+                       /* It is possible that thread tid is not in any FuncNode */
+                       if (node == NULL)
+                               continue;
+
+                       int distance = node->compute_distance(target_node);
+                       if (distance != -1) {
+                               history->add_waiting_thread(self_id, tid, target_node, distance);
+                               model_print("thread: %d; distance from node %d to node %d: %d\n", tid, node->get_func_id(), target_node->get_func_id(), distance);
+
+                       }
+
+               }
+       }
 }
 
 bool NewFuzzer::shouldWait(const ModelAction * act)