projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
action: add 'reads_from' member variable
[c11tester.git]
/
action.cc
diff --git
a/action.cc
b/action.cc
index 68a34aad8c76476084052c8fa615c5c54a502e1f..c96949bc906cc02a9ca3cb50af761a92feda94c7 100644
(file)
--- a/
action.cc
+++ b/
action.cc
@@
-5,19
+5,17
@@
#include "clockvector.h"
#include "common.h"
#include "clockvector.h"
#include "common.h"
-ModelAction::ModelAction(action_type_t type, memory_order order, void *loc, int value)
+ModelAction::ModelAction(action_type_t type, memory_order order, void *loc, int value) :
+ type(type),
+ order(order),
+ location(loc),
+ value(value),
+ reads_from(NULL),
+ cv(NULL)
{
Thread *t = thread_current();
{
Thread *t = thread_current();
- ModelAction *act = this;
-
- act->type = type;
- act->order = order;
- act->location = loc;
- act->tid = t->get_id();
- act->value = value;
- act->seq_number = model->get_next_seq_num();
-
- cv = NULL;
+ this->tid = t->get_id();
+ this->seq_number = model->get_next_seq_num();
}
ModelAction::~ModelAction()
}
ModelAction::~ModelAction()
@@
-33,7
+31,7
@@
bool ModelAction::is_read() const
bool ModelAction::is_write() const
{
bool ModelAction::is_write() const
{
- return type == ATOMIC_WRITE;
+ return type == ATOMIC_WRITE
|| type == ATOMIC_INIT
;
}
bool ModelAction::is_rmw() const
}
bool ModelAction::is_rmw() const
@@
-41,6
+39,11
@@
bool ModelAction::is_rmw() const
return type == ATOMIC_RMW;
}
return type == ATOMIC_RMW;
}
+bool ModelAction::is_initialization() const
+{
+ return type == ATOMIC_INIT;
+}
+
bool ModelAction::is_acquire() const
{
switch (order) {
bool ModelAction::is_acquire() const
{
switch (order) {
@@
-130,6
+133,7
@@
void ModelAction::read_from(const ModelAction *act)
ASSERT(cv);
if (act->is_release() && this->is_acquire())
cv->merge(act->cv);
ASSERT(cv);
if (act->is_release() && this->is_acquire())
cv->merge(act->cv);
+ reads_from = act;
value = act->value;
}
value = act->value;
}
@@
-166,12
+170,17
@@
void ModelAction::print(void) const
case ATOMIC_RMW:
type_str = "atomic rmw";
break;
case ATOMIC_RMW:
type_str = "atomic rmw";
break;
+ case ATOMIC_INIT:
+ type_str = "init atomic";
+ break;
default:
type_str = "unknown type";
}
default:
type_str = "unknown type";
}
- printf("(%3d) Thread: %-2d Action: %-13s MO: %d Loc: %14p Value: %d",
+ printf("(%3d) Thread: %-2d Action: %-13s MO: %d Loc: %14p Value: %
-4
d",
seq_number, id_to_int(tid), type_str, order, location, value);
seq_number, id_to_int(tid), type_str, order, location, value);
+ if (reads_from)
+ printf(" Rf: %d", reads_from->get_seq_number());
if (cv) {
printf("\t");
cv->print();
if (cv) {
printf("\t");
cv->print();