func_nodes()
{
/* The following are snapshot data structures */
- write_history = new HashTable<void *, value_set_t *, uintptr_t, 4>();
+ write_history = new HashTable<void *, value_set_t *, uintptr_t, 0>();
loc_rd_func_nodes_map = new HashTable<void *, SnapVector<FuncNode *> *, uintptr_t, 0>();
loc_wr_func_nodes_map = new HashTable<void *, SnapVector<FuncNode *> *, uintptr_t, 0>();
loc_waiting_writes_map = new HashTable<void *, SnapVector<ConcretePredicate *> *, uintptr_t, 0>();
last_func_node->add_out_edge(func_node);
}
+ /* Monitor the statuses of threads waiting for tid */
monitor_waiting_thread(func_id, tid);
}
void ModelHistory::process_action(ModelAction *act, thread_id_t tid)
{
ModelExecution * execution = model->get_execution();
- /* Return if thread i has not entered any function or has exited
- from all functions */
SnapVector<func_id_list_t> * thrd_func_list = execution->get_thrd_func_list();
SnapVector< SnapList<action_list_t *> *> *
thrd_func_act_lists = execution->get_thrd_func_act_lists();
- uint32_t id = id_to_int(tid);
- if ( thrd_func_list->size() <= id )
+ uint32_t thread_id = id_to_int(tid);
+ /* Return if thread tid has not entered any function that contains atomics */
+ if ( thrd_func_list->size() <= thread_id )
return;
- /* Get the function id that thread i is currently in */
- uint32_t func_id = (*thrd_func_list)[id].back();
- SnapList<action_list_t *> * func_act_lists = (*thrd_func_act_lists)[id];
+ /* Monitor the statuses of threads waiting for tid */
+ monitor_waiting_thread_counter(tid);
+ /* Every write action should be processed, including
+ * nonatomic writes (which have no position) */
if (act->is_write()) {
void * location = act->get_location();
uint64_t value = act->get_write_value();
check_waiting_write(act);
}
- /* The following does not care about actions without a position */
+ uint32_t func_id = (*thrd_func_list)[thread_id].back();
+
+ /* The following does not care about actions that are not inside
+ * any function that contains atomics or actions without a position */
if (func_id == 0 || act->get_position() == NULL)
return;
+ SnapList<action_list_t *> * func_act_lists = (*thrd_func_act_lists)[thread_id];
+
+ /* The list of actions that thread tid has taken in its current function */
action_list_t * curr_act_list = func_act_lists->back();
- ASSERT(curr_act_list != NULL);
if (skip_action(act, curr_act_list))
return;
- FuncNode * func_node = func_nodes[func_id];
-
/* Add to curr_inst_list */
curr_act_list->push_back(act);
+
+ FuncNode * func_node = func_nodes[func_id];
func_node->add_inst(act);
if (act->is_read()) {
void * location = write_act->get_location();
uint64_t value = write_act->get_write_value();
SnapVector<ConcretePredicate *> * concrete_preds = loc_waiting_writes_map->get(location);
- SnapVector<ConcretePredicate *> to_remove = SnapVector<ConcretePredicate *>();
if (concrete_preds == NULL)
return;
}
if (satisfy_predicate) {
- to_remove.push_back(concrete_pred);
+ /* Wake up threads */
+ thread_id_t tid = concrete_pred->get_tid();
+ Thread * thread = model->get_thread(tid);
+
+ //model_print("** thread %d is woken up\n", thread->get_id());
+ model->get_execution()->getFuzzer()->notify_paused_thread(thread);
}
index++;
}
-
- for (uint i = 0; i < to_remove.size(); i++) {
- ConcretePredicate * concrete_pred = to_remove[i];
-
- /* Wake up threads */
- thread_id_t tid = concrete_pred->get_tid();
- Thread * thread = model->get_thread(tid);
-
- model_print("** thread %d is woken up\n", thread->get_id());
- model->get_execution()->getFuzzer()->notify_paused_thread(thread);
- }
}
WaitObj * ModelHistory::getWaitObj(thread_id_t tid)
self_wait_obj->clear_waiting_for();
}
-void ModelHistory::stop_waiting_for(thread_id_t self_id,
+void ModelHistory::stop_waiting_for_node(thread_id_t self_id,
thread_id_t waiting_for_id, FuncNode * target_node)
{
WaitObj * self_wait_obj = getWaitObj(self_id);
- bool thread_removed = self_wait_obj->remove_waiting_for(waiting_for_id, target_node);
+ bool thread_removed = self_wait_obj->remove_waiting_for_node(waiting_for_id, target_node);
// model_print("\t%d gives up %d on node %d\n", self_id, waiting_for_id, target_node->get_func_id());
bool ModelHistory::skip_action(ModelAction * act, SnapList<ModelAction *> * curr_act_list)
{
+ ASSERT(curr_act_list != NULL);
+
bool second_part_of_rmw = act->is_rmwc() || act->is_rmw();
modelclock_t curr_seq_number = act->get_seq_number();
int new_dist = curr_node->compute_distance(target, old_dist);
if (new_dist == -1) {
- stop_waiting_for(waited_by_id, tid, target);
+ stop_waiting_for_node(waited_by_id, tid, target);
+ }
+ }
+ }
+}
+
+void ModelHistory::monitor_waiting_thread_counter(thread_id_t tid)
+{
+ WaitObj * wait_obj = getWaitObj(tid);
+ thrd_id_set_t * waited_by = wait_obj->getWaitedBy();
+
+ // Thread tid has taken an action, update the counter for threads waiting for tid
+ thrd_id_set_iter * tid_iter = waited_by->iterator();
+ while (tid_iter->hasNext()) {
+ thread_id_t waited_by_id = tid_iter->next();
+ WaitObj * other_wait_obj = getWaitObj(waited_by_id);
+
+ bool expire = other_wait_obj->incr_counter(tid);
+ if (expire) {
+// model_print("thread %d stops waiting for thread %d\n", waited_by_id, tid);
+ wait_obj->remove_waited_by(waited_by_id);
+ other_wait_obj->remove_waiting_for(tid);
+
+ thrd_id_set_t * other_waiting_for = other_wait_obj->getWaitingFor();
+ if ( other_waiting_for->isEmpty() ) {
+ // model_print("\tthread %d waits for nobody, wake up\n", self_id);
+ ModelExecution * execution = model->get_execution();
+ Thread * thread = execution->get_thread(waited_by_id);
+ execution->getFuzzer()->notify_paused_thread(thread);
}
}
}
projects / c11tester.git / blobdiff