impatomic: add multiple-inclusion guards

[model-checker.git] / action.cc

diff --git a/action.cc b/action.cc
index 1a819eaf5584f1e97e88fca439104392c07b7f1b..44a6d9ad6948c116e3305bd955e204825f01bc96 100644 (file)
--- a/action.cc
+++ b/action.cc
@@ -36,6 +36,9 @@ ModelAction::ModelAction(action_type_t type, memory_order order, void *loc,
        cv(NULL),
        sleep_flag(false)
 {
+       /* References to NULL atomic variables can end up here */
+       ASSERT(loc || type == MODEL_FIXUP_RELSEQ);
+
        Thread *t = thread ? thread : thread_current();
        this->tid = t->get_id();
 }
@@ -406,16 +409,19 @@ void ModelAction::print() const
                break;
        }
 
-       printf("(%3d) Thread: %-2d   Action: %-13s   MO: %7s  Loc: %14p  Value: %-12" PRIu64,
+       printf("(%4d) Thread: %-2d   Action: %-13s   MO: %7s  Loc: %14p   Value: %-#18" PRIx64,
                        seq_number, id_to_int(tid), type_str, mo_str, location, valuetoprint);
        if (is_read()) {
                if (reads_from)
-                       printf(" Rf: %d", reads_from->get_seq_number());
+                       printf("  Rf: %-3d", reads_from->get_seq_number());
                else
-                       printf(" Rf: ?");
+                       printf("  Rf: ?  ");
        }
        if (cv) {
-               printf("\t");
+               if (is_read())
+                       printf(" ");
+               else
+                       printf("          ");
                cv->print();
        } else
                printf("\n");