action: edit some spacing

[c11tester.git] / action.cc

diff --git a/action.cc b/action.cc
index 2d9186d2f812bdbbe0e7eab770e1e813b79386fe..1655d9428eb57041287c7b2bef12e3742b7058f1 100644 (file)
--- a/action.cc
+++ b/action.cc
@@ -27,11 +27,38 @@ ModelAction::~ModelAction()
                delete cv;
 }
 
-bool ModelAction::is_success_lock() const {
+void ModelAction::copy_from_new(ModelAction *newaction)
+{
+       seq_number = newaction->seq_number;
+}
+
+bool ModelAction::is_mutex_op() const
+{
+       return type == ATOMIC_LOCK || type == ATOMIC_TRYLOCK || type == ATOMIC_UNLOCK;
+}
+
+bool ModelAction::is_lock() const
+{
+       return type == ATOMIC_LOCK;
+}
+
+bool ModelAction::is_unlock() const
+{
+       return type == ATOMIC_UNLOCK;
+}
+
+bool ModelAction::is_trylock() const
+{
+       return type == ATOMIC_TRYLOCK;
+}
+
+bool ModelAction::is_success_lock() const
+{
        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);
 }
 
@@ -110,8 +137,8 @@ bool ModelAction::same_thread(const ModelAction *act) const
 }
 
 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:
@@ -164,27 +191,57 @@ bool ModelAction::is_synchronizing(const ModelAction *act) const
        return false;
 }
 
-void ModelAction::create_cv(const ModelAction *parent)
+bool ModelAction::is_conflicting_lock(const ModelAction *act) const
 {
-       if (cv)
-               delete cv;
+       //Must be different threads to reorder
+       if (same_thread(act))
+               return false;
+       
+       //Try to reorder a lock past a successful lock
+       if (act->is_success_lock())
+               return true;
+       
+       //Try to push a successful trylock past an unlock
+       if (act->is_unlock() && is_trylock() && value == VALUE_TRYSUCCESS)
+               return true;
+
+       return false;
+}
 
+/**
+ * Create a new clock vector for this action. Note that this function allows a
+ * user to clobber (and leak) a ModelAction's existing clock vector. A user
+ * should ensure that the vector has already either been rolled back
+ * (effectively "freed") or freed.
+ *
+ * @param parent A ModelAction from which to inherit a ClockVector
+ */
+void ModelAction::create_cv(const ModelAction *parent)
+{
        if (parent)
                cv = new ClockVector(parent->cv, this);
        else
                cv = new ClockVector(NULL, this);
 }
 
+void ModelAction::set_try_lock(bool obtainedlock) {
+       if (obtainedlock)
+               value=VALUE_TRYSUCCESS;
+       else
+               value=VALUE_TRYFAILED;
+}
+
 /** Update the model action's read_from action */
 void ModelAction::read_from(const ModelAction *act)
 {
        ASSERT(cv);
        reads_from = act;
        if (act != NULL && this->is_acquire()) {
-               std::vector< const ModelAction *, MyAlloc<const ModelAction *> > release_heads;
+               rel_heads_list_t release_heads;
                model->get_release_seq_heads(this, &release_heads);
                for (unsigned int i = 0; i < release_heads.size(); i++)
-                       synchronize_with(release_heads[i]);
+                       if (!synchronize_with(release_heads[i]))
+                               model->set_bad_synchronization();
        }
 }
 
@@ -192,11 +249,14 @@ void ModelAction::read_from(const ModelAction *act)
  * Synchronize the current thread with the thread corresponding to the
  * ModelAction parameter.
  * @param act The ModelAction to synchronize with
+ * @return True if this is a valid synchronization; false otherwise
  */
-void ModelAction::synchronize_with(const ModelAction *act) {
-       ASSERT(*act < *this);
+bool ModelAction::synchronize_with(const ModelAction *act) {
+       if (*this < *act && type != THREAD_JOIN && type != ATOMIC_LOCK)
+               return false;
        model->check_promises(cv, act->cv);
        cv->merge(act->cv);
+       return true;
 }
 
 bool ModelAction::has_synchronized_with(const ModelAction *act) const
@@ -215,7 +275,13 @@ bool ModelAction::happens_before(const ModelAction *act) const
        return act->cv->synchronized_since(this);
 }
 
-void ModelAction::print(void) const
+/**
+ * Print nicely-formatted info about this ModelAction
+ *
+ * @param print_cv True if we want to print clock vector data. Might be false,
+ * for instance, in situations where the clock vector might be invalid
+ */
+void ModelAction::print(bool print_cv) const
 {
        const char *type_str, *mo_str;
        switch (this->type) {
@@ -255,6 +321,15 @@ void ModelAction::print(void) const
        case ATOMIC_INIT:
                type_str = "init atomic";
                break;
+       case ATOMIC_LOCK:
+               type_str = "lock";
+               break;
+       case ATOMIC_UNLOCK:
+               type_str = "unlock";
+               break;
+       case ATOMIC_TRYLOCK:
+               type_str = "trylock";
+               break;
        default:
                type_str = "unknown type";
        }
@@ -290,7 +365,7 @@ void ModelAction::print(void) const
                else
                        printf(" Rf: ?");
        }
-       if (cv) {
+       if (cv && print_cv) {
                printf("\t");
                cv->print();
        } else