*Backed out changeset 3be01fb200a5

--HG--
branch : trunk

1 files changed, 36 insertions, 0 deletions

diff --git a/dep/ACE_wrappers/ace/Barrier.cpp b/dep/ACE_wrappers/ace/Barrier.cpp
index 5597ea34c3c..515a73f95a9 100644
--- a/dep/ACE_wrappers/ace/Barrier.cpp
+++ b/dep/ACE_wrappers/ace/Barrier.cpp
@@ -1,24 +1,34 @@
 // $Id: Barrier.cpp 80826 2008-03-04 14:51:23Z wotte $
+
 #include "ace/Barrier.h"
+
 #if defined (ACE_HAS_THREADS)
+
 #if !defined (__ACE_INLINE__)
 #include "ace/Barrier.inl"
 #endif /* __ACE_INLINE__ */
+
 #include "ace/Guard_T.h"
 #include "ace/OS_NS_errno.h"
+
 #if defined (ACE_HAS_DUMP)
 #  include "ace/Log_Msg.h"
 #endif /* ACE_HAS_DUMP */
+
 ACE_RCSID (ace,
            Barrier,
            "$Id: Barrier.cpp 80826 2008-03-04 14:51:23Z wotte $")
+
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_Sub_Barrier)
+
 void
 ACE_Sub_Barrier::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Sub_Barrier::dump");
+
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->barrier_finished_.dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("running_threads_ = %d"), this->running_threads_));
@@ -26,6 +36,7 @@ ACE_Sub_Barrier::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
+
 ACE_Sub_Barrier::ACE_Sub_Barrier (unsigned int count,
                                   ACE_Thread_Mutex &lock,
                                   const ACE_TCHAR *name,
@@ -35,12 +46,15 @@ ACE_Sub_Barrier::ACE_Sub_Barrier (unsigned int count,
 {
 // ACE_TRACE ("ACE_Sub_Barrier::ACE_Sub_Barrier");
 }
+
 ACE_ALLOC_HOOK_DEFINE(ACE_Barrier)
+
 void
 ACE_Barrier::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Barrier::dump");
+
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->lock_.dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("current_generation_ = %d"), this->current_generation_));
@@ -50,6 +64,7 @@ ACE_Barrier::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
+
 ACE_Barrier::ACE_Barrier (unsigned int count,
                           const ACE_TCHAR *name,
                           void *arg)
@@ -63,20 +78,25 @@ ACE_Barrier::ACE_Barrier (unsigned int count,
   this->sub_barrier_[0] = &this->sub_barrier_1_;
   this->sub_barrier_[1] = &this->sub_barrier_2_;
 }
+
 int
 ACE_Barrier::wait (void)
 {
   ACE_TRACE ("ACE_Barrier::wait");
   ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1);
+
   ACE_Sub_Barrier *sbp =
     this->sub_barrier_[this->current_generation_];
+
   // Check for shutdown...
   if (sbp == 0)
     {
       errno = ESHUTDOWN;
       return -1;
     }
+
   int retval = 0;
+
   if (sbp->running_threads_ == 1)
     {
       // We're the last running thread, so swap generations and tell
@@ -90,9 +110,11 @@ ACE_Barrier::wait (void)
   else
     {
       --sbp->running_threads_;
+
       // Block until all the other threads wait().
       while (sbp->running_threads_ != this->count_)
         sbp->barrier_finished_.wait ();
+
       // We're awake and the count has completed. See if it completed
       // because all threads hit the barrier, or because the barrier
       // was shut down.
@@ -102,36 +124,45 @@ ACE_Barrier::wait (void)
           retval = -1;
         }
     }
+
   return retval;
 }
+
 int
 ACE_Barrier::shutdown (void)
 {
   ACE_TRACE ("ACE_Barrier::shutdown");
   ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1);
+
   ACE_Sub_Barrier *sbp =
     this->sub_barrier_[this->current_generation_];
+
   // Check for shutdown...
   if (sbp == 0)
     {
       errno = ESHUTDOWN;
       return -1;
     }
+
   // Flag the shutdown
   this->sub_barrier_[0] = 0;
   this->sub_barrier_[1] = 0;
   // Tell all the threads waiting on the barrier to continue on their way.
   sbp->running_threads_ = this->count_;
   sbp->barrier_finished_.broadcast ();
+
   return 0;
 }
+
 ACE_ALLOC_HOOK_DEFINE(ACE_Thread_Barrier)
+
 ACE_Thread_Barrier::ACE_Thread_Barrier (unsigned int count,
                                         const ACE_TCHAR *name)
   : ACE_Barrier (count, name)
 {
 // ACE_TRACE ("ACE_Thread_Barrier::ACE_Thread_Barrier");
 }
+
 void
 ACE_Thread_Barrier::dump (void) const
 {
@@ -140,14 +171,17 @@ ACE_Thread_Barrier::dump (void) const
   ACE_Barrier::dump ();
 #endif /* ACE_HAS_DUMP */
 }
+
 #if 0
 ACE_ALLOC_HOOK_DEFINE(ACE_Process_Barrier)
+
 ACE_Process_Barrier::ACE_Process_Barrier (u_int count,
                                           const ACE_TCHAR *name)
   : ACE_Barrier (count, USYNC_PROCESS, name)
 {
 // ACE_TRACE ("ACE_Process_Barrier::ACE_Process_Barrier");
 }
+
 void
 ACE_Process_Barrier::dump (void) const
 {
@@ -157,6 +191,8 @@ ACE_Process_Barrier::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 #endif /* 0 */
+
 ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_THREADS */