*Backed out changeset 3be01fb200a5

--HG--
branch : trunk

dep/ACE_wrappers/ace/Service_Object.cpp

@@ -1,9 +1,13 @@
 // $Id: Service_Object.cpp 81826 2008-06-02 15:29:53Z schmidt $
+
 #include "ace/config-all.h"
+
 #include "ace/Service_Object.h"
+
 #if !defined (__ACE_INLINE__)
 #include "ace/Service_Object.inl"
 #endif /* __ACE_INLINE__ */
+
 #include "ace/OS_NS_stdio.h"
 #include "ace/Service_Types.h"
 #include "ace/DLL.h"
@@ -12,12 +16,16 @@
 #if defined (ACE_OPENVMS)
 # include "ace/Lib_Find.h"
 #endif
+
 ACE_RCSID (ace,
            Service_Object,
            "$Id: Service_Object.cpp 81826 2008-06-02 15:29:53Z schmidt $")
+
   ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_Service_Object)
   ACE_ALLOC_HOOK_DEFINE(ACE_Service_Type)
+
   void
 ACE_Service_Type::dump (void) const
 {
@@ -25,6 +33,7 @@ ACE_Service_Type::dump (void) const
   ACE_TRACE ("ACE_Service_Type::dump");
 #endif /* ACE_HAS_DUMP */
 
+
   // Using printf, since the log facility may not have been
   // initialized yet. Using a "//" prefix, in case the executable
   // happens to be a code generator and the output gets embedded in
@@ -36,7 +45,9 @@ ACE_Service_Type::dump (void) const
                   this->type_,
                   (this->type_ != 0) ? this->type_->object () : 0,
                   this->active_);
+
 }
+
 ACE_Service_Type::ACE_Service_Type (const ACE_TCHAR *n,
                                     ACE_Service_Type_Impl *t,
                                     const ACE_DLL &dll,
@@ -50,6 +61,7 @@ ACE_Service_Type::ACE_Service_Type (const ACE_TCHAR *n,
   ACE_TRACE ("ACE_Service_Type::ACE_Service_Type");
   this->name (n);
 }
+
 ACE_Service_Type::ACE_Service_Type (const ACE_TCHAR *n,
                                     ACE_Service_Type_Impl *t,
                                     ACE_SHLIB_HANDLE handle,
@@ -63,12 +75,15 @@ ACE_Service_Type::ACE_Service_Type (const ACE_TCHAR *n,
   this->dll_.set_handle (handle);
   this->name (n);
 }
+
 ACE_Service_Type::~ACE_Service_Type (void)
 {
   ACE_TRACE ("ACE_Service_Type::~ACE_Service_Type");
   this->fini ();
+
   delete [] const_cast <ACE_TCHAR *> (this->name_);
 }
+
 int
 ACE_Service_Type::fini (void)
 {
@@ -77,9 +92,12 @@ ACE_Service_Type::fini (void)
                 ACE_TEXT ("ACE (%P|%t) ST::fini - destroying name=%s, dll=%s\n"),
                 this->name_,
                 this->dll_.dll_name_));
+
   if (this->fini_already_called_)
     return 0;
+
   this->fini_already_called_ = true;
+
   if (this->type_ == 0)
     {
       // Returning 1 currently only makes sense for dummy instances, used
@@ -87,14 +105,19 @@ ACE_Service_Type::fini (void)
       // dynamic service. This is necessary to help enforce the correct
       // finalization order, when such service also has any (dependent)
       // static services
+
       return 1; // No implementation was found.
     }
+
   int ret = this->type_->fini ();
+
   // Ensure that closing the DLL is done after type_->fini() as it may
   // require access to the code for the service object destructor,
   // which resides in the DLL
+
   return (ret | this->dll_.close ());
 }
+
 int
 ACE_Service_Type::suspend (void) const
 {
@@ -102,6 +125,7 @@ ACE_Service_Type::suspend (void) const
   (const_cast<ACE_Service_Type *> (this))->active_ = false;
   return this->type_->suspend ();
 }
+
 int
 ACE_Service_Type::resume (void) const
 {
@@ -109,34 +133,41 @@ ACE_Service_Type::resume (void) const
   (const_cast<ACE_Service_Type *> (this))->active_ = true;
   return this->type_->resume ();
 }
+
 ACE_Service_Object::ACE_Service_Object (ACE_Reactor *r)
   : ACE_Event_Handler (r)
 {
   ACE_TRACE ("ACE_Service_Object::ACE_Service_Object");
 }
+
 ACE_Service_Object::~ACE_Service_Object (void)
 {
   ACE_TRACE ("ACE_Service_Object::~ACE_Service_Object");
 }
+
 int
 ACE_Service_Object::suspend (void)
 {
   ACE_TRACE ("ACE_Service_Object::suspend");
   return 0;
 }
+
 int
 ACE_Service_Object::resume (void)
 {
   ACE_TRACE ("ACE_Service_Object::resume");
   return 0;
 }
+
 void
 ACE_Service_Type::name (const ACE_TCHAR *n)
 {
   ACE_TRACE ("ACE_Service_Type::name");
+
   delete [] const_cast <ACE_TCHAR *> (this->name_);
   this->name_ = ACE::strnew (n);
 }
+
 #if defined (ACE_OPENVMS)
 ACE_Dynamic_Svc_Registrar::ACE_Dynamic_Svc_Registrar (const ACE_TCHAR* alloc_name,
                                                       void* svc_allocator)
@@ -145,5 +176,6 @@ ACE_Dynamic_Svc_Registrar::ACE_Dynamic_Svc_Registrar (const ACE_TCHAR* alloc_nam
   ACE::ldregister (alloc_name, svc_allocator);
 }
 #endif
+
 ACE_END_VERSIONED_NAMESPACE_DECL