X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=execution.cc;h=53aa5212f0b017622d0c284f1cbc765e0620fddd;hb=2d0d4ac38e05905a6633b3f2d5112ccadd45c27f;hp=403d70fe06361f3959ed21a4b94654b5fc6b4c1a;hpb=6d27ffdd1fc1f816a8381c4c0553256598d62f4a;p=model-checker.git

diff --git a/execution.cc b/execution.cc
index 403d70f..53aa521 100644
--- a/execution.cc
+++ b/execution.cc
@@ -755,12 +755,13 @@ bool ModelExecution::process_mutex(ModelAction *curr)
 /**
  * @brief Check if the current pending promises allow a future value to be sent
  *
- * If one of the following is true:
- *  (a) there are no pending promises
- *  (b) the reader and writer do not cross any promises
- * Then, it is safe to pass a future value back now.
+ * It is unsafe to pass a future value back if there exists a pending promise Pr
+ * such that:
  *
- * Otherwise, we must save the pending future value until (a) or (b) is true
+ *    reader --exec-> Pr --exec-> writer
+ *
+ * If such Pr exists, we must save the pending future value until Pr is
+ * resolved.
  *
  * @param writer The operation which sends the future value. Must be a write.
  * @param reader The operation which will observe the value. Must be a read.
@@ -769,8 +770,6 @@ bool ModelExecution::process_mutex(ModelAction *curr)
 bool ModelExecution::promises_may_allow(const ModelAction *writer,
 		const ModelAction *reader) const
 {
-	if (promises.empty())
-		return true;
 	for (int i = promises.size() - 1; i >= 0; i--) {
 		ModelAction *pr = promises[i]->get_reader(0);
 		//reader is after promise...doesn't cross any promise
@@ -1389,7 +1388,7 @@ void ModelExecution::print_infeasibility(const char *prefix) const
 	if (promises.size() != 0)
 		ptr += sprintf(ptr, "[unresolved promise]");
 	if (ptr != buf)
-		model_print("%s: %s\n", prefix ? prefix : "Infeasible", buf);
+		model_print("%s: %s", prefix ? prefix : "Infeasible", buf);
 }
 
 /**
@@ -1820,6 +1819,7 @@ bool ModelExecution::thin_air_constraint_may_allow(const ModelAction *writer, co
  * require compiler support):
  *
  *   If X --hb-> Y --mo-> Z, then X should not read from Z.
+ *   If X --hb-> Y, A --rf-> Y, and A --mo-> Z, then X should not read from Z.
  */
 bool ModelExecution::mo_may_allow(const ModelAction *writer, const ModelAction *reader)
 {
@@ -2697,17 +2697,21 @@ void ModelExecution::print_summary() const
 	dumpGraph(buffername);
 #endif
 
-	model_print("Execution %d:", get_execution_number());
+	model_print("Execution trace %d:", get_execution_number());
 	if (isfeasibleprefix()) {
 		if (is_yieldblocked())
 			model_print(" YIELD BLOCKED");
 		if (scheduler->all_threads_sleeping())
 			model_print(" SLEEP-SET REDUNDANT");
-		model_print("\n");
+		if (have_bug_reports())
+			model_print(" DETECTED BUG(S)");
 	} else
 		print_infeasibility(" INFEASIBLE");
+	model_print("\n");
+
 	print_list(&action_trace);
 	model_print("\n");
+
 	if (!promises.empty()) {
 		model_print("Pending promises:\n");
 		for (unsigned int i = 0; i < promises.size(); i++) {