projects
/
model-checker.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cef10a2
)
action: edit some spacing
author
Brian Norris
<banorris@uci.edu>
Wed, 3 Oct 2012 00:58:01 +0000
(17:58 -0700)
committer
Brian Norris
<banorris@uci.edu>
Wed, 3 Oct 2012 00:59:49 +0000
(17:59 -0700)
action.cc
patch
|
blob
|
history
diff --git
a/action.cc
b/action.cc
index 6a18ffee8359603d41c475b374817e910287906c..1655d9428eb57041287c7b2bef12e3742b7058f1 100644
(file)
--- a/
action.cc
+++ b/
action.cc
@@
-27,31
+27,38
@@
ModelAction::~ModelAction()
delete cv;
}
delete cv;
}
-void ModelAction::copy_from_new(ModelAction *newaction) {
- seq_number=newaction->seq_number;
+void ModelAction::copy_from_new(ModelAction *newaction)
+{
+ seq_number = newaction->seq_number;
}
}
-bool ModelAction::is_mutex_op() const {
+bool ModelAction::is_mutex_op() const
+{
return type == ATOMIC_LOCK || type == ATOMIC_TRYLOCK || type == ATOMIC_UNLOCK;
}
return type == ATOMIC_LOCK || type == ATOMIC_TRYLOCK || type == ATOMIC_UNLOCK;
}
-bool ModelAction::is_lock() const {
+bool ModelAction::is_lock() const
+{
return type == ATOMIC_LOCK;
}
return type == ATOMIC_LOCK;
}
-bool ModelAction::is_unlock() const {
+bool ModelAction::is_unlock() const
+{
return type == ATOMIC_UNLOCK;
}
return type == ATOMIC_UNLOCK;
}
-bool ModelAction::is_trylock() const {
+bool ModelAction::is_trylock() const
+{
return type == ATOMIC_TRYLOCK;
}
return type == ATOMIC_TRYLOCK;
}
-bool ModelAction::is_success_lock() const {
+bool ModelAction::is_success_lock() const
+{
return type == ATOMIC_LOCK || (type == ATOMIC_TRYLOCK && value == VALUE_TRYSUCCESS);
}
return type == ATOMIC_LOCK || (type == ATOMIC_TRYLOCK && value == VALUE_TRYSUCCESS);
}
-bool ModelAction::is_failed_trylock() const {
+bool ModelAction::is_failed_trylock() const
+{
return (type == ATOMIC_TRYLOCK && value == VALUE_TRYFAILED);
}
return (type == ATOMIC_TRYLOCK && value == VALUE_TRYFAILED);
}
@@
-130,8
+137,8
@@
bool ModelAction::same_thread(const ModelAction *act) const
}
void ModelAction::copy_typeandorder(ModelAction * act) {
}
void ModelAction::copy_typeandorder(ModelAction * act) {
- this->type
=
act->type;
- this->order
=
act->order;
+ this->type
=
act->type;
+ this->order
=
act->order;
}
/** This method changes an existing read part of an RMW action into either:
}
/** This method changes an existing read part of an RMW action into either: