Add documentation

[model-checker.git] / action.cc

diff --git a/action.cc b/action.cc
index 8793337448dda45a86ade51d63e6eba2b8960c0c..f0ad48feaf731d808f69212b5926170e4ce96905 100644 (file)
--- a/action.cc
+++ b/action.cc
@@ -28,7 +28,7 @@ ModelAction::~ModelAction()
 
 bool ModelAction::is_read() const
 {
-       return type == ATOMIC_READ || type == ATOMIC_RMW;
+       return type == ATOMIC_READ || type == ATOMIC_RMWR || type == ATOMIC_RMW;
 }
 
 bool ModelAction::is_write() const
@@ -36,11 +36,21 @@ bool ModelAction::is_write() const
        return type == ATOMIC_WRITE || type == ATOMIC_RMW || type == ATOMIC_INIT;
 }
 
+bool ModelAction::is_rmwr() const
+{
+       return type == ATOMIC_RMWR;
+}
+
 bool ModelAction::is_rmw() const
 {
        return type == ATOMIC_RMW;
 }
 
+bool ModelAction::is_rmwc() const
+{
+       return type == ATOMIC_RMWC;
+}
+
 bool ModelAction::is_initialization() const
 {
        return type == ATOMIC_INIT;
@@ -85,13 +95,27 @@ bool ModelAction::same_thread(const ModelAction *act) const
        return tid == act->tid;
 }
 
-void ModelAction::upgrade_rmw(ModelAction * act) {
-       ASSERT(is_read());
-       ASSERT(act->is_rmw());
-       //Upgrade our type to the act's type
+void ModelAction::copy_typeandorder(ModelAction * act) {
        this->type=act->type;
        this->order=act->order;
-       this->value=act->value;
+}
+
+/** This method changes an existing read part of an RMW action into either:
+ *  (1) a full RMW action in case of the completed write or
+ *  (2) a READ action in case a failed action.
+ */
+
+//TODO:  If the memory_order changes, we may potentially need to update our
+//clock vector.
+
+void ModelAction::process_rmw(ModelAction * act) {
+       this->order=act->order;
+       if (act->is_rmwc())
+               this->type=ATOMIC_READ;
+       else if (act->is_rmw()) {
+               this->type=ATOMIC_RMW;
+               this->value=act->value;
+       }
 }
 
 /** The is_synchronizing method should only explore interleavings if:
@@ -139,6 +163,8 @@ void ModelAction::create_cv(const ModelAction *parent)
                cv = new ClockVector(NULL, this);
 }
 
+
+/** Update the model action's read_from action */
 void ModelAction::read_from(const ModelAction *act)
 {
        ASSERT(cv);
@@ -183,6 +209,12 @@ void ModelAction::print(void) const
        case ATOMIC_RMW:
                type_str = "atomic rmw";
                break;
+       case ATOMIC_RMWR:
+               type_str = "atomic rmwr";
+               break;
+       case ATOMIC_RMWC:
+               type_str = "atomic rmwc";
+               break;
        case ATOMIC_INIT:
                type_str = "init atomic";
                break;
@@ -190,7 +222,7 @@ void ModelAction::print(void) const
                type_str = "unknown type";
        }
 
-       uint64_t valuetoprint=type==ATOMIC_READ?reads_from->value:value;
+       uint64_t valuetoprint=type==ATOMIC_READ?(reads_from!=NULL?reads_from->value:VALUE_NONE):value;
 
        printf("(%3d) Thread: %-2d    Action: %-13s    MO: %d    Loc: %14p    Value: %-12" PRIu64,
                        seq_number, id_to_int(tid), type_str, order, location, valuetoprint);