Created a branch to make my changes public.

1 files changed, 1210 insertions, 0 deletions

diff --git a/ace/Service_Gestalt.cpp b/ace/Service_Gestalt.cpp
new file mode 100644
index 00000000000..2c8a83f3114
--- /dev/null
+++ b/ace/Service_Gestalt.cpp
@@ -0,0 +1,1210 @@
+// $Id$
+
+#include "ace/Svc_Conf.h"
+#include "ace/Get_Opt.h"
+#include "ace/ARGV.h"
+#include "ace/Malloc.h"
+#include "ace/Service_Manager.h"
+#include "ace/Service_Types.h"
+#include "ace/Containers.h"
+#include "ace/Auto_Ptr.h"
+#include "ace/Reactor.h"
+#include "ace/Thread_Manager.h"
+#include "ace/DLL.h"
+#include "ace/XML_Svc_Conf.h"
+#include "ace/SString.h"
+
+#ifndef ACE_LACKS_UNIX_SIGNALS
+# include "ace/Signal.h"
+#endif  /* !ACE_LACKS_UNIX_SIGNALS */
+
+#include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_string.h"
+#include "ace/OS_NS_time.h"
+#include "ace/OS_NS_unistd.h"
+#include "ace/OS_NS_sys_stat.h"
+
+#include "ace/TSS_T.h"
+#include "ace/Service_Gestalt.h"
+
+#include "ace/Svc_Conf_Param.h"
+
+ACE_RCSID (ace,
+           Service_Gestalt,
+           "$Id$")
+
+  ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// This is here, in the implementation, because it depends on the ACE_DLL type,
+// which would be unnecessary to introduuce all over the place, had we declared
+// this in the header file.
+
+// A forward service declaration guard. Used to declare a Service Type with a
+// specific name in a Service Repository, which may later be replaced by the
+// "real" Service Type. The only application is in the implementation of
+// ACE_Service_Gestalt::initialize (), hence the declaration scoping in
+// this file.
+class ACE_Service_Type_Forward_Declaration_Guard
+{
+public:
+  ACE_Service_Type_Forward_Declaration_Guard (ACE_Service_Repository *r,
+                                              ACE_TCHAR const *name);
+
+  ~ACE_Service_Type_Forward_Declaration_Guard (void);
+
+private:
+  const ACE_DLL dummy_dll_;
+  ACE_Service_Repository *repo_;
+  ACE_TCHAR const * const name_;
+  ACE_Service_Type const * dummy_;
+};
+
+ACE_Service_Type_Forward_Declaration_Guard::ACE_Service_Type_Forward_Declaration_Guard
+  (ACE_Service_Repository *r, const ACE_TCHAR *name)
+    : repo_ (r)
+    , name_ (name)
+{
+  ACE_ASSERT (this->repo_ != 0); // No repository specified?
+  ACE_ASSERT (this->name_ != 0); // No name?
+
+  ACE_NEW_NORETURN (this->dummy_, // Allocate the forward declaration ...
+                    ACE_Service_Type (this->name_,  // ... use the same name
+                                      0,            // ... inactive
+                                      this->dummy_dll_, // ... bogus ACE_DLL
+                                      0));              // ... no type_impl
+
+  ACE_ASSERT (this->dummy_ != 0); // No memory?
+
+  if(ACE::debug ())
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_LIB_TEXT ("ACE (%P|%t) FWDCL::start, repo=%@, \'%s\' ")
+                ACE_LIB_TEXT ("- type=%@ (impl=(nil))\n"),
+                this->repo_,
+                this->name_,
+                this->dummy_));
+
+  // Note that the dummy_'s memory can disaper between invoking
+  // the ctor and dtor, if the expected "real" dynamic service is
+  // inserted in the repository.
+  this->repo_->insert (this->dummy_);
+}
+
+ACE_Service_Type_Forward_Declaration_Guard::~ACE_Service_Type_Forward_Declaration_Guard (void)
+{
+  const ACE_Service_Type *tmp = 0;
+
+  // Lookup without ignoring suspended services. Making sure
+  // not to ignore any inactive services, since those may be forward
+  // declarations
+  int ret = this->repo_->find (this->name_, &tmp, 0);
+
+  // We inserted it (as inactive), so we expect to find it, right?
+  if (ret < 0 && ret != -2)
+    {
+      if(ACE::debug ())
+        ACE_ERROR ((LM_WARNING,
+                    ACE_LIB_TEXT ("ACE (%P|%t) FWDCL::end - Failed (%d) to find %s\n"),
+                    ret, this->name_));
+      return;
+    }
+
+  if (tmp != 0 && tmp->type () != 0)
+    {
+      // Something has registered a proper (non-forward-decl) service with
+      // the same name as our dummy. The ACE_Service_Gestalt::insert() modifies
+      // the memory for the previous ACE_Service_Type instance. It has in fact
+      // taken ownership and deleted the instance when it replaced it with the
+      // actual implementation, so nothing is left to do. We are hereby giving
+      // up any ownership claims.
+      this->dummy_ = 0;
+
+      if(ACE::debug ())
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_LIB_TEXT ("ACE (%P|%t) FWDCL::end, repo=%@ - ")
+                      ACE_LIB_TEXT ("Found different decl - "),
+                      this->repo_,
+                      this->name_));
+          tmp->dump ();
+        }
+
+    }
+  else
+    {
+      if(ACE::debug ())
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_LIB_TEXT ("ACE (%P|%t) FWDCL::end, repo=%@ - ")
+                      ACE_LIB_TEXT ("Removing incomplete decl - "),
+                      this->repo_,
+                      this->name_));
+          this->dummy_->dump ();
+        }
+
+      // The (dummy) forward declaration is still there and is
+      // the same, which means that no actual declaration was
+      // provided inside the guarded scope. Therefore, the forward
+      // declaration is no longer necessary.
+      if (this->repo_->remove (this->name_,
+                               const_cast< ACE_Service_Type**> (&this->dummy_)) == 0)
+        {
+          delete this->dummy_;
+        }
+      else
+        {
+          if(ACE::debug ())
+            {
+              ACE_ERROR ((LM_ERROR,
+                          ACE_LIB_TEXT ("ACE (%P|%t) FWDCL::end, repo=%@ - ")
+                          ACE_LIB_TEXT ("Failed to remove incomplete decl"),
+                          this->repo_,
+                          this->name_));
+              this->dummy_->dump ();
+            }
+        }
+    }
+
+  // Clean up
+  this->dummy_ = 0;
+  this->repo_ = 0;
+}
+
+
+
+// ----------------------------------------
+
+ACE_Service_Gestalt::Processed_Static_Svc::
+Processed_Static_Svc (const ACE_Static_Svc_Descriptor *assd)
+  :name_(0),
+   assd_(assd)
+{
+  ACE_NEW_NORETURN (name_, ACE_TCHAR[ACE_OS::strlen(assd->name_)+1]);
+  ACE_OS::strcpy(name_,assd->name_);
+//   if (ACE::debug ())
+//     ACE_DEBUG ((LM_DEBUG,
+//                 ACE_LIB_TEXT ("ACE (%P|%t) PSS::ctor -  name = %s\n"),
+//                 name_));
+}
+
+ACE_Service_Gestalt::Processed_Static_Svc::
+~Processed_Static_Svc (void)
+{
+//   if (ACE::debug ())
+//     ACE_DEBUG ((LM_DEBUG,
+//                 ACE_LIB_TEXT ("ACE (%P|%t) PSS::dtor -  name = %s\n"),
+//                 name_));
+
+  delete [] name_;
+}
+
+// ----------------------------------------
+
+ACE_Service_Gestalt::~ACE_Service_Gestalt (void)
+{
+  ACE_ASSERT (this->repo_ != 0);
+
+  if (this->svc_repo_is_owned_)
+    delete this->repo_;
+  delete this->static_svcs_;
+  // Delete the dynamically allocated static_svcs instance.
+  if (ACE::debug ())
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_LIB_TEXT ("ACE (%P|%t) SG::dtor - this=%@, pss = %@\n"),
+                this, this->processed_static_svcs_));
+
+  if (this->processed_static_svcs_ &&
+      !this->processed_static_svcs_->is_empty())
+    {
+      Processed_Static_Svc **pss = 0;
+      for (ACE_PROCESSED_STATIC_SVCS_ITERATOR iter (*this->processed_static_svcs_);
+           iter.next (pss) != 0;
+           iter.advance ())
+        {
+          delete *pss;
+        }
+    }
+  delete this->processed_static_svcs_;
+}
+
+ACE_Service_Gestalt::ACE_Service_Gestalt (size_t size,
+                                          bool svc_repo_is_owned,
+                                          bool no_static_svcs)
+  : svc_repo_is_owned_ (svc_repo_is_owned)
+  , is_opened_ (0)
+  , logger_key_ (ACE_DEFAULT_LOGGER_KEY)
+  , no_static_svcs_ (no_static_svcs)
+  , svc_queue_ (0)
+  , svc_conf_file_queue_ (0)
+{
+  if (svc_repo_is_owned)
+    ACE_NEW_NORETURN (this->repo_,
+                      ACE_Service_Repository (size));
+  else
+      this->repo_ =
+        ACE_Service_Repository::instance (size);
+
+  ACE_NEW_NORETURN (this->static_svcs_,
+                    ACE_STATIC_SVCS);
+
+  this->processed_static_svcs_ = 0;
+
+  if (ACE::debug ())
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_LIB_TEXT ("ACE (%P|%t) SG::ctor - this = %@, pss = %@\n"),
+                this, this->processed_static_svcs_));
+}
+
+// Add the default statically-linked services to the Service
+// Repository.
+
+int
+ACE_Service_Gestalt::load_static_svcs (void)
+{
+  ACE_TRACE ("ACE_Service_Gestalt::load_static_svcs");
+
+  if (this->static_svcs_ == 0)
+    return 0; // Nothing to do
+
+  ACE_Static_Svc_Descriptor **ssdp = 0;
+  for (ACE_STATIC_SVCS_ITERATOR iter (*this->static_svcs_);
+       iter.next (ssdp) != 0;
+       iter.advance ())
+    {
+      ACE_Static_Svc_Descriptor *ssd = *ssdp;
+
+      if (this->process_directive (*ssd, 1) == -1)
+        return -1;
+    }
+  return 0;
+
+} /* load_static_svcs () */
+
+
+
+/// Find a static service descriptor by name
+
+int
+ACE_Service_Gestalt::find_static_svc_descriptor (const ACE_TCHAR* name,
+                                                 ACE_Static_Svc_Descriptor **ssd) const
+{
+  ACE_TRACE ("ACE_Service_Gestalt::find_static_svc_descriptor");
+
+  if (this->static_svcs_ == 0)
+    return -1;
+
+  ACE_Static_Svc_Descriptor **ssdp = 0;
+  for (ACE_STATIC_SVCS_ITERATOR iter ( *this->static_svcs_);
+       iter.next (ssdp) != 0;
+       iter.advance ())
+    {
+      if (ACE_OS::strcmp ((*ssdp)->name_, name) == 0)
+        {
+          if (ssd != 0)
+            *ssd = *ssdp;
+
+          return 0;
+        }
+    }
+
+  return -1;
+}
+
+const ACE_Static_Svc_Descriptor*
+ACE_Service_Gestalt::find_processed_static_svc (const ACE_TCHAR* name)
+{
+  Processed_Static_Svc **pss = 0;
+  for (ACE_PROCESSED_STATIC_SVCS_ITERATOR iter (*this->processed_static_svcs_);
+       iter.next (pss) != 0;
+       iter.advance ())
+    {
+      if (ACE_OS::strcmp ((*pss)->name_, name) == 0)
+        return (*pss)->assd_;
+    }
+  return 0;
+}
+
+void
+ACE_Service_Gestalt::add_processed_static_svc
+  (const ACE_Static_Svc_Descriptor *assd)
+{
+  if (this->processed_static_svcs_ == 0)
+    ACE_NEW (this->processed_static_svcs_,
+             ACE_PROCESSED_STATIC_SVCS);
+
+  Processed_Static_Svc **pss = 0;
+  for (ACE_PROCESSED_STATIC_SVCS_ITERATOR iter (*this->processed_static_svcs_);
+       iter.next (pss) != 0;
+       iter.advance ())
+    {
+      if (ACE_OS::strcmp ((*pss)->name_, assd->name_) == 0)
+        {
+          (*pss)->assd_ = assd;
+          return;
+        }
+    }
+  Processed_Static_Svc *tmp = 0;
+  ACE_NEW (tmp,Processed_Static_Svc(assd));
+  this->processed_static_svcs_->insert(tmp);
+}
+
+int
+ACE_Service_Gestalt::insert (ACE_Static_Svc_Descriptor *stsd)
+{
+  if (ACE::debug ())
+    {
+      // If called during static initialization ACE_Log_Msg may not
+      // have been initialized yet, so use printf intead. Using a "//"
+      // prefix in case the executable is a C++ code generator and the
+      // output gets embedded in the generated code.
+      ACE_OS::fprintf (stderr,
+           "// (%d|0) SG::insert"
+           " repo=%p, name=%s - queuing a Static_Svc_Descriptor:"
+           " active=%d, repo opened=%d.\n",
+           ACE_OS::getpid (),
+           this->repo_,
+           stsd->name_,
+           stsd->active_,
+           this->is_opened_);
+    }
+
+  // Inserting a service after the Gestalt has been opened makes it
+  // impossible to activate it later. Perhaps open came too soon?
+  //ACE_ASSERT (this->is_opened_ == 0);
+
+  return this->static_svcs_->insert (stsd);
+}
+
+
+ACE_ALLOC_HOOK_DEFINE (ACE_Service_Gestalt)
+
+
+  void
+ACE_Service_Gestalt::dump (void) const
+{
+#if defined (ACE_HAS_DUMP)
+  ACE_TRACE ("ACE_Service_Gestalt::dump");
+#endif /* ACE_HAS_DUMP */
+}
+
+
+
+///
+
+int
+ACE_Service_Gestalt::initialize (const ACE_TCHAR *svc_name,
+                                 const ACE_TCHAR *parameters)
+{
+  ACE_TRACE ("ACE_Service_Gestalt_Base::initialize (repo)");
+  ACE_ARGV args (parameters);
+
+#ifndef ACE_NLOGGING
+  if (ACE::debug ())
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_LIB_TEXT ("ACE (%P|%t) SG::initialize - () repo=%@, ")
+                  ACE_LIB_TEXT ("looking up static ")
+                  ACE_LIB_TEXT ("service \'%s\' to initialize\n"),
+                  this->repo_,
+                  svc_name));
+    }
+#endif
+
+  const ACE_Service_Type *srp = 0;
+  for (int i = 0; this->repo_->find (svc_name, &srp) == -1 && i < 2; i++)
+    //  if (this->repo_->find (svc_name, &srp) == -1)
+    {
+      const ACE_Static_Svc_Descriptor *assd =
+        ACE_Service_Config::global()->find_processed_static_svc(svc_name);
+      if (assd != 0)
+        {
+          this->process_directive_i(*assd,0);
+        }
+      else
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ACE_LIB_TEXT ("ACE (%P|%t) SG::initialize - service \'%s\'")
+                             ACE_LIB_TEXT (" was not located.\n"),
+                             svc_name),
+                            -1);
+        }
+    }
+  if (srp == 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       ACE_LIB_TEXT ("ACE (%P|%t) SG::initialize - service \'%s\'")
+                       ACE_LIB_TEXT (" was not located.\n"),
+                       svc_name),
+                      -1);
+
+  /// If initialization fails ...
+  if (srp->type ()->init (args.argc (),
+                          args.argv ()) == -1)
+    {
+      // ... report and remove this entry.
+      ACE_ERROR ((LM_ERROR,
+      ACE_LIB_TEXT ("ACE (%P|%t) SG::initialize - static init of \'%s\'")
+      ACE_LIB_TEXT (" failed (%p)\n"),
+      svc_name));
+      this->repo_->remove (svc_name);
+      return -1;
+    }
+
+  // If everything is ok, activate it
+  const_cast<ACE_Service_Type *>(srp)->active (1);
+  return 0;
+}
+
+
+#if (ACE_USES_CLASSIC_SVC_CONF == 1)
+int
+ACE_Service_Gestalt::initialize (const ACE_Service_Type_Factory *stf,
+                                 const ACE_TCHAR *parameters)
+{
+  ACE_TRACE ("ACE_Service_Gestalt::initialize");
+
+#ifndef ACE_NLOGGING
+  if (ACE::debug ())
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_LIB_TEXT ("ACE (%P|%t) SG::initialize - repo=%@, looking up dynamic ")
+                ACE_LIB_TEXT ("service \'%s\' to initialize\n"),
+                this->repo_,
+                stf->name ()));
+#endif
+
+  ACE_Service_Type *srp = 0;
+  int const retv = this->repo_->find (stf->name (),
+                                      (const ACE_Service_Type **) &srp);
+
+  // If there is an active service already, it must first be removed,
+  // before it could be re-installed.
+  if (retv >= 0)
+    {
+#ifndef ACE_NLOGGING
+      if (ACE::debug ())
+        ACE_ERROR_RETURN ((LM_WARNING,
+                           ACE_LIB_TEXT ("ACE (%P|%t) \'%s\' already installed.")
+                           ACE_LIB_TEXT (" Must be removed before re-installing\n"),
+                           stf->name ()),
+                          0);
+#endif
+        return 0;
+    }
+
+  // There is an inactive service by that name, so it may have been
+  // either inactivated, or just a forward declaration for a service,
+  // that is in the process of being loaded. If the latter, then we
+  // have detected an attempt to initialize the same dynamic service
+  // while still processing previous attempt. This can lock up the
+  // process, because the ACE_DLL_Manager::open () is not re-entrant -
+  // it uses a Singleton lock to serialize concurent invocations. This
+  // use case must be handled here, because if the DLL_Manager was
+  // re-entrant we would have entered an infinite recursion here.
+  if (retv == -2 && srp->type () == 0)
+    ACE_ERROR_RETURN ((LM_WARNING,
+                       ACE_LIB_TEXT ("ACE (%P|%t) \'%s\' has not been ")
+                       ACE_LIB_TEXT ("completely defined. Recursive ")
+                       ACE_LIB_TEXT ("initialization request while ")
+                       ACE_LIB_TEXT ("already performing one.\n"),
+                       stf->name ()),
+                      -1);
+
+  // Reserve a spot for the dynamic service by inserting an incomplete
+  // service declaration, i.e. one that can not produce a service
+  // object if asked.  Having this incomplete declaration works
+  // similar to C++'s forward declaration to allow, in this case
+  // proper partial ordering of the loaded services in respect to
+  // their finalization. I.e. dependent static services must be
+  // registered *after* the dynamic service that loads them, so that
+  // their finalization is complete *before* finalizing the dynamic
+  // service.
+  ACE_Service_Type_Forward_Declaration_Guard dummy (this->repo_,
+                                                    stf->name ());
+
+  // make_service_type() is doing the dynamic loading and also runs
+  // any static initializers
+  ACE_Auto_Ptr<ACE_Service_Type> tmp (stf->make_service_type (this));
+  if (tmp.get () != 0 &&
+      this->initialize_i (tmp.get (), parameters) == 0)
+    {
+      // All good the ACE_Service_Type instance is now owned by the repository
+      // and we should make sure it is not destroyed upon exit from this method.
+      (void)tmp.release ();
+      return 0;
+    }
+
+  // Something went wrong ...
+#ifndef ACE_NLOGGING
+  if (ACE::debug ())
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       ACE_LIB_TEXT ("ACE (%P|%t) Error initializing %s: %m\n"),
+                       stf->name()),
+                      -1);
+#endif
+
+  return -1;
+}
+#endif /* (ACE_USES_CLASSIC_SVC_CONF == 1) */
+
+
+// Dynamically link the shared object file and retrieve a pointer to
+// the designated shared object in this file.
+// @note This is obsolete (and error-prone) in the presense of dynamic
+// services with their own static services. This method will allow those
+// static services to register *before* the dynamic service that owns them.
+// Upon finalization of the static services the process may crash, because
+// the dynamic service's DLL may have been already released, together with
+// the memory in which the static services reside.
+// It may not crash, for instance, when the first static service to register
+// is the same as the dynamic service being loaded. You should be so lucky! ..
+
+int
+ACE_Service_Gestalt::initialize (const ACE_Service_Type *sr,
+                                 const ACE_TCHAR *parameters)
+{
+  ACE_TRACE ("ACE_Service_Gestalt::initialize");
+
+  if (ACE::debug ())
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_LIB_TEXT ("ACE (%P|%t) SG::initialize - looking up dynamic ")
+                ACE_LIB_TEXT (" service \'%s\' to initialize\n"),
+                sr->name ()));
+
+  ACE_Service_Type *srp = 0;
+  if (this->repo_->find (sr->name (),
+                         (const ACE_Service_Type **) &srp) >= 0)
+    ACE_ERROR_RETURN ((LM_WARNING,
+                       ACE_LIB_TEXT ("ACE (%P|%t) SG::initialize - \'%s\' ")
+                       ACE_LIB_TEXT ("has already been installed. ")
+                       ACE_LIB_TEXT ("Remove before reinstalling\n"),
+                       sr->name ()),
+                      0);
+
+  return this->initialize_i (sr, parameters);
+
+}
+
+// Dynamically link the shared object file and retrieve a pointer to
+// the designated shared object in this file.
+int
+ACE_Service_Gestalt::initialize_i (const ACE_Service_Type *sr,
+                                   const ACE_TCHAR *parameters)
+{
+  ACE_TRACE ("ACE_Service_Gestalt::initialize_i");
+  ACE_ARGV args (parameters);
+  if (sr->type ()->init (args.argc (),
+                         args.argv ()) == -1)
+    {
+      // We just get ps to avoid having remove() delete it.
+      ACE_Service_Type *ps = 0;
+      this->repo_->remove (sr->name (), &ps);
+
+#ifndef ACE_NLOGGING
+      // Not using LM_ERROR here to avoid confusing the test harness
+      if (ACE::debug ())
+        ACE_ERROR_RETURN ((LM_WARNING,
+                           ACE_LIB_TEXT ("ACE (%P|%t) SG - initialize_i ")
+                           ACE_LIB_TEXT ("failed for %s: %m\n"),
+                           sr->name ()),
+                          -1);
+#endif
+      return -1;
+    }
+
+  if (this->repo_->insert (sr) == -1)
+    {
+#ifndef ACE_NLOGGING
+      // Not using LM_ERROR here to avoid confusing the test harness
+      if (ACE::debug ())
+        ACE_ERROR_RETURN ((LM_WARNING,
+                           ACE_LIB_TEXT ("ACE (%P|%t) SG - repository insert ")
+                           ACE_LIB_TEXT ("failed for %s: %m\n"),
+                           sr->name ()),
+                          -1);
+#endif
+        return -1;
+    }
+
+  return 0;
+}
+
+// Totally remove <svc_name> from the daemon by removing it from the
+// ACE_Reactor, and unlinking it if necessary.
+
+int
+ACE_Service_Gestalt::remove (const ACE_TCHAR svc_name[])
+{
+  ACE_TRACE ("ACE_Service_Gestalt::remove");
+  return this->repo_->remove (svc_name);
+}
+
+// Suspend <svc_name>.  Note that this will not unlink the service
+// from the daemon if it was dynamically linked, it will mark it as
+// being suspended in the Service Repository and call the <suspend>
+// member function on the appropriate <ACE_Service_Object>.  A service
+// can be resumed later on by calling the <resume> method...
+
+int
+ACE_Service_Gestalt::suspend (const ACE_TCHAR svc_name[])
+{
+  ACE_TRACE ("ACE_Service_Gestalt::suspend");
+  return this->repo_->suspend (svc_name);
+}
+
+// Resume a SVC_NAME that was previously suspended or has not yet
+// been resumed (e.g., a static service).
+
+int
+ACE_Service_Gestalt::resume (const ACE_TCHAR svc_name[])
+{
+  ACE_TRACE ("ACE_Service_Gestalt::resume");
+  return this->repo_->resume (svc_name);
+}
+
+
+int
+ACE_Service_Gestalt::process_directive (const ACE_Static_Svc_Descriptor &ssd,
+                                        int force_replace)
+{
+  int result = process_directive_i(ssd,force_replace);
+  if (result == 0)
+    {
+      this->add_processed_static_svc(&ssd);
+    }
+  return result;
+}
+
+int
+ACE_Service_Gestalt::process_directive_i (const ACE_Static_Svc_Descriptor &ssd,
+                                        int force_replace)
+{
+#ifndef ACE_NLOGGING
+  if (ACE::debug ())
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_LIB_TEXT ("ACE (%P|%t) SG::process_directive, ")
+                ACE_LIB_TEXT ("repo=%@, replace=%d - %s\n"),
+                this->repo_,
+                force_replace,
+                ssd.name_));
+#endif
+
+  if (!force_replace)
+    {
+      if (this->repo_->find (ssd.name_, 0, 0) >= 0)
+        {
+          // The service is already there, just return
+          return 0;
+        }
+    }
+
+  ACE_Service_Object_Exterminator gobbler;
+  void *sym = (ssd.alloc_)(&gobbler);
+
+  ACE_Service_Type_Impl *stp =
+    ACE_Service_Config::create_service_type_impl (ssd.name_,
+                                                  ssd.type_,
+                                                  sym,
+                                                  ssd.flags_,
+                                                  gobbler);
+  if (stp == 0)
+    return 0;
+
+
+  ACE_Service_Type *service_type;
+
+  // This is just a temporary to force the compiler to use the right
+  // constructor in ACE_Service_Type
+  ACE_DLL tmp_dll;
+
+  ACE_NEW_RETURN (service_type,
+                  ACE_Service_Type (ssd.name_,
+                                    stp,
+                                    tmp_dll,
+                                    ssd.active_),
+                  -1);
+
+  return this->repo_->insert (service_type);
+}
+
+#if (ACE_USES_CLASSIC_SVC_CONF == 1)
+
+int
+ACE_Service_Gestalt::process_directives_i (ACE_Svc_Conf_Param *param)
+{
+  // AC 970827 Skip the heap check because yacc allocates a buffer
+  // here which will be reported as a memory leak for some reason.
+  ACE_NO_HEAP_CHECK
+
+    // Were we called in the context of the current instance?
+    ACE_ASSERT (this == param->config);
+
+  // Temporarily (for the duration of this call) make sure that *any* static
+  // service registrations will happen with this instance. Such registrations
+  // are possible as a side-effect of dynamically loading a DLL, which has
+  // other static services registered. Thus this instance will own both the
+  // DLL and those static services, which implies that their finalization
+  // will be performed in the correct order, i.e. prior to finalizing the DLL
+  ACE_Service_Config_Guard guard (this);
+
+#ifndef ACE_NLOGGING
+  if (ACE::debug ())
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_LIB_TEXT ("ACE (%P|%t) SG::process_directives_i, ")
+                ACE_LIB_TEXT ("repo=%@ - %s\n"),
+                this->repo_,
+                (param->type == ACE_Svc_Conf_Param::SVC_CONF_FILE)
+    ? ACE_TEXT ("<from file>")
+    : param->source.directive));
+#endif
+
+  ::ace_yyparse (param);
+
+  // This is a hack, better errors should be provided...
+  if (param->yyerrno > 0)
+    {
+      if (ACE_OS::last_error () == 0)
+        ACE_OS::last_error (EINVAL);
+
+      return param->yyerrno;
+    }
+  else
+    return 0;
+}
+
+#else
+
+ACE_XML_Svc_Conf *
+ACE_Service_Gestalt::get_xml_svc_conf (ACE_DLL &xmldll)
+{
+  if (xmldll.open (ACE_LIB_TEXT ("ACEXML_XML_Svc_Conf_Parser")) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       ACE_LIB_TEXT ("ACE (%P|%t) Failure to open ACEXML_XML_Svc_Conf_Parser: %p\n"),
+                       "ACE_Service_Config::get_xml_svc_conf"),
+                      0);
+
+  void *foo;
+  foo = xmldll.symbol (ACE_LIB_TEXT ("_ACEXML_create_XML_Svc_Conf_Object"));
+
+  // Cast the void* to long first.
+  long tmp = reinterpret_cast<long> (foo);
+  ACE_XML_Svc_Conf::Factory factory =
+    reinterpret_cast<ACE_XML_Svc_Conf::Factory> (tmp);
+  if (factory == 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       ACE_LIB_TEXT ("ACE (%P|%t) Unable to resolve factory: %p\n"),
+                       xmldll.error ()),
+                      0);
+
+  return factory ();
+}
+#endif /* ACE_USES_CLASSIC_SVC_CONF == 1 */
+
+int
+ACE_Service_Gestalt::process_file (const ACE_TCHAR file[])
+{
+  ACE_TRACE ("ACE_Service_Gestalt::process_file");
+
+  // To avoid recursive processing of the same file and the same repository
+  // we maintain an implicit stack of dummy "services" named after the file
+  // being processed. Anytime we have to open a new file, we then can check
+  // to see if it is not already being processed by searching for a dummy
+  // service with a matching name.
+  if (this->repo_->find (file, 0, 0) >=0)
+    {
+      ACE_DEBUG ((LM_WARNING,
+      ACE_TEXT ("ACE (%P|%t) Configuration file %s is currently")
+      ACE_TEXT (" being processed. Ignoring recursive process_file().\n"),
+      file));
+      return 0;
+    }
+
+  // Register a dummy service as a forward decl, using the file name as name.
+  // The entry will be automaticaly removed once the thread exits this block.
+  ACE_Service_Type_Forward_Declaration_Guard recursion_guard (this->repo_, file);
+
+  /*
+   * @TODO: Test with ACE_USES_CLASSIC_SVC_CONF turned off!
+   */
+#if (ACE_USES_CLASSIC_SVC_CONF == 1)
+  int result = 0;
+
+  FILE *fp = ACE_OS::fopen (file,
+                            ACE_LIB_TEXT ("r"));
+
+  if (fp == 0)
+    {
+      // Invalid svc.conf file.  We'll report it here and break out of
+      // the method.
+      if (ACE::debug ())
+        ACE_DEBUG ((LM_ERROR,
+                    ACE_LIB_TEXT ("ACE (%P|%t): %p\n"),
+                    file));
+
+      // Use stat to find out if the file exists.  I didn't use access()
+      // because stat is better supported on most non-unix platforms.
+      ACE_stat exists;
+      if (ACE_OS::stat (file, &exists) == 0)
+        // If it exists, but we couldn't open it for reading then we
+        // must not have permission to read it.
+        errno = EPERM;
+      else
+        errno = ENOENT;
+      result = -1;
+    }
+  else
+    {
+      ACE_Svc_Conf_Param f (this, fp);
+
+      // Keep track of the number of errors.
+      result = this->process_directives_i (&f);
+
+      (void) ACE_OS::fclose (fp);
+    }
+  return result;
+#else
+  ACE_DLL dll;
+
+  auto_ptr<ACE_XML_Svc_Conf>
+    xml_svc_conf (this->get_xml_svc_conf (dll));
+
+  if (xml_svc_conf.get () == 0)
+    return -1;
+
+  return xml_svc_conf->parse_file (file);
+#endif /* ACE_USES_CLASSIC_SVC_CONF == 1 */
+}
+
+int
+ACE_Service_Gestalt::process_directive (const ACE_TCHAR directive[])
+{
+  ACE_TRACE ("ACE_Service_Gestalt::process_directive");
+
+  if (ACE::debug ())
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_LIB_TEXT ("ACE (%P|%t) SG::process_directive, repo=%@ - %s\n"),
+                this->repo_,
+                directive));
+
+#if (ACE_USES_CLASSIC_SVC_CONF == 1)
+  ACE_UNUSED_ARG (directive);
+
+  ACE_Svc_Conf_Param d (this, directive);
+
+  int result = this->process_directives_i (&d);
+
+  return result;
+#else
+  ACE_DLL dll;
+
+  auto_ptr<ACE_XML_Svc_Conf>
+    xml_svc_conf (this->get_xml_svc_conf (dll));
+
+  if (xml_svc_conf.get () == 0)
+    return -1;
+
+  // Temporarily (for the duration of this call) make sure that *any* static
+  // service registrations will happen with this instance. Such registrations
+  // are possible as a side-effect of dynamically loading a DLL, which has
+  // other static services registered. Thus this instance will own both the
+  // DLL and those static services, which implies that their finalization
+  // will be performed in the correct order, i.e. prior to finalizing the DLL
+  ACE_Service_Config_Guard guard (this);
+
+  return xml_svc_conf->parse_string (directive);
+#endif /* ACE_USES_CLASSIC_SVC_CONF == 1 */
+
+} /* process_directive () */
+
+
+int
+ACE_Service_Gestalt::init_svc_conf_file_queue (void)
+{
+  if (this->svc_conf_file_queue_ == 0)
+    {
+      ACE_SVC_QUEUE *tmp = 0;
+      ACE_NEW_RETURN (tmp,
+          ACE_SVC_QUEUE,
+          -1);
+      delete this->svc_conf_file_queue_;
+      this->svc_conf_file_queue_ = tmp;
+    }
+
+  if (ACE::debug ())
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_LIB_TEXT ("ACE (%P|%t) SG::init_svc_conf_file_queue ")
+                ACE_LIB_TEXT ("- this=%@, repo=%@\n"),
+                this, this->repo_));
+  return 0;
+
+} /* init_svc_conf_file_queue () */
+
+
+int
+ACE_Service_Gestalt::open_i (const ACE_TCHAR /*program_name*/[],
+                             const ACE_TCHAR* /*logger_key*/,
+                             bool /*ignore_static_svcs*/,
+                             bool /*ignore_default_svc_conf_file*/,
+                             bool ignore_debug_flag)
+{
+  ACE_TRACE ("ACE_Service_Gestalt::open_i");
+  int result = 0;
+  ACE_Log_Msg *log_msg = ACE_LOG_MSG;
+
+  // Record the current log setting upon entering this thread.
+  u_long old_process_mask = log_msg->priority_mask
+    (ACE_Log_Msg::PROCESS);
+
+  u_long old_thread_mask = log_msg->priority_mask
+    (ACE_Log_Msg::THREAD);
+
+  if (ACE::debug ())
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT ("ACE (%P|%t) SG::open_i - this=%@, ")
+                ACE_TEXT ("opened=%d, loadstatics=%d\n"),
+                this, this->is_opened_, this->no_static_svcs_));
+
+  // Guard against reentrant processing. For example,
+  // if the singleton gestalt (ubergestalt) was already open,
+  // do not open it again...
+  if (this->is_opened_++ != 0)
+    return 0;
+
+  if (ignore_debug_flag == 0)
+    {
+      // If -d was included as a startup parameter, the user wants debug
+      // information printed during service initialization.
+      if (ACE::debug ())
+        ACE_Log_Msg::enable_debug_messages ();
+      else
+        // The user has requested no debugging info.
+        ACE_Log_Msg::disable_debug_messages ();
+    }
+
+  // See if we need to load the static services.
+  if (this->no_static_svcs_ == 0
+      && this->load_static_svcs () == -1)
+    result = -1;
+  else
+    {
+      if (this->process_commandline_directives () == -1)
+        result = -1;
+      else
+        result = this->process_directives ();
+    }
+
+
+  // Reset debugging back to the way it was when we came into
+  // into <open_i>.
+  {
+    // Make sure to save/restore errno properly.
+    ACE_Errno_Guard error (errno);
+
+    if (ignore_debug_flag == 0)
+      {
+        log_msg->priority_mask (old_process_mask, ACE_Log_Msg::PROCESS);
+        log_msg->priority_mask (old_thread_mask, ACE_Log_Msg::THREAD);
+      }
+  }
+
+  return result;
+} /* open_i () */
+
+
+int
+ACE_Service_Gestalt::is_opened (void)
+{
+  return this->is_opened_;
+}
+
+int
+ACE_Service_Gestalt::process_commandline_directives (void)
+{
+  int result = 0;
+  if (this->svc_queue_ != 0)
+    {
+      ACE_TString *sptr = 0;
+      for (ACE_SVC_QUEUE_ITERATOR iter (*this->svc_queue_);
+           iter.next (sptr) != 0;
+           iter.advance ())
+  {
+    // Process just a single directive.
+    if (this->process_directive ((sptr->fast_rep ())) != 0)
+      {
+        ACE_ERROR ((LM_ERROR,
+        ACE_LIB_TEXT ("ACE (%P|%t) %p\n"),
+        ACE_LIB_TEXT ("process_directive")));
+        result = -1;
+      }
+  }
+
+      delete this->svc_queue_;
+      this->svc_queue_ = 0;
+    }
+
+  return result;
+
+} /* process_commandline_directives () */
+
+
+int
+ACE_Service_Gestalt::parse_args (int argc, ACE_TCHAR *argv[])
+{
+  ACE_TRACE ("ACE_Service_Gestalt::parse_args");
+  return parse_args_i (argc, argv);
+}
+
+int
+ACE_Service_Gestalt::parse_args_i (int argc, ACE_TCHAR *argv[])
+{
+  ACE_TRACE ("ACE_Service_Gestalt::parse_args_i");
+  ACE_Get_Opt getopt (argc,
+                      argv,
+                      ACE_LIB_TEXT ("df:k:nyp:s:S:"),
+                      1); // Start at argv[1].
+
+  if (this->init_svc_conf_file_queue () == -1)
+    return -1;
+
+  for (int c; (c = getopt ()) != -1; )
+    switch (c)
+      {
+      case 'd':
+        ACE::debug (1);
+        break;
+      case 'f':
+        if (this->svc_conf_file_queue_->enqueue_tail (ACE_TString (getopt.opt_arg ())) == -1)
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ACE_LIB_TEXT ("%p\n"),
+                             ACE_LIB_TEXT ("enqueue_tail")),
+                            -1);
+        break;
+      case 'k':
+        /*
+         * @TODO: Is this always a static storage? Shouldn't we copy
+         * & gain ownership of the value?
+         */
+        this->logger_key_ = getopt.opt_arg ();
+        break;
+      case 'n':
+        this->no_static_svcs_ = 1;
+        break;
+      case 'y':
+        this->no_static_svcs_ = 0;
+        break;
+      case 'S':
+        if (this->svc_queue_ == 0)
+          {
+            ACE_NEW_RETURN (this->svc_queue_,
+                            ACE_SVC_QUEUE,
+                            -1);
+          }
+
+        if (this->svc_queue_->enqueue_tail (ACE_TString (getopt.opt_arg ())) == -1)
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ACE_LIB_TEXT ("%p\n"),
+                             ACE_LIB_TEXT ("enqueue_tail")),
+                            -1);
+        break;
+      default:
+        if (ACE::debug ())
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_LIB_TEXT ("ACE (%P|%t) %c is not a ACE_Service_Config option\n"),
+                      c));
+      }
+
+  return 0;
+} /* parse_args_i () */
+
+
+
+// Process service configuration requests as indicated in the queue of
+// svc.conf files.
+int
+ACE_Service_Gestalt::process_directives (void)
+{
+  ACE_TRACE ("ACE_Service_Gestalt::process_directives");
+
+  int result = 0;
+
+  if (this->svc_conf_file_queue_ != 0)
+    {
+      ACE_TString *sptr = 0;
+
+      // Iterate through all the svc.conf files.
+      for (ACE_SVC_QUEUE_ITERATOR iter (*this->svc_conf_file_queue_);
+           iter.next (sptr) != 0;
+           iter.advance ())
+        {
+          int r = this->process_file (sptr->fast_rep ());
+
+          if (r < 0)
+            {
+              result = r;
+              break;
+            }
+
+          result += r;
+        }
+    }
+
+  return result;
+
+} /* process_directives () */
+
+// Tidy up and perform last rites on a terminating ACE_Service_Gestalt.
+int
+ACE_Service_Gestalt::close (void)
+{
+  ACE_TRACE ("ACE_Service_Gestalt::close");
+
+  this->is_opened_--;
+  if (this->is_opened_ > 0)
+    return 0;
+
+  // Delete the service repository.  All the objects inside the
+  // service repository should already have been finalized.
+  //  ACE_Service_Config::close_svcs ();
+
+  // Delete the list fo svc.conf files
+  delete this->svc_conf_file_queue_;
+  this->svc_conf_file_queue_ = 0;
+
+  // Delete the dynamically allocated static_svcs instance.
+  if (ACE::debug ())
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_LIB_TEXT ("ACE (%P|%t) SG::close - this=%@, repo=%@, pss = %@\n"),
+                this, this->repo_, this->processed_static_svcs_));
+
+  delete this->static_svcs_;
+  this->static_svcs_ = 0;
+
+  if (this->processed_static_svcs_ &&
+      !this->processed_static_svcs_->is_empty())
+    {
+      Processed_Static_Svc **pss = 0;
+      for (ACE_PROCESSED_STATIC_SVCS_ITERATOR iter (*this->processed_static_svcs_);
+           iter.next (pss) != 0;
+           iter.advance ())
+        {
+          delete *pss;
+        }
+    }
+  delete this->processed_static_svcs_;
+  this->processed_static_svcs_ = 0;
+  if (ACE::debug ())
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_LIB_TEXT ("ACE (%P|%t) SG::close - complete this=%@, repo=%@\n"),
+                this, this->repo_));
+
+
+  return 0;
+
+} /* close () */
+
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#if !defined (__ACE_INLINE__)
+#include "ace/Service_Gestalt.inl"
+#endif /* __ACE_INLINE__ */
+
+// Allocate a Service Manager.
+ACE_FACTORY_DEFINE (ACE, ACE_Service_Manager)