execution: reformat execution traces

The execution printouts were getting too wide and weren't too easy to
read. This improves the situation marginally.

diff --git a/action.cc b/action.cc
index 14ad71d54e5221c553a610a846f9a0a66dc98fa5..3d38e81c93d1111bf8828448fd5a52718c17eea6 100644 (file)
--- a/action.cc
+++ b/action.cc
@@ -569,25 +569,25 @@ void ModelAction::print() const
 {
        const char *type_str = get_type_str(), *mo_str = get_mo_str();
 
-       model_print("(%4d) Thread: %-2d   Action: %-13s   MO: %7s  Loc: %14p   Value: %-#18" PRIx64,
+       model_print("%-4d %-2d   %-13s   %7s  %14p   %-#18" PRIx64,
                        seq_number, id_to_int(tid), type_str, mo_str, location, get_return_value());
        if (is_read()) {
                if (reads_from)
-                       model_print("  Rf: %-3d", reads_from->get_seq_number());
+                       model_print("  %-3d", reads_from->get_seq_number());
                else if (reads_from_promise) {
                        int idx = reads_from_promise->get_index();
                        if (idx >= 0)
-                               model_print("  Rf: P%-2d", idx);
+                               model_print("  P%-2d", idx);
                        else
-                               model_print("  Rf: P? ");
+                               model_print("  P? ");
                } else
-                       model_print("  Rf: ?  ");
+                       model_print("  ?  ");
        }
        if (cv) {
                if (is_read())
                        model_print(" ");
                else
-                       model_print("          ");
+                       model_print("      ");
                cv->print();
        } else
                model_print("\n");

diff --git a/clockvector.cc b/clockvector.cc
index 0b325281007e35505f993c2f9798f5b02765621c..5f068e9025fffe3667a508196c155defa9421bbd 100644 (file)
--- a/clockvector.cc
+++ b/clockvector.cc
@@ -95,7 +95,7 @@ modelclock_t ClockVector::getClock(thread_id_t thread) {
 void ClockVector::print() const
 {
        int i;
-       model_print("CV: (");
+       model_print("(");
        for (i = 0; i < num_threads; i++)
                model_print("%2u%s", clock[i], (i == num_threads - 1) ? ")\n" : ", ");
 }

diff --git a/execution.cc b/execution.cc
index 4496b9c63deeca6fa8198ec086425ba8fa1d6932..403d70fe06361f3959ed21a4b94654b5fc6b4c1a 100644 (file)
--- a/execution.cc
+++ b/execution.cc
@@ -2630,7 +2630,9 @@ static void print_list(const action_list_t *list)
 {
        action_list_t::const_iterator it;
 
-       model_print("---------------------------------------------------------------------\n");
+       model_print("------------------------------------------------------------------------------------\n");
+       model_print("#    t    Action type     MO       Location         Value               Rf  CV\n");
+       model_print("------------------------------------------------------------------------------------\n");
 
        unsigned int hash = 0;
 
@@ -2641,7 +2643,7 @@ static void print_list(const action_list_t *list)
                hash = hash^(hash<<3)^((*it)->hash());
        }
        model_print("HASH %u\n", hash);
-       model_print("---------------------------------------------------------------------\n");
+       model_print("------------------------------------------------------------------------------------\n");
 }
 
 #if SUPPORT_MOD_ORDER_DUMP