[Boost-commit] svn:boost r53728 - sandbox/stm/boost/stm

Subject: [Boost-commit] svn:boost r53728 - sandbox/stm/boost/stm
From: vicente.botet_at_[hidden]
Date: 2009-06-07 13:06:30

Author: viboes
Date: 2009-06-07 13:06:29 EDT (Sun, 07 Jun 2009)
New Revision: 53728
URL: http://svn.boost.org/trac/boost/changeset/53728

Log:
TBoost.Stm trailing white space removal

Text files modified: 
   sandbox/stm/boost/stm/base_transaction.hpp   |    60 ++++++++++++++++++++--------------------
   sandbox/stm/boost/stm/contention_manager.hpp |    38 ++++++++++++------------                
   2 files changed, 49 insertions(+), 49 deletions(-)

Modified: sandbox/stm/boost/stm/base_transaction.hpp
==============================================================================
--- sandbox/stm/boost/stm/base_transaction.hpp	(original)
+++ sandbox/stm/boost/stm/base_transaction.hpp	2009-06-07 13:06:29 EDT (Sun, 07 Jun 2009)
@@ -1,17 +1,17 @@
 //////////////////////////////////////////////////////////////////////////////
 //
-// (C) Copyright Justin E. Gottchlich 2009. 
-// (C) Copyright Vicente J. Botet Escriba 2009. 
+// (C) Copyright Justin E. Gottchlich 2009.
+// (C) Copyright Vicente J. Botet Escriba 2009.
 // Distributed under the Boost
-// Software License, Version 1.0. 
-// (See accompanying file LICENSE_1_0.txt or 
+// Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or
 // copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 // See http://www.boost.org/libs/synchro for documentation.
 //
 //////////////////////////////////////////////////////////////////////////////
 
-/* The DRACO Research Group (rogue.colorado.edu/draco) */ 
+/* The DRACO Research Group (rogue.colorado.edu/draco) */
 /*****************************************************************************\
  *
  * Copyright Notices/Identification of Licensor(s) of
@@ -57,7 +57,7 @@
 typedef boost::mutex PLOCK;
 #endif
 
-    
+
 //-----------------------------------------------------------------------------
 // boolean which is used to invoke "begin_transaction()" upon transaction
 // object construction (so two lines of code aren't needed to make a
@@ -74,8 +74,8 @@
 // e_no_state    - initial state of transaction.
 // e_aborted     - aborted transaction.
 // e_committed   - transaction has committed.
-// e_hand_off    - transaction memory has been handed off to another 
-//                 transaction. This is the vital state for in-flight 
+// e_hand_off    - transaction memory has been handed off to another
+//                 transaction. This is the vital state for in-flight
 //                 transactions which are composed.
 // e_in_flight   - transaction currently in process.
 //-----------------------------------------------------------------------------
@@ -87,7 +87,7 @@
    e_hand_off,      // so is handoff in case bool conversion
    e_in_flight
 };
- 
+
 #if BUILD_MOVE_SEMANTICS
 template <class T>
 inline typename std::remove_reference<T>::type&& draco_move(T &&t)
@@ -104,7 +104,7 @@
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-class aborted_transaction_exception : public std::exception 
+class aborted_transaction_exception : public std::exception
 {
 public:
    aborted_transaction_exception(char const * const what) : what_(what) {}
@@ -217,7 +217,7 @@
 #else
         boost::lock_guard<boost::mutex> lock(transactionObjectMutex_);
         memory_.returnChunk(mem, size);
-#endif       
+#endif
     }
 
    static void* retrieve_mem(size_t size)
@@ -229,7 +229,7 @@
 #else
         boost::lock_guard<boost::mutex> lock(transactionObjectMutex_);
         void *mem = memory_.retrieveChunk(size);
-#endif       
+#endif
 
       return mem;
    }
@@ -244,7 +244,7 @@
    //
    // in direct environments, this flag means memory being written to directly
    //
-   // in deferred environments, this flag means this is memory that was copied 
+   // in deferred environments, this flag means this is memory that was copied
    // and being written to off to the side
    //
    // it's important to note the differences between as direct reads and writes
@@ -284,9 +284,9 @@
 #endif
 
 #if USE_STM_MEMORY_MANAGER
-   void* operator new(size_t size) throw () 
-   { 
-      return retrieve_mem(size); 
+   void* operator new(size_t size) throw ()
+   {
+      return retrieve_mem(size);
    }
 
    void operator delete(void* mem)
@@ -299,7 +299,7 @@
 
 };
 
-template <typename T> class native_trans : 
+template <typename T> class native_trans :
 public transaction_object< native_trans<T> >
 {
 public:
@@ -322,8 +322,8 @@
       return *this;
    }
 
-   native_trans operator+(native_trans const &rhs) 
-   { 
+   native_trans operator+(native_trans const &rhs)
+   {
       native_trans ret = *this;
       ret.value_ += rhs.value_;
       return ret;
@@ -331,8 +331,8 @@
 
    //template <>
    operator T() const
-   { 
-      return this->value_; 
+   {
+      return this->value_;
    }
 
 #if BUILD_MOVE_SEMANTICS
@@ -374,7 +374,7 @@
    virtual bool permission_to_abort
       (boost::stm::transaction const &lhs, boost::stm::transaction const &rhs) = 0;
 
-   virtual bool allow_lock_to_abort_tx(int const & lockWaitTime, int const &lockAborted, 
+   virtual bool allow_lock_to_abort_tx(int const & lockWaitTime, int const &lockAborted,
       bool txIsIrrevocable, boost::stm::transaction const &rhs) = 0;
 
    virtual int lock_sleep_time() { return 10; }
@@ -394,21 +394,21 @@
    void abort_on_delete(boost::stm::transaction const &t,
       boost::stm::base_transaction_object const &in);
 
-   void abort_on_read(boost::stm::transaction const &t, 
+   void abort_on_read(boost::stm::transaction const &t,
       boost::stm::base_transaction_object const &in);
-   void abort_on_write(boost::stm::transaction &t, 
+   void abort_on_write(boost::stm::transaction &t,
       boost::stm::base_transaction_object const &in);
 
    virtual bool abort_before_commit(boost::stm::transaction const &t)
    {
-      return false; 
+      return false;
    }
 
    virtual bool permission_to_abort
-      (boost::stm::transaction const &lhs, boost::stm::transaction const &rhs) 
+      (boost::stm::transaction const &lhs, boost::stm::transaction const &rhs)
    { return true; }
 
-   virtual bool allow_lock_to_abort_tx(int const & lockWaitTime, int const &lockAborted, 
+   virtual bool allow_lock_to_abort_tx(int const & lockWaitTime, int const &lockAborted,
       bool txIsIrrevocable, boost::stm::transaction const &rhs);
 
    virtual void perform_isolated_tx_wait_priority_promotion(boost::stm::transaction &);
@@ -438,12 +438,12 @@
         }
         //inline bool owns_lock() { return owns_;}
         inline void lock() {
-            //if (owns_) 
+            //if (owns_)
                 stm::lock(m);
             //owns_=true;
         }
         inline void unlock() {
-            //if (owns_) 
+            //if (owns_)
                 stm::unlock(m);
             //owns_=false;
         }
@@ -470,7 +470,7 @@
       va_list ap;
       va_start(ap, l);
 
-      while (l) 
+      while (l)
       {
          lockList_.push_back(l);
          l = va_arg(ap, lock_type*);

Modified: sandbox/stm/boost/stm/contention_manager.hpp
==============================================================================
--- sandbox/stm/boost/stm/contention_manager.hpp	(original)
+++ sandbox/stm/boost/stm/contention_manager.hpp	2009-06-07 13:06:29 EDT (Sun, 07 Jun 2009)
@@ -1,17 +1,17 @@
 //////////////////////////////////////////////////////////////////////////////
 //
-// (C) Copyright Justin E. Gottchlich 2009. 
-// (C) Copyright Vicente J. Botet Escriba 2009. 
+// (C) Copyright Justin E. Gottchlich 2009.
+// (C) Copyright Vicente J. Botet Escriba 2009.
 // Distributed under the Boost
-// Software License, Version 1.0. 
-// (See accompanying file LICENSE_1_0.txt or 
+// Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or
 // copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 // See http://www.boost.org/libs/synchro for documentation.
 //
 //////////////////////////////////////////////////////////////////////////////
 
-/* The DRACO Research Group (rogue.colorado.edu/draco) */ 
+/* The DRACO Research Group (rogue.colorado.edu/draco) */
 /*****************************************************************************\
  *
  * Copyright Notices/Identification of Licensor(s) of
@@ -49,9 +49,9 @@
    /////////////////////////////////////////////////////////////////////////
    // do nothing for both of these interfaces
    /////////////////////////////////////////////////////////////////////////
-   void abort_on_write(boost::stm::transaction &t, 
+   void abort_on_write(boost::stm::transaction &t,
       boost::stm::base_transaction_object const &in) {}
-   void abort_on_read(boost::stm::transaction const &t, 
+   void abort_on_read(boost::stm::transaction const &t,
       boost::stm::base_transaction_object const &in) {}
    void abort_on_delete(boost::stm::transaction const &t,
       boost::stm::base_transaction_object const &in) {}
@@ -69,17 +69,17 @@
 public:
 
    ExceptAndBackOffOnAbortNoticeCM(int const initialSleepTime, int const sleepIncrease,
-      int const maxIncreases) 
-      : sleepTime_(initialSleepTime), kSleepFactorIncrease_(sleepIncrease), 
+      int const maxIncreases)
+      : sleepTime_(initialSleepTime), kSleepFactorIncrease_(sleepIncrease),
         kMaxIncreases_(maxIncreases), initialSleepTime_(initialSleepTime)
    {
       kMaxSleepTime_ = kSleepFactorIncrease_ * sleepTime_ * kMaxIncreases_;
    }
 
    ////////////////////////////////////////////////////////////////////////////
-   void abort_on_write(boost::stm::transaction &t, 
+   void abort_on_write(boost::stm::transaction &t,
       boost::stm::base_transaction_object const &in);
-   void abort_on_read(boost::stm::transaction const &t, 
+   void abort_on_read(boost::stm::transaction const &t,
       boost::stm::base_transaction_object const &in);
    void abort_on_delete(boost::stm::transaction const &t,
       boost::stm::base_transaction_object const &in);
@@ -101,22 +101,22 @@
    // this code is only ever called if "validation" is on not "invalidation"
    // so don't worry about this code EVER stopping invalidation from committing
    //--------------------------------------------------------------------------
-   virtual bool abort_before_commit(boost::stm::transaction const &t) 
+   virtual bool abort_before_commit(boost::stm::transaction const &t)
    {
       using namespace boost::stm;
 
-      for (transaction::in_flight_trans_cont::const_iterator i = 
-           transaction::in_flight_transactions().begin(); 
+      for (transaction::in_flight_trans_cont::const_iterator i =
+           transaction::in_flight_transactions().begin();
       i != transaction::in_flight_transactions().end(); ++i)
       {
          if (t.priority() < (*i)->priority()) return true;
       }
 
-      return false; 
+      return false;
    }
 
    virtual bool permission_to_abort
-      (boost::stm::transaction const &lhs, boost::stm::transaction const &rhs) 
+      (boost::stm::transaction const &lhs, boost::stm::transaction const &rhs)
    {
       return true;
 #if 0
@@ -130,15 +130,15 @@
    }
 
    virtual bool allow_lock_to_abort_tx
-   (int const & lockWaitTime, int const &lockAborted, 
+   (int const & lockWaitTime, int const &lockAborted,
    bool txTryingToAbortIsIrrevocable, boost::stm::transaction const &rhs)
    {
       if (txTryingToAbortIsIrrevocable) return true;
 
 #ifndef DISABLE_READ_SETS
-      if ((size_t)lockWaitTime > rhs.read_set_size() + 100 * rhs.writes()) 
+      if ((size_t)lockWaitTime > rhs.read_set_size() + 100 * rhs.writes())
 #else
-      if ((size_t)lockWaitTime > 100 * rhs.writes()) 
+      if ((size_t)lockWaitTime > 100 * rhs.writes())
 #endif
       {
          return true;