From: bdemsky <bdemsky@uci.edu>
Date: Tue, 11 Jun 2019 04:21:19 +0000 (-0700)
Subject: remove extra cyclegraph calls
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=commitdiff_plain;h=5b68754a2ba2c75dccfff9d64ae0aa1069c8e3fe

remove extra cyclegraph calls
---

diff --git a/execution.cc b/execution.cc
index b08bbcf9..3a994892 100644
--- a/execution.cc
+++ b/execution.cc
@@ -285,18 +285,26 @@ bool ModelExecution::is_complete_execution() const
  */
 bool ModelExecution::process_read(ModelAction *curr, ModelVector<ModelAction *> * rf_set)
 {
-	bool updated = false;
+  while(true) {
 		
-	const ModelAction *rf = fuzzer->selectWrite(curr, rf_set);
-
-	ASSERT(rf);
-	
-	mo_graph->startChanges();
-	updated = r_modification_order(curr, rf);
-	read_from(curr, rf);
-	mo_graph->commitChanges();
-	get_thread(curr)->set_return_value(curr->get_return_value());
-	return updated;
+    int index = fuzzer->selectWrite(curr, rf_set);
+    const ModelAction *rf = (*rf_set)[index];
+
+    
+    ASSERT(rf);
+    
+    mo_graph->startChanges();
+    bool updated = r_modification_order(curr, rf);
+    if (!is_infeasible()) {
+      read_from(curr, rf);
+      mo_graph->commitChanges();
+      get_thread(curr)->set_return_value(curr->get_return_value());
+      return updated;
+    }
+    mo_graph->rollbackChanges();
+    (*rf_set)[index] = rf_set->back();
+    rf_set->pop_back();
+  }
 }
 
 /**
@@ -698,6 +706,8 @@ ModelAction * ModelExecution::check_current_action(ModelAction *curr)
 	if (curr->is_read() && !second_part_of_rmw) {
 	  process_read(curr, rf_set);
 	  delete rf_set;
+	} else {
+	  ASSERT(rf_set == NULL);
 	}
 	
 	if (curr->is_write())
diff --git a/fuzzer.cc b/fuzzer.cc
index 62097b21..550a0a16 100644
--- a/fuzzer.cc
+++ b/fuzzer.cc
@@ -3,9 +3,9 @@
 #include "threads-model.h"
 #include "model.h"
 
-ModelAction * Fuzzer::selectWrite(ModelAction *read, ModelVector<ModelAction *> * rf_set) {
+int Fuzzer::selectWrite(ModelAction *read, ModelVector<ModelAction *> * rf_set) {
   int random_index = random() % rf_set->size();
-  return (*rf_set)[random_index];
+  return random_index;
 }
 
 Thread * Fuzzer::selectThread(Node *n, int * threadlist, int numthreads) {
diff --git a/fuzzer.h b/fuzzer.h
index 14d875d7..a6318d04 100644
--- a/fuzzer.h
+++ b/fuzzer.h
@@ -7,7 +7,7 @@
 class Fuzzer {
 public:
   Fuzzer() {}
-  ModelAction * selectWrite(ModelAction *read, ModelVector<ModelAction *>* rf_set);
+  int selectWrite(ModelAction *read, ModelVector<ModelAction *>* rf_set);
   Thread * selectThread(Node *n, int * threadlist, int numthreads);
   Thread * selectNotify(action_list_t * waiters);
   MEMALLOC