fixup whitespace

diff --git a/hashtable.h b/hashtable.h
index 126b6a4349a5bcc44e895c4e82072be564f51f1d..5d9e2d620045924a20db2b3bea491622bfe1ebd0 100644 (file)
--- a/hashtable.h
+++ b/hashtable.h
@@ -63,7 +63,7 @@ template<typename _Key, typename _Val, typename _KeyInt, int _Shift=0, void * (*
                return _malloc(size);
        }
 
                return _malloc(size);
        }
 

-  void operator delete(void *p, size_t size) {
+       void operator delete(void *p, size_t size) {

                _free(p);
        }
 
                _free(p);
        }
 


@@ -117,7 +117,7 @@ template<typename _Key, typename _Val, typename _KeyInt, int _Shift=0, void * (*
        }
 
        /** Put a key entry into the table. */
        }
 
        /** Put a key entry into the table. */

-  _Val * ensureptr(_Key key) {
+       _Val * ensureptr(_Key key) {

                if(size > threshold) {
                        //Resize
                  unsigned int newsize = capacity << 1;
                if(size > threshold) {
                        //Resize
                  unsigned int newsize = capacity << 1;

diff --git a/model.cc b/model.cc
index 02a4a6a29206b34b8b3b22308439807b1b7c1188..c87f5f9d07813ecbd40cce8603369f24eebea459 100644 (file)
--- 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()));
                        }
                        if (diverge==NULL) {
                                tmp->create_cv(get_parent_action(tmp->get_tid()));
                        }

-                       
+

                        delete curr;
                        curr = tmp;
                } else {
                        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;
        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);
 }
 
        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
                                                 (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.
                                        */
                                                 =>
                                                 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;
                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;
                        /* Only consider 'write' actions */
                        if (!act->is_write())
                                continue;

diff --git a/model.h b/model.h
index 73605dbb2616aa26351fe8a4515b3eb7721ed77a..c13dffd7f24c01a2802ebcc2a1351d1a7231aa22 100644 (file)
--- 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 * 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;
        ModelAction *current_action;
        ModelAction *diverge;
        thread_id_t nextThread;

diff --git a/nodestack.cc b/nodestack.cc
index 77e24398931a0a2ee3d9e7bb662813ae4f3f7231..bdccf3817a06615cc1d67216e8d0ed9480d4160e 100644 (file)
--- 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
 }
 
 /** This method sets a promise to explore meeting with the given

- *  node. 
+ *  node.

  *  @param i is the promise index.
  */
 
  *  @param i is the promise index.
  */
 


@@ -99,7 +99,7 @@ bool Node::increment_promise() {
        return false;
 }
 
        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.
  */
  *
  *  @return true if we have explored all promise combinations.
  */


@@ -125,7 +125,7 @@ bool Node::add_future_value(uint64_t value) {
        return true;
 }
 
        return true;
 }
 

-/** 
+/**

  * Checks whether the future_values set for this node is empty.
  * @return true if the future_values set is empty.
  */
  * 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 7b3d1ecf363baf36e7cda4b2ae3d034a80ad61cf..fda00cc508229221e5965ea3c752443d503bb1ca 100644 (file)
--- 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; }
        ModelAction * get_action() { return read; }
        int increment_threads() { return ++numthreads; }
        uint64_t get_value() { return value; }

-       
+

  private:
        uint64_t value;
        ModelAction *read;
  private:
        uint64_t value;
        ModelAction *read;

diff --git a/threads.cc b/threads.cc
index cde331dbfad0dde86f33394639ced4f374418fd0..f24010697d60f306de512ab40fecdece88875cdd 100644 (file)
--- 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.
  *  Takes the following parameters:
  *  @param t The thread identifier of the newly created thread.
  *  @param func  The function that the thread will call.