model: add promise printing to execution summaries

diff --git a/model.cc b/model.cc
index c713d1e1761b308cc5433dfa05345a8c23d5024a..62550da7f4bd30398650b188ddc13dc1b82d1986 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -2872,6 +2872,14 @@ void ModelChecker::print_summary() const
                print_infeasibility(" INFEASIBLE");
        print_list(action_trace);
        model_print("\n");
                print_infeasibility(" INFEASIBLE");
        print_list(action_trace);
        model_print("\n");

+       if (!promises->empty()) {
+               model_print("Pending promises:\n");
+               for (unsigned int i = 0; i < promises->size(); i++) {
+                       model_print(" [P%u] ", i);
+                       (*promises)[i]->print();
+               }
+               model_print("\n");
+       }

 }
 
 /**
 }
 
 /**

diff --git a/promise.cc b/promise.cc
index c1f1c5c07782ffd74374d7f8cbe52613d2099fdc..26a1095f4440a4b65d80dd67917da2f423ab28fe 100644 (file)
--- a/promise.cc
+++ b/promise.cc
@@ -101,10 +101,16 @@ bool Promise::thread_is_available(thread_id_t tid) const
 /** @brief Print debug info about the Promise */
 void Promise::print() const
 {
 /** @brief Print debug info about the Promise */
 void Promise::print() const
 {

-       model_print("Promised value %#" PRIx64 ", first read from thread %d, available threads to resolve: ", fv.value, id_to_int(get_reader(0)->get_tid()));
+       model_print("Promised value %#" PRIx64 ", first read from thread %d, available threads to resolve: ",
+                       fv.value, id_to_int(get_reader(0)->get_tid()));
+       bool failed = true;

        for (unsigned int i = 0; i < available_thread.size(); i++)
        for (unsigned int i = 0; i < available_thread.size(); i++)

-               if (available_thread[i])
+               if (available_thread[i]) {

                        model_print("[%d]", i);
                        model_print("[%d]", i);

+                       failed = false;
+               }
+       if (failed)
+               model_print("(none)");

        model_print("\n");
 }
 
        model_print("\n");
 }