projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
promise: update comments/names to reflect usage
[model-checker.git]
/
action.cc
diff --git
a/action.cc
b/action.cc
index bb2b282a67a9c5aa3852d57c7936b438fc3688d1..2fb498f4a05baf6dc783f7efdf2efc5bd2db0c9b 100644
(file)
--- a/
action.cc
+++ b/
action.cc
@@
-393,10
+393,22
@@
Node * ModelAction::get_node() const
void ModelAction::set_read_from(const ModelAction *act)
{
reads_from = act;
void ModelAction::set_read_from(const ModelAction *act)
{
reads_from = act;
+ reads_from_promise = NULL;
if (act && act->is_uninitialized())
model->assert_bug("May read from uninitialized atomic\n");
}
if (act && act->is_uninitialized())
model->assert_bug("May read from uninitialized atomic\n");
}
+/**
+ * Set this action's read-from promise
+ * @param promise The promise to read from
+ */
+void ModelAction::set_read_from_promise(const Promise *promise)
+{
+ ASSERT(is_read());
+ reads_from_promise = promise;
+ reads_from = NULL;
+}
+
/**
* Synchronize the current thread with the thread corresponding to the
* ModelAction parameter.
/**
* Synchronize the current thread with the thread corresponding to the
* ModelAction parameter.
@@
-498,8
+510,10
@@
void ModelAction::print() const
}
uint64_t valuetoprint;
}
uint64_t valuetoprint;
- if (
type == ATOMIC_READ && reads_from != NULL
)
+ if (
is_read() && reads_from
)
valuetoprint = reads_from->value;
valuetoprint = reads_from->value;
+ else if (is_read() && reads_from_promise)
+ valuetoprint = reads_from_promise->get_value();
else
valuetoprint = value;
else
valuetoprint = value;