From f6c5b783a43b8b5d8d069e44ecf91cc770b5d47b Mon Sep 17 00:00:00 2001
From: Brian Norris <banorris@uci.edu>
Date: Thu, 13 Sep 2012 00:01:01 -0700
Subject: [PATCH] cleanup style

---
 cyclegraph.cc       |  4 ++--
 model.cc            | 10 ++--------
 model.h             |  3 +--
 test/linuxrwlocks.c |  8 +++-----
 4 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/cyclegraph.cc b/cyclegraph.cc
index 6233062..f134822 100644
--- a/cyclegraph.cc
+++ b/cyclegraph.cc
@@ -85,10 +85,10 @@ void CycleGraph::addRMWEdge(const ModelAction *from, const ModelAction *rmw) {
 	}
 
 	/* Transfer all outgoing edges from the from node to the rmw node */
-	/* This process should not add a cycle because either: 
+	/* This process should not add a cycle because either:
 	 * (1) The rmw should not have any incoming edges yet if it is the
 	 * new node or
-	 * (2) the fromnode is the new node and therefore it should not 
+	 * (2) the fromnode is the new node and therefore it should not
 	 * have any outgoing edges.
 	 */
 	std::vector<CycleNode *> * edges=fromnode->getEdges();
diff --git a/model.cc b/model.cc
index 795c4a9..2a2d776 100644
--- a/model.cc
+++ b/model.cc
@@ -259,7 +259,6 @@ ModelAction * ModelChecker::get_next_backtrack()
 	return next;
 }
 
-
 /**
  * Processes a read or rmw model action.
  * @param curr is the read model action to process.
@@ -267,7 +266,6 @@ ModelAction * ModelChecker::get_next_backtrack()
  * @param second_part_of_rmw is boolean that is true is this is the second action of a rmw.
  * @return True if processing this read updates the mo_graph.
  */
-
 bool ModelChecker::process_read(ModelAction *curr, Thread * th, bool second_part_of_rmw) {
 	uint64_t value;
 	bool updated=false;
@@ -427,7 +425,7 @@ Thread * ModelChecker::check_current_action(ModelAction *curr)
 		add_action_to_lists(curr);
 
 	check_curr_backtracking(curr);
-	
+
 	set_backtracking(curr);
 
 	return get_next_thread(curr);
@@ -436,7 +434,7 @@ Thread * ModelChecker::check_current_action(ModelAction *curr)
 void ModelChecker::check_curr_backtracking(ModelAction * curr) {
 	Node *currnode = curr->get_node();
 	Node *parnode = currnode->get_parent();
-	
+
 	if ((!parnode->backtrack_empty() ||
 			 !currnode->read_from_empty() ||
 			 !currnode->future_value_empty() ||
@@ -447,7 +445,6 @@ void ModelChecker::check_curr_backtracking(ModelAction * curr) {
 	}
 }
 
-
 bool ModelChecker::promises_expired() {
 	for (unsigned int promise_index = 0; promise_index < promises->size(); promise_index++) {
 		Promise *promise = (*promises)[promise_index];
@@ -758,7 +755,6 @@ bool ModelChecker::thin_air_constraint_may_allow(const ModelAction * writer, con
 	return true;
 }
 
-
 /**
  * Finds the head(s) of the release sequence(s) containing a given ModelAction.
  * The ModelAction under consideration is expected to be taking part in
@@ -1052,8 +1048,6 @@ bool ModelChecker::resolve_promises(ModelAction *write)
 	return resolved;
 }
 
-
-
 /**
  * Compute the set of promises that could potentially be satisfied by this
  * action. Note that the set computation actually appears in the Node, not in
diff --git a/model.h b/model.h
index 9afe642..cf03f09 100644
--- a/model.h
+++ b/model.h
@@ -94,7 +94,7 @@ public:
 private:
 	/** The scheduler to use: tracks the running/ready Threads */
 	Scheduler *scheduler;
-	
+
 	bool thin_air_constraint_may_allow(const ModelAction * writer, const ModelAction *reader);
 	bool has_asserted() {return asserted;}
 	void reset_asserted() {asserted=false;}
@@ -123,7 +123,6 @@ private:
 	bool resolve_promises(ModelAction *curr);
 	void compute_promises(ModelAction *curr);
 
-
 	void check_curr_backtracking(ModelAction * curr);
 	void add_action_to_lists(ModelAction *act);
 	ModelAction * get_last_action(thread_id_t tid);
diff --git a/test/linuxrwlocks.c b/test/linuxrwlocks.c
index dcf323c..3862ed4 100644
--- a/test/linuxrwlocks.c
+++ b/test/linuxrwlocks.c
@@ -4,14 +4,12 @@
 #include "librace.h"
 #include "stdatomic.h"
 
-
 #define RW_LOCK_BIAS            0x00100000
 #define WRITE_LOCK_CMP          RW_LOCK_BIAS
 
 /** Example implementation of linux rw lock along with 2 thread test
  *  driver... */
 
-
 typedef union {
 	atomic_int lock;
 } rwlock_t;
@@ -55,7 +53,7 @@ static inline int read_trylock(rwlock_t *rw)
 	int priorvalue=atomic_fetch_sub_explicit(&rw->lock, 1, memory_order_acquire);
 	if (priorvalue>0)
 		return 1;
-	
+
 	atomic_fetch_add_explicit(&rw->lock, 1, memory_order_relaxed);
 	return 0;
 }
@@ -65,7 +63,7 @@ static inline int write_trylock(rwlock_t *rw)
 	int priorvalue=atomic_fetch_sub_explicit(&rw->lock, RW_LOCK_BIAS, memory_order_acquire);
 	if (priorvalue==RW_LOCK_BIAS)
 		return 1;
-	
+
 	atomic_fetch_add_explicit(&rw->lock, RW_LOCK_BIAS, memory_order_relaxed);
 	return 0;
 }
@@ -106,7 +104,7 @@ void user_main()
 
 	thrd_create(&t1, (thrd_start_t)&a, NULL);
 	thrd_create(&t2, (thrd_start_t)&a, NULL);
-	
+
 	thrd_join(t1);
 	thrd_join(t2);
 }
-- 
2.34.1