NewFuzzer::NewFuzzer() :
thrd_last_read_act(),
thrd_last_func_inst(),
- tmp_branches_storage(),
+ available_branches_tmp_storage(),
thrd_selected_child_branch(),
thrd_pruned_writes(),
paused_thread_list(),
thrd_last_func_inst[thread_id] = read_inst;
}
- // No write satisfies the selected predicate, so pause this thread.
- while ( rf_set->size() == 0 ) {
- Predicate * selected_branch = get_selected_child_branch(tid);
-
- //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());
-
- SnapVector<ModelAction *> * pruned_writes = thrd_pruned_writes[thread_id];
- for (uint i = 0;i < pruned_writes->size();i++) {
- rf_set->push_back( (*pruned_writes)[i] );
- }
-
- // Reselect a predicate and prune writes
- Predicate * curr_pred = selected_branch->get_parent();
- FuncInst * read_inst = thrd_last_func_inst[thread_id];
- selected_branch = selectBranch(tid, curr_pred, read_inst);
-
- FuncNode * func_node = history->get_curr_func_node(tid);
- inst_act_map_t * inst_act_map = func_node->get_inst_act_map(tid);
- prune_writes(tid, selected_branch, rf_set, inst_act_map);
-
- ASSERT(selected_branch);
- }
-
ASSERT(rf_set->size() != 0);
int random_index = random() % rf_set->size();
bool NewFuzzer::check_store_visibility(Predicate * curr_pred, FuncInst * read_inst,
inst_act_map_t * inst_act_map, SnapVector<ModelAction *> * rf_set)
{
+ available_branches_tmp_storage.clear();
+
ASSERT(!rf_set->empty());
if (curr_pred == NULL || read_inst == NULL)
return false;
any_child_match = true;
/* Do not check unset predicates */
- if (pred_expressions->isEmpty())
+ if (pred_expressions->isEmpty()) {
+ available_branches_tmp_storage.push_back(branch);
continue;
+ }
branch->incr_total_checking_count();
/* If one write value satisfies the predicate, go to check the next predicate */
if (satisfy_predicate) {
branch->incr_store_visible_count();
+ available_branches_tmp_storage.push_back(branch);
break;
}
}
return any_child_match;
}
-
/* Select a random branch from the children of curr_pred
* @return The selected branch
*/
return NULL;
}
- ModelVector<Predicate *> * children = curr_pred->get_children();
- tmp_branches_storage.clear();
-
- for (uint i = 0; i < children->size(); i++) {
- Predicate * child = (*children)[i];
- if (child->get_func_inst() == read_inst && !failed_predicates.contains(child)) {
- tmp_branches_storage.push_back(child);
- }
- }
-
// predicate children have not been generated
- if (tmp_branches_storage.size() == 0) {
+ if (available_branches_tmp_storage.size() == 0) {
thrd_selected_child_branch[thread_id] = NULL;
return NULL;
}
- int index = choose_index(&tmp_branches_storage, 0);
- Predicate * random_branch = tmp_branches_storage[ index ];
+ int index = choose_index(&available_branches_tmp_storage);
+ Predicate * random_branch = available_branches_tmp_storage[ index ];
thrd_selected_child_branch[thread_id] = random_branch;
return random_branch;
}
/**
- * @brief Select a branch from the given predicate branches based
- * on their exploration counts.
- *
- * Let b_1, ..., b_n be branches with exploration counts c_1, ..., c_n
- * M := max(c_1, ..., c_n) + 1
- * Factor f_i := M / (c_i + 1)
- * The probability p_i that branch b_i is selected:
- * p_i := f_i / (f_1 + ... + f_n)
- * = \fraction{ 1/(c_i + 1) }{ 1/(c_1 + 1) + ... + 1/(c_n + 1) }
- *
- * Note: (1) c_i + 1 is used because counts may be 0.
- * (2) The numerator of f_i is chosen to reduce the effect of underflow
- *
- * @param numerator is M defined above
+ * @brief Select a branch from the given predicate branch
*/
-int NewFuzzer::choose_index(SnapVector<Predicate *> * branches, uint32_t numerator)
+int NewFuzzer::choose_index(SnapVector<Predicate *> * branches)
{
return random() % branches->size();
-/*--
- if (branches->size() == 1)
- return 0;
-
- double total_factor = 0;
- SnapVector<double> factors = SnapVector<double>( branches->size() + 1 );
- for (uint i = 0; i < branches->size(); i++) {
- Predicate * branch = (*branches)[i];
- double factor = (double) numerator / (branch->get_expl_count() + 5 * branch->get_fail_count() + 1);
- total_factor += factor;
- factors.push_back(factor);
- }
-
- double prob = (double) random() / RAND_MAX;
- double prob_sum = 0;
- int index = 0;
-
- for (uint i = 0; i < factors.size(); i++) {
- index = i;
- prob_sum += (double) (factors[i] / total_factor);
- if (prob_sum > prob) {
- break;
- }
- }
-
- return index;
- */
}
Predicate * NewFuzzer::get_selected_child_branch(thread_id_t tid)
projects / c11tester.git / blobdiff