if (act_list == NULL || act_list->size() == 0)
return;
- HashTable<void *, value_set_t *, uintptr_t, 4> * write_history = history->getWriteHistory();
+ HashTable<void *, value_set_t *, uintptr_t, 0> * write_history = history->getWriteHistory();
/* build inst_list from act_list for later processing */
func_inst_list_t inst_list;
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>();
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)
{
WaitObj * wait_obj = getWaitObj(tid);
thrd_id_set_t * waited_by = wait_obj->getWaitedBy();
- SnapVector<thread_id_t> expire_threads;
// Thread tid has taken an action, update the counter for threads waiting for tid
thrd_id_set_iter * tid_iter = waited_by->iterator();
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);
FuncNode * get_curr_func_node(thread_id_t tid);
void update_write_history(void * location, uint64_t write_val);
- HashTable<void *, value_set_t *, uintptr_t, 4> * getWriteHistory() { return write_history; }
+ HashTable<void *, value_set_t *, uintptr_t, 0> * getWriteHistory() { return write_history; }
void update_loc_rd_func_nodes_map(void * location, FuncNode * node);
void update_loc_wr_func_nodes_map(void * location, FuncNode * node);
SnapVector<FuncNode *> * getRdFuncNodes(void * location);
ModelVector<FuncNode *> func_nodes;
/* Map a location to a set of values that have been written to it */
- HashTable<void *, value_set_t *, uintptr_t, 4> * write_history;
+ HashTable<void *, value_set_t *, uintptr_t, 0> * write_history;
/* Map a location to FuncNodes that may read from it */
HashTable<void *, SnapVector<FuncNode *> *, uintptr_t, 0> * loc_rd_func_nodes_map;