*/
void Node::set_promise(unsigned int i) {
if (i >= promises.size())
- promises.resize(i + 1, 0);
- promises[i] = 1;
+ promises.resize(i + 1, PROMISE_IGNORE);
+ if (promises[i] == PROMISE_IGNORE)
+ promises[i] = PROMISE_UNFULFILLED;
}
/**
* @return true if the promise should be satisfied by the given model action.
*/
bool Node::get_promise(unsigned int i) {
- return (i < promises.size()) && (promises[i] == 2);
+ return (i < promises.size()) && (promises[i] == PROMISE_FULFILLED);
}
/**
*/
bool Node::increment_promise() {
for (unsigned int i = 0; i < promises.size(); i++) {
- if (promises[i] == 1) {
- promises[i] = 2;
+ if (promises[i] == PROMISE_UNFULFILLED) {
+ promises[i] = PROMISE_FULFILLED;
while (i > 0) {
i--;
- if (promises[i] == 2)
- promises[i] = 1;
+ if (promises[i] == PROMISE_FULFILLED)
+ promises[i] = PROMISE_UNFULFILLED;
}
return true;
}
*/
bool Node::promise_empty() {
for (unsigned int i = 0; i < promises.size();i++)
- if (promises[i] == 1)
+ if (promises[i] == PROMISE_UNFULFILLED)
return false;
return true;
}
* Adds a value from a weakly ordered future write to backtrack to.
* @param value is the value to backtrack to.
*/
-bool Node::add_future_value(uint64_t value) {
- for (unsigned int i = 0; i < future_values.size(); i++)
- if (future_values[i] == value)
- return false;
+bool Node::add_future_value(uint64_t value, modelclock_t expiration) {
+ int suitableindex=-1;
+ for (unsigned int i = 0; i < future_values.size(); i++) {
+ if (future_values[i].value == value) {
+ if (future_values[i].expiration>=expiration)
+ return false;
+ if (future_index < i) {
+ suitableindex=i;
+ }
+ }
+ }
- future_values.push_back(value);
+ if (suitableindex!=-1) {
+ future_values[suitableindex].expiration=expiration;
+ return true;
+ }
+ struct future_value newfv={value, expiration};
+ future_values.push_back(newfv);
return true;
}
*/
uint64_t Node::get_future_value() {
ASSERT(future_index<future_values.size());
- return future_values[future_index];
+ return future_values[future_index].value;
+}
+
+modelclock_t Node::get_future_value_expiration() {
+ ASSERT(future_index<future_values.size());
+ return future_values[future_index].expiration;
+}
+
+
+int Node::get_read_from_size() {
+ return may_read_from.size();
+}
+
+const ModelAction * Node::get_read_from_at(int i) {
+ return may_read_from[i];
}
/**