From ac06a98f90fe5c333cd8628e72e11f532c0c6444 Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Tue, 31 Jul 2012 20:13:17 -0700 Subject: [PATCH] fixup whitespace --- hashtable.h | 4 ++-- model.cc | 8 ++++---- model.h | 2 +- nodestack.cc | 6 +++--- promise.h | 2 +- threads.cc | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/hashtable.h b/hashtable.h index 126b6a43..5d9e2d62 100644 --- a/hashtable.h +++ b/hashtable.h @@ -63,7 +63,7 @@ template threshold) { //Resize unsigned int newsize = capacity << 1; diff --git a/model.cc b/model.cc index 02a4a6a2..c87f5f9d 100644 --- a/model.cc +++ b/model.cc @@ -284,7 +284,7 @@ void ModelChecker::check_current_action(void) if (diverge==NULL) { tmp->create_cv(get_parent_action(tmp->get_tid())); } - + delete curr; curr = tmp; } else { @@ -357,7 +357,7 @@ void ModelChecker::check_current_action(void) if (!parnode->backtrack_empty()||!currnode->read_from_empty()||!currnode->future_value_empty()||!currnode->promise_empty()) if (!next_backtrack || *curr > *next_backtrack) next_backtrack = curr; - + set_backtracking(curr); } @@ -452,7 +452,7 @@ void ModelChecker::w_modification_order(ModelAction * curr) { (1) did not happen before us (2) is a read and we are a write (3) cannot synchronize with us - (4) is in a different thread + (4) is in a different thread => that read could potentially read from our write. */ @@ -616,7 +616,7 @@ void ModelChecker::build_reads_from_past(ModelAction *curr) action_list_t::reverse_iterator rit; for (rit = list->rbegin(); rit != list->rend(); rit++) { ModelAction *act = *rit; - + /* Only consider 'write' actions */ if (!act->is_write()) continue; diff --git a/model.h b/model.h index 73605dbb..c13dffd7 100644 --- a/model.h +++ b/model.h @@ -90,7 +90,7 @@ private: ModelAction * process_rmw(ModelAction * curr); void r_modification_order(ModelAction * curr, const ModelAction *rf); void w_modification_order(ModelAction * curr); - + ModelAction *current_action; ModelAction *diverge; thread_id_t nextThread; diff --git a/nodestack.cc b/nodestack.cc index 77e24398..bdccf381 100644 --- a/nodestack.cc +++ b/nodestack.cc @@ -58,7 +58,7 @@ void Node::print_may_read_from() } /** This method sets a promise to explore meeting with the given - * node. + * node. * @param i is the promise index. */ @@ -99,7 +99,7 @@ bool Node::increment_promise() { return false; } -/** This method returns whether the promise set is empty. +/** This method returns whether the promise set is empty. * * @return true if we have explored all promise combinations. */ @@ -125,7 +125,7 @@ bool Node::add_future_value(uint64_t value) { return true; } -/** +/** * Checks whether the future_values set for this node is empty. * @return true if the future_values set is empty. */ diff --git a/promise.h b/promise.h index 7b3d1ecf..fda00cc5 100644 --- a/promise.h +++ b/promise.h @@ -17,7 +17,7 @@ class Promise { ModelAction * get_action() { return read; } int increment_threads() { return ++numthreads; } uint64_t get_value() { return value; } - + private: uint64_t value; ModelAction *read; diff --git a/threads.cc b/threads.cc index cde331db..f2401069 100644 --- a/threads.cc +++ b/threads.cc @@ -94,7 +94,7 @@ void Thread::complete() } } -/** Create a new thread. +/** Create a new thread. * Takes the following parameters: * @param t The thread identifier of the newly created thread. * @param func The function that the thread will call. -- 2.34.1