projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
implement usleep and sleep system calls as no operation which returns control to...
[c11tester.git]
/
action.cc
diff --git
a/action.cc
b/action.cc
index af849074a199cc15d5e5d30e1e727a240cc81284..df44af19953e334e47ba65d56a249e9cd47840a2 100644
(file)
--- a/
action.cc
+++ b/
action.cc
@@
-45,7
+45,7
@@
ModelAction::ModelAction(action_type_t type, memory_order order, void *loc,
seq_number(ACTION_INITIAL_CLOCK)
{
/* References to NULL atomic variables can end up here */
seq_number(ACTION_INITIAL_CLOCK)
{
/* References to NULL atomic variables can end up here */
- ASSERT(loc || type == ATOMIC_FENCE);
+ ASSERT(loc || type == ATOMIC_FENCE
|| type == NOOP
);
Thread *t = thread ? thread : thread_current();
this->tid = t->get_id();
Thread *t = thread ? thread : thread_current();
this->tid = t->get_id();
@@
-117,7
+117,7
@@
ModelAction::ModelAction(action_type_t type, const char * position, memory_order
Thread *t = thread ? thread : thread_current();
this->tid = t->get_id();
Thread *t = thread ? thread : thread_current();
this->tid = t->get_id();
- model_print("position: %s\n", position);
+
//
model_print("position: %s\n", position);
}
}