{
Node *node = curr->get_node();
uint64_t value = VALUE_NONE;
- bool updated = false;
while (true) {
+ bool updated = false;
switch (node->get_read_from_status()) {
case READ_FROM_PAST: {
const ModelAction *rf = node->get_read_from_past();
ASSERT(rf);
mo_graph->startChanges();
- value = rf->get_value();
- check_recency(curr, rf);
- bool r_status = r_modification_order(curr, rf);
+
+ ASSERT(!is_infeasible());
+ if (!check_recency(curr, rf))
+ priv->too_many_reads = true;
+ updated = r_modification_order(curr, rf);
if (is_infeasible() && node->increment_read_from()) {
mo_graph->rollbackChanges();
continue;
}
+ value = rf->get_value();
read_from(curr, rf);
mo_graph->commitChanges();
mo_check_promises(curr, true);
- updated |= r_status;
break;
}
case READ_FROM_PROMISE: {
value = promise->get_value();
curr->set_read_from_promise(promise);
mo_graph->startChanges();
+ if (!check_recency(curr, promise))
+ priv->too_many_reads = true;
updated = r_modification_order(curr, promise);
mo_graph->commitChanges();
break;
return lastread;
}
+template <typename T, typename U>
+bool ModelChecker::should_read_instead(const ModelAction *curr, const T *rf, const U *other_rf) const
+{
+ /* Need a different write/promise */
+ if (other_rf->equals(rf))
+ return false;
+
+ /* Only look for "newer" writes/promises */
+ if (!mo_graph->checkReachable(rf, other_rf))
+ return false;
+
+ std::vector<action_list_t> *thrd_lists = get_safe_ptr_vect_action(obj_thrd_map, curr->get_location());
+ action_list_t *list = &(*thrd_lists)[id_to_int(curr->get_tid())];
+ action_list_t::reverse_iterator rit = list->rbegin();
+ ASSERT((*rit) == curr);
+ /* Skip past curr */
+ rit++;
+
+ /* Does this write/promise work for everyone? */
+ for (int i = 0; i < params.maxreads; i++, rit++) {
+ ModelAction *act = *rit;
+ if (!act->may_read_from(other_rf))
+ return false;
+ }
+ return true;
+}
+
/**
* Checks whether a thread has read from the same write for too many times
* without seeing the effects of a later write.
* 3) that other write must have been in the reads_from set for maxreads times.
*
* If so, we decide that the execution is no longer feasible.
+ *
+ * @param curr The current action. Must be a read.
+ * @param rf The ModelAction/Promise from which we might read.
+ * @return True if the read should succeed; false otherwise
*/
-void ModelChecker::check_recency(ModelAction *curr, const ModelAction *rf)
+template <typename T>
+bool ModelChecker::check_recency(ModelAction *curr, const T *rf) const
{
if (!params.maxreads)
- return;
+ return true;
//NOTE: Next check is just optimization, not really necessary....
- if (curr->get_node()->get_read_from_past_size() <= 1)
- return;
- /* Must make sure that execution is currently feasible... We could
- * accidentally clear by rolling back */
- if (is_infeasible())
- return;
+ if (curr->get_node()->get_read_from_past_size() +
+ curr->get_node()->get_read_from_promise_size() <= 1)
+ return true;
std::vector<action_list_t> *thrd_lists = get_safe_ptr_vect_action(obj_thrd_map, curr->get_location());
int tid = id_to_int(curr->get_tid());
/* See if we have enough reads from the same value */
for (int count = 0; count < params.maxreads; ritcopy++, count++) {
if (ritcopy == list->rend())
- return;
+ return true;
ModelAction *act = *ritcopy;
if (!act->is_read())
- return;
- if (act->get_reads_from() != rf)
- return;
- if (act->get_node()->get_read_from_past_size() <= 1)
- return;
+ return true;
+ if (act->get_reads_from_promise() && !act->get_reads_from_promise()->equals(rf))
+ return true;
+ if (act->get_reads_from() && !act->get_reads_from()->equals(rf))
+ return true;
+ if (act->get_node()->get_read_from_past_size() +
+ act->get_node()->get_read_from_promise_size() <= 1)
+ return true;
}
for (int i = 0; i < curr->get_node()->get_read_from_past_size(); i++) {
- /* Get write */
const ModelAction *write = curr->get_node()->get_read_from_past(i);
-
- /* Need a different write */
- if (write == rf)
- continue;
-
- //NOTE: SHOULD MAKE SURE write is MOd after rf
-
- /* Test to see whether this is a feasible write to read from */
- /** NOTE: all members of read-from set should be
- * feasible, so we no longer check it here **/
-
- ritcopy = rit;
-
- bool feasiblewrite = true;
- /* now we need to see if this write works for everyone */
- for (int loop = params.maxreads; loop > 0; loop--, ritcopy++) {
- ModelAction *act = *ritcopy;
- if (!act->may_read_from(write)) {
- feasiblewrite = false;
- break;
- }
- }
- if (feasiblewrite) {
- priv->too_many_reads = true;
- return;
- }
+ if (should_read_instead(curr, rf, write))
+ return false; /* liveness failure */
+ }
+ for (int i = 0; i < curr->get_node()->get_read_from_promise_size(); i++) {
+ const Promise *promise = curr->get_node()->get_read_from_promise(i);
+ if (should_read_instead(curr, rf, promise))
+ return false; /* liveness failure */
}
+ return true;
}
/**
projects / c11tester.git / blobdiff