action: don't print clock vector when it is invalid

[model-checker.git] / action.cc

diff --git a/action.cc b/action.cc
index c744c65f1b5b06223ea08618c3ea1d1700b6c500..6a18ffee8359603d41c475b374817e910287906c 100644 (file)
--- a/action.cc
+++ b/action.cc
@@ -201,11 +201,16 @@ bool ModelAction::is_conflicting_lock(const ModelAction *act) const
        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 (cv)
-               delete cv;
-
        if (parent)
                cv = new ClockVector(parent->cv, this);
        else
@@ -263,7 +268,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) {
@@ -347,7 +358,7 @@ void ModelAction::print(void) const
                else
                        printf(" Rf: ?");
        }
-       if (cv) {
+       if (cv && print_cv) {
                printf("\t");
                cv->print();
        } else