summaryrefslogtreecommitdiff
path: root/TAO/tao/UIOP_Acceptor.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/UIOP_Acceptor.cpp')
-rw-r--r--TAO/tao/UIOP_Acceptor.cpp234
1 files changed, 60 insertions, 174 deletions
diff --git a/TAO/tao/UIOP_Acceptor.cpp b/TAO/tao/UIOP_Acceptor.cpp
index bd227b8998d..9087cc1b44d 100644
--- a/TAO/tao/UIOP_Acceptor.cpp
+++ b/TAO/tao/UIOP_Acceptor.cpp
@@ -11,8 +11,9 @@
//
// = DESCRIPTION
//
+//
// = AUTHOR
-// Fred Kuhns <fredk@cs.wustl.edu> and
+// Fred Kuhns <fredk@cs.wustl.edu>
// Ossama Othman <othman@cs.wustl.edu>
//
// ============================================================================
@@ -30,31 +31,7 @@
ACE_RCSID(tao, UIOP_Acceptor, "$Id$")
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Acceptor<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>;
-template class ACE_Strategy_Acceptor<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>;
-template class ACE_Accept_Strategy<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>;
-template class ACE_Creation_Strategy<TAO_UIOP_Server_Connection_Handler>;
-template class ACE_Concurrency_Strategy<TAO_UIOP_Server_Connection_Handler>;
-template class ACE_Scheduling_Strategy<TAO_UIOP_Server_Connection_Handler>;
-template class TAO_Creation_Strategy<TAO_UIOP_Server_Connection_Handler>;
-template class TAO_Concurrency_Strategy<TAO_UIOP_Server_Connection_Handler>;
-template class TAO_Accept_Strategy<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Acceptor<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>
-#pragma instantiate ACE_Strategy_Acceptor<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>
-#pragma instantiate ACE_Accept_Strategy<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>
-#pragma instantiate ACE_Creation_Strategy<TAO_UIOP_Server_Connection_Handler>
-#pragma instantiate ACE_Concurrency_Strategy<TAO_UIOP_Server_Connection_Handler>
-#pragma instantiate ACE_Scheduling_Strategy<TAO_UIOP_Server_Connection_Handler>
-#pragma instantiate TAO_Creation_Strategy<TAO_UIOP_Server_Connection_Handler>
-#pragma instantiate TAO_Concurrency_Strategy<TAO_UIOP_Server_Connection_Handler>
-#pragma instantiate TAO_Accept_Strategy<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+// ****************************************************************
TAO_UIOP_Acceptor::TAO_UIOP_Acceptor (void)
: TAO_Acceptor (TAO_IOP_TAG_UNIX_IOP),
@@ -86,9 +63,11 @@ TAO_UIOP_Acceptor::create_mprofile (const TAO_ObjectKey &object_key,
// we only make one
int count = mprofile.profile_count ();
- if ((mprofile.size () - count) < 1
- && mprofile.grow (count + 1) == -1)
- return -1;
+ if ((mprofile.size () - count) < 1)
+ {
+ if (mprofile.grow (count + 1) == -1)
+ return -1;
+ }
TAO_UIOP_Profile *pfile = 0;
ACE_NEW_RETURN (pfile,
@@ -99,11 +78,7 @@ TAO_UIOP_Acceptor::create_mprofile (const TAO_ObjectKey &object_key,
-1);
if (mprofile.give_profile (pfile) == -1)
- {
- pfile->_decr_refcnt ();
- pfile = 0;
- return -1;
- }
+ return -1;
if (this->orb_core_->orb_params ()->std_profile_components () == 0)
return 0;
@@ -115,19 +90,16 @@ TAO_UIOP_Acceptor::create_mprofile (const TAO_ObjectKey &object_key,
code_set_info.ForWcharData.native_code_set = TAO_DEFAULT_WCHAR_CODESET_ID;
pfile->tagged_components ().set_code_sets (code_set_info);
- pfile->tagged_components ().set_tao_priority (this->priority ());
-
return 0;
}
int
-TAO_UIOP_Acceptor::is_collocated (const TAO_Profile *pfile)
+TAO_UIOP_Acceptor::is_collocated (const TAO_Profile* pfile)
{
const TAO_UIOP_Profile *profile =
- ACE_dynamic_cast (const TAO_UIOP_Profile *,
- pfile);
+ ACE_dynamic_cast(const TAO_UIOP_Profile*, pfile);
- // For UNIX Files this is relatively cheap.
+ // for UNIX Files this is relatively cheap
ACE_UNIX_Addr address;
if (this->base_acceptor_.acceptor ().get_local_addr (address) == -1)
return 0;
@@ -159,44 +131,28 @@ int
TAO_UIOP_Acceptor::open (TAO_ORB_Core *orb_core,
int major,
int minor,
- const char *address,
- const char *options)
+ ACE_CString &address)
{
- if (address == 0)
- return -1;
-
if (major >= 0 && minor >= 0)
- this->version_.set_version (ACE_static_cast (CORBA::Octet,
- major),
- ACE_static_cast (CORBA::Octet,
- minor));
- // Parse options
- if (this->parse_options (options) == -1)
- return -1;
- else
- return this->open_i (orb_core, address);
+ this->version_.set_version (ACE_static_cast (CORBA::Octet, major),
+ ACE_static_cast (CORBA::Octet, minor));
+
+ return this->open_i (orb_core, address.c_str ());
}
int
-TAO_UIOP_Acceptor::open_default (TAO_ORB_Core *orb_core,
- const char *options)
+TAO_UIOP_Acceptor::open_default (TAO_ORB_Core *orb_core)
{
- // Parse options
- if (this->parse_options (options) == -1)
- return -1;
-
- ACE_Auto_String_Free tempname (ACE_OS::tempnam (0,
- "TAO"));
+ ACE_Auto_String_Free tempname (ACE_OS::tempnam (0, "TAO"));
if (tempname.get () == 0)
return -1;
- return this->open_i (orb_core,
- tempname.get ());
+ return this->open_i (orb_core, tempname.get ());
}
int
-TAO_UIOP_Acceptor::open_i (TAO_ORB_Core *orb_core,
+TAO_UIOP_Acceptor::open_i (TAO_ORB_Core* orb_core,
const char *rendezvous)
{
this->orb_core_ = orb_core;
@@ -218,7 +174,7 @@ TAO_UIOP_Acceptor::open_i (TAO_ORB_Core *orb_core,
this->rendezvous_point (addr, rendezvous);
if (this->base_acceptor_.open (addr,
- this->orb_core_->reactor (this),
+ this->orb_core_->reactor (),
this->creation_strategy_,
this->accept_strategy_,
this->concurrency_strategy_) == -1)
@@ -235,10 +191,13 @@ TAO_UIOP_Acceptor::open_i (TAO_ORB_Core *orb_core,
// rendezvous point here
if (TAO_debug_level > 5)
- ACE_DEBUG ((LM_DEBUG,
- "\nTAO (%P|%t) UIOP_Acceptor::open_i - "
- "listening on: <%s>\n",
- addr.get_path_name ()));
+ {
+ ACE_DEBUG ((LM_DEBUG,
+ "\nTAO (%P|%t) UIOP_Acceptor::open_i - "
+ "listening on: <%s>\n",
+ addr.get_path_name ()));
+ }
+
return 0;
}
@@ -265,9 +224,9 @@ TAO_UIOP_Acceptor::rendezvous_point (ACE_UNIX_Addr &addr,
// be able to communicate with the server since its point of
// communication, the rendezvous point, was not found. On the other
// hand, if an absolute path was used, the client would know exactly
- // where to find the rendezvous point. It is up to the user to make
- // sure that a given UIOP endpoint is accessible by both the server
- // and the client.
+ // where to find the rendezvous point. It is up to the user to
+ // make sure that a given UIOP endpoint is accessible by both the
+ // server and the client.
addr.set (rendezvous);
@@ -277,11 +236,13 @@ TAO_UIOP_Acceptor::rendezvous_point (ACE_UNIX_Addr &addr,
// most UNIX domain socket rendezvous points can only be less than
// 108 characters long.
if (length < ACE_OS::strlen (rendezvous))
- ACE_DEBUG ((LM_WARNING,
- "TAO (%P|%t) UIOP rendezvous point was truncated to <%s>\n"
- "since it was longer than %d characters long.\n",
- addr.get_path_name (),
- length));
+ {
+ ACE_DEBUG ((LM_WARNING,
+ "TAO (%P|%t) UIOP rendezvous point was truncated to <%s>\n"
+ "since it was longer than %d characters long.\n",
+ addr.get_path_name (),
+ length));
+ }
}
CORBA::ULong
@@ -290,107 +251,32 @@ TAO_UIOP_Acceptor::endpoint_count (void)
return 1;
}
-int
-TAO_UIOP_Acceptor::parse_options (const char *str)
-{
- if (str == 0)
- return 0; // No options to parse. Not a problem.
-
- // Use an option format similar to the one used for CGI scripts in
- // HTTP URLs.
- // e.g.: option1=foo&option2=bar
- ACE_CString options (str);
-
- size_t len = options.length ();
-
- const char option_delimiter = '&';
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
- // Count the number of options.
+template class ACE_Acceptor<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>;
+template class ACE_Strategy_Acceptor<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>;
+template class ACE_Accept_Strategy<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>;
+template class ACE_Creation_Strategy<TAO_UIOP_Server_Connection_Handler>;
+template class ACE_Concurrency_Strategy<TAO_UIOP_Server_Connection_Handler>;
+template class ACE_Scheduling_Strategy<TAO_UIOP_Server_Connection_Handler>;
+template class TAO_Creation_Strategy<TAO_UIOP_Server_Connection_Handler>;
+template class TAO_Concurrency_Strategy<TAO_UIOP_Server_Connection_Handler>;
+template class TAO_Accept_Strategy<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>;
- CORBA::ULong option_count = 1;
- // Number of endpoints in the string (initialized to 1).
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
- // Only check for endpoints after the protocol specification and
- // before the object key.
- for (size_t i = 0; i < len; ++i)
- if (options[i] == option_delimiter)
- option_count++;
+#pragma instantiate ACE_Acceptor<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>
+#pragma instantiate ACE_Strategy_Acceptor<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>
+#pragma instantiate ACE_Accept_Strategy<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>
+#pragma instantiate ACE_Creation_Strategy<TAO_UIOP_Server_Connection_Handler>
+#pragma instantiate ACE_Concurrency_Strategy<TAO_UIOP_Server_Connection_Handler>
+#pragma instantiate ACE_Scheduling_Strategy<TAO_UIOP_Server_Connection_Handler>
+#pragma instantiate TAO_Creation_Strategy<TAO_UIOP_Server_Connection_Handler>
+#pragma instantiate TAO_Concurrency_Strategy<TAO_UIOP_Server_Connection_Handler>
+#pragma instantiate TAO_Accept_Strategy<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>
- // The idea behind the following loop is to split the options into
- // (option, name) pairs.
- // For example,
- // `option1=foo&option2=bar'
- // will be parsed into:
- // `option1=foo'
- // `option2=bar'
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- int begin = 0;
- int end = -1;
- for (CORBA::ULong j = 0; j < option_count; ++j)
- {
- begin += end + 1;
-
- if (j < option_count - 1)
- end = options.find (option_delimiter, begin);
- else
- end = len - begin; // Handle last endpoint differently
-
- if (end == begin)
- ACE_ERROR_RETURN ((LM_ERROR,
- "TAO (%P|%t) Zero length UIOP option.\n"),
- -1);
- else if (end != ACE_CString::npos)
- {
- ACE_CString opt =
- options.substring (begin, end);
-
- int slot = opt.find ("=");
-
- if (slot == ACE_static_cast (int, len - 1)
- || slot == ACE_CString::npos)
- ACE_ERROR_RETURN ((LM_ERROR,
- "TAO (%P|%t) UIOP option <%s> is "
- "missing a value.\n",
- opt.c_str ()),
- -1);
-
- ACE_CString name = opt.substring (0, slot);
- ACE_CString value = opt.substring (slot + 1);
-
- if (name.length () == 0)
- ACE_ERROR_RETURN ((LM_ERROR,
- "TAO (%P|%t) Zero length UIOP "
- "option name.\n"),
- -1);
-
- if (name == "priority")
- {
- CORBA::Short corba_priority =
- ACE_static_cast (CORBA::Short,
- ACE_OS::atoi (value.c_str ()));
-
- if (corba_priority >= 0
- /* && corba_priority < 32768 */)
- // priority_ and corba_priority will always be less
- // than 32768 since CORBA::Short is a signed 16 bit
- // integer.
- this->priority_ = corba_priority;
- else
- ACE_ERROR_RETURN ((LM_ERROR,
- "TAO (%P|%t) Invalid UIOP endpoint "
- "priority: <%s>\n",
- value.c_str ()),
- -1);
- }
- else
- ACE_ERROR_RETURN ((LM_ERROR,
- "TAO (%P|%t) Invalid UIOP option: <%s>\n",
- name.c_str ()),
- -1);
- }
- }
- return 0;
-}
#endif /* TAO_HAS_UIOP */
View Lorry Controller Status