//sending our value to two rmws... not going to work..try next combination
continue;
}
- promises[i] = (promises[i] & PROMISE_RMW) |PROMISE_FULFILLED;
+ promises[i] = (promises[i] & PROMISE_RMW) | PROMISE_FULFILLED;
while (i > 0) {
i--;
if ((promises[i] & PROMISE_MASK) == PROMISE_FULFILLED)
for (int i = promises.size() - 1; i >= 0; i--) {
if (promises[i] == PROMISE_UNFULFILLED)
return false;
- if (!fulfilledrmw && ((promises[i]&PROMISE_MASK) == PROMISE_UNFULFILLED))
+ if (!fulfilledrmw && ((promises[i] & PROMISE_MASK) == PROMISE_UNFULFILLED))
return false;
- if (promises[i] == (PROMISE_FULFILLED|PROMISE_RMW))
+ if (promises[i] == (PROMISE_FULFILLED | PROMISE_RMW))
fulfilledrmw = true;
}
return true;
* @param value is the value to backtrack to.
* @return True if the future value was successully added; false otherwise
*/
-bool Node::add_future_value(const ModelAction *writer, modelclock_t expiration)
+bool Node::add_future_value(struct future_value fv)
{
- uint64_t value = writer->get_value();
+ uint64_t value = fv.value;
+ modelclock_t expiration = fv.expiration;
+ thread_id_t tid = fv.tid;
int idx = -1; /* Highest index where value is found */
for (unsigned int i = 0; i < future_values.size(); i++) {
- if (future_values[i].value == value) {
+ if (future_values[i].value == value && future_values[i].tid == tid) {
if (expiration <= future_values[i].expiration)
return false;
idx = i;
(int)future_values.size() >= model->params.maxfuturevalues)
return false;
- struct future_value newfv = {value, expiration};
- future_values.push_back(newfv);
+ future_values.push_back(fv);
return true;
}
if (model->params.fairwindow != 0 && head_idx > (int)model->params.fairwindow)
prevfairness = node_list[head_idx - model->params.fairwindow];
}
- node_list.push_back(new Node(act, head, model->get_num_threads(), prevfairness));
+
+ int next_threads = model->get_num_threads();
+ if (act->get_type() == THREAD_CREATE)
+ next_threads++;
+ node_list.push_back(new Node(act, head, next_threads, prevfairness));
total_nodes++;
head_idx++;
return NULL;