From: Brian Norris <banorris@uci.edu>
Date: Sat, 2 Mar 2013 02:00:14 +0000 (-0800)
Subject: model: check_recency: fix indentation, spelling, comments
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=commitdiff_plain;h=0d09bdcb6b3c438693e68787c3cd4bb97aa87eee

model: check_recency: fix indentation, spelling, comments
---

diff --git a/model.cc b/model.cc
index 129f6c02..a7ff82b4 100644
--- a/model.cc
+++ b/model.cc
@@ -1653,79 +1653,79 @@ ModelAction * ModelChecker::process_rmw(ModelAction *act) {
  */
 void ModelChecker::check_recency(ModelAction *curr, const ModelAction *rf)
 {
-	if (params.maxreads != 0) {
-		if (curr->get_node()->get_read_from_past_size() <= 1)
+	if (!params.maxreads)
+		return;
+	if (curr->get_node()->get_read_from_past_size() <= 1)
+		return;
+	/* Must make sure that execution is currently feasible...  We could
+	 * accidentally clear by rolling back */
+	if (is_infeasible())
+		return;
+	std::vector<action_list_t> *thrd_lists = get_safe_ptr_vect_action(obj_thrd_map, curr->get_location());
+	int tid = id_to_int(curr->get_tid());
+
+	/* Skip checks */
+	if ((int)thrd_lists->size() <= tid)
+		return;
+	action_list_t *list = &(*thrd_lists)[tid];
+
+	action_list_t::reverse_iterator rit = list->rbegin();
+	/* Skip past curr */
+	for (; (*rit) != curr; rit++)
+		;
+	/* go past curr now */
+	rit++;
+
+	action_list_t::reverse_iterator ritcopy = rit;
+	/* See if we have enough reads from the same value */
+	int count = 0;
+	for (; count < params.maxreads; rit++, count++) {
+		if (rit == list->rend())
 			return;
-		//Must make sure that execution is currently feasible...  We could
-		//accidentally clear by rolling back
-		if (is_infeasible())
+		ModelAction *act = *rit;
+		if (!act->is_read())
 			return;
-		std::vector<action_list_t> *thrd_lists = get_safe_ptr_vect_action(obj_thrd_map, curr->get_location());
-		int tid = id_to_int(curr->get_tid());
 
-		/* Skip checks */
-		if ((int)thrd_lists->size() <= tid)
+		if (act->get_reads_from() != rf)
 			return;
-		action_list_t *list = &(*thrd_lists)[tid];
-
-		action_list_t::reverse_iterator rit = list->rbegin();
-		/* Skip past curr */
-		for (; (*rit) != curr; rit++)
-			;
-		/* go past curr now */
-		rit++;
-
-		action_list_t::reverse_iterator ritcopy = rit;
-		//See if we have enough reads from the same value
-		int count = 0;
-		for (; count < params.maxreads; rit++, count++) {
-			if (rit == list->rend())
-				return;
-			ModelAction *act = *rit;
-			if (!act->is_read())
-				return;
-
-			if (act->get_reads_from() != rf)
-				return;
-			if (act->get_node()->get_read_from_past_size() <= 1)
-				return;
-		}
-		for (int i = 0; i < curr->get_node()->get_read_from_past_size(); i++) {
-			/* Get write */
-			const ModelAction *write = curr->get_node()->get_read_from_past(i);
+		if (act->get_node()->get_read_from_past_size() <= 1)
+			return;
+	}
+	for (int i = 0; i < curr->get_node()->get_read_from_past_size(); i++) {
+		/* Get write */
+		const ModelAction *write = curr->get_node()->get_read_from_past(i);
 
-			/* Need a different write */
-			if (write == rf)
-				continue;
+		/* Need a different write */
+		if (write == rf)
+			continue;
 
-			/* Test to see whether this is a feasible write to read from */
-			/** NOTE: all members of read-from set should be
-			 *  feasible, so we no longer check it here **/
+		/* Test to see whether this is a feasible write to read from */
+		/** NOTE: all members of read-from set should be
+		 *  feasible, so we no longer check it here **/
 
-			rit = ritcopy;
+		rit = ritcopy;
 
-			bool feasiblewrite = true;
-			//new we need to see if this write works for everyone
+		bool feasiblewrite = true;
+		/* now we need to see if this write works for everyone */
 
-			for (int loop = count; loop > 0; loop--, rit++) {
-				ModelAction *act = *rit;
-				bool foundvalue = false;
-				for (int j = 0; j < act->get_node()->get_read_from_past_size(); j++) {
-					if (act->get_node()->get_read_from_past(j) == write) {
-						foundvalue = true;
-						break;
-					}
-				}
-				if (!foundvalue) {
-					feasiblewrite = false;
+		for (int loop = count; loop > 0; loop--, rit++) {
+			ModelAction *act = *rit;
+			bool foundvalue = false;
+			for (int j = 0; j < act->get_node()->get_read_from_past_size(); j++) {
+				if (act->get_node()->get_read_from_past(j) == write) {
+					foundvalue = true;
 					break;
 				}
 			}
-			if (feasiblewrite) {
-				priv->too_many_reads = true;
-				return;
+			if (!foundvalue) {
+				feasiblewrite = false;
+				break;
 			}
 		}
+		if (feasiblewrite) {
+			priv->too_many_reads = true;
+			return;
+		}
 	}
 }