summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstanleyk <stanleyk@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2013-01-18 22:48:34 +0000
committerstanleyk <stanleyk@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2013-01-18 22:48:34 +0000
commit35cbe90ab06e7e2856c146a42c0edf60fa92e485 (patch)
tree106aab050c9b7927404bcf1966645c4efaff9b6b
parent0bb70968921ede86fa77b03db650fd76fbefc66c (diff)
downloadATCD-35cbe90ab06e7e2856c146a42c0edf60fa92e485.tar.gz
Updates based on ACE Development Guidelines in preparation for merge.
Diffstat
-rw-r--r--TAO/OCI_RE_ChangeLog21
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Config_Backing_Store.cpp94
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp26
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp291
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp112
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp69
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp9
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp10
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp31
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp31
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp126
16 files changed, 474 insertions, 360 deletions
diff --git a/TAO/OCI_RE_ChangeLog b/TAO/OCI_RE_ChangeLog
index 2c5ba33426b..11fdbc00901 100644
--- a/TAO/OCI_RE_ChangeLog
+++ b/TAO/OCI_RE_ChangeLog
@@ -1,3 +1,24 @@
+Fri Jan 18 22:43:55 UTC 2013 Kevin Stanley <stanleyk@ociweb.com>
+
+ * orbsvcs/ImplRepo_Service/Config_Backing_Store.cpp:
+ * orbsvcs/ImplRepo_Service/INS_Locator.cpp:
+ * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
+ * orbsvcs/ImplRepo_Service/Locator_Options.cpp:
+ * orbsvcs/ImplRepo_Service/Locator_Repository.cpp:
+ * orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp:
+ * orbsvcs/ImplRepo_Service/Server_Info.cpp:
+ * orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp:
+ * orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp:
+ * orbsvcs/ImplRepo_Service/tao_imr_i.cpp:
+ * orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp:
+ * orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp:
+ * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp:
+ * orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp:
+ * tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp:
+
+ Updated based on ACE Development Guidelines in preparation
+ for merge.
+
Thu Jan 17 19:36:08 UTC 2013 Kevin Stanley <stanleyk@ociweb.com>
* orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp:
diff --git a/TAO/orbsvcs/ImplRepo_Service/Config_Backing_Store.cpp b/TAO/orbsvcs/ImplRepo_Service/Config_Backing_Store.cpp
index af0f052933f..9ab6842d1a6 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Config_Backing_Store.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Config_Backing_Store.cpp
@@ -24,16 +24,16 @@ static const ACE_TCHAR* JACORB_SERVER = ACE_TEXT("JacORBServer");
static const char* WIN32_REG_KEY = "Software\\TAO\\ImplementationRepository";
#endif
-Config_Backing_Store::Config_Backing_Store(const Options& opts,
- CORBA::ORB_ptr orb,
- ACE_Configuration& config)
-: Locator_Repository(opts, orb),
- config_(config),
- status_(-1)
+Config_Backing_Store::Config_Backing_Store (const Options& opts,
+ CORBA::ORB_ptr orb,
+ ACE_Configuration& config)
+: Locator_Repository (opts, orb),
+ config_ (config),
+ status_ (-1)
{
}
-Config_Backing_Store::~Config_Backing_Store()
+Config_Backing_Store::~Config_Backing_Store ()
{
}
@@ -41,7 +41,7 @@ void Config_Backing_Store::loadActivators ()
{
ACE_Configuration_Section_Key root;
int err =
- config_.open_section(config_.root_section(), ACTIVATORS_ROOT_KEY, 0, root);
+ config_.open_section (config_.root_section (), ACTIVATORS_ROOT_KEY, 0, root);
if (err == 0)
{
int index = 0;
@@ -59,9 +59,12 @@ void Config_Backing_Store::loadActivators ()
config_.get_string_value (key, IOR, ior);
config_.get_integer_value (key, TOKEN, token);
- Activator_Info_Ptr info (new Activator_Info (name, token, ior));
- activators().bind (lcase (name), info);
- index++;
+ Activator_Info* ai;
+ ACE_NEW (ai, Activator_Info (name, token, ior));
+
+ Activator_Info_Ptr info (ai);
+ activators ().bind (lcase (name), info);
+ ++index;
}
}
}
@@ -71,7 +74,7 @@ Config_Backing_Store::loadServers ()
{
ACE_Configuration_Section_Key root;
int err =
- config_.open_section(config_.root_section(), SERVERS_ROOT_KEY, 0, root);
+ config_.open_section (config_.root_section (), SERVERS_ROOT_KEY, 0, root);
if (err == 0)
{
int index = 0;
@@ -94,10 +97,10 @@ Config_Backing_Store::loadServers ()
config_.get_string_value (key, STARTUP_COMMAND, cmdline);
config_.get_string_value (key, WORKING_DIR, dir);
config_.get_string_value (key, ENVIRONMENT, envstr);
- config_.get_integer_value(key, ACTIVATION, amodeint);
+ config_.get_integer_value (key, ACTIVATION, amodeint);
config_.get_string_value (key, PARTIAL_IOR, partial_ior);
config_.get_string_value (key, IOR, ior);
- config_.get_integer_value(key, START_LIMIT, start_limit);
+ config_.get_integer_value (key, START_LIMIT, start_limit);
ImplementationRepository::ActivationMode amode =
static_cast <ImplementationRepository::ActivationMode> (amodeint);
@@ -106,10 +109,15 @@ Config_Backing_Store::loadServers ()
ImR_Utils::parseEnvList (envstr);
bool jacorb_server = jacorbstr == "1" ? true : false;
- Server_Info_Ptr info (new Server_Info(server_id, name, jacorb_server, aname,
- cmdline, env_vars, dir, amode, start_limit, partial_ior, ior));
- servers().bind (name, info);
- index++;
+
+ Server_Info *si;
+ ACE_NEW (si,
+ Server_Info (server_id, name, jacorb_server, aname,
+ cmdline, env_vars, dir, amode, start_limit,
+ partial_ior, ior));
+ Server_Info_Ptr info (si);
+ servers ().bind (name, info);
+ ++index;
}
}
}
@@ -130,7 +138,7 @@ Config_Backing_Store::remove (const ACE_CString& name, const ACE_TCHAR* key)
int err = config_.open_section (config_.root_section (), key, 0, root);
if (err != 0)
{
- if (this->opts_.debug() > 9)
+ if (this->opts_.debug () > 9)
{
ACE_DEBUG((LM_INFO, ACE_TEXT ("could not remove %C, already gone!\n"),
name.c_str()));
@@ -152,11 +160,11 @@ static int get_key (ACE_Configuration& cfg, const ACE_CString& name,
sub_section));
return err;
}
- err = cfg.open_section (root, name.c_str(), 1, key);
+ err = cfg.open_section (root, name.c_str (), 1, key);
if (err != 0)
{
ACE_ERROR((LM_ERROR, ACE_TEXT ("Unable to open config section:%C\n"),
- name.c_str()));
+ name.c_str ()));
}
return err;
}
@@ -169,7 +177,7 @@ Config_Backing_Store::persistent_update(const Server_Info_Ptr& info, bool )
if (err != 0)
{
ACE_ERROR((LM_ERROR, ACE_TEXT ("ERROR: could not get key for %C\n"),
- info->name.c_str()));
+ info->name.c_str ()));
return err;
}
@@ -197,34 +205,34 @@ int
Config_Backing_Store::persistent_update(const Activator_Info_Ptr& info, bool )
{
ACE_Configuration_Section_Key key;
- int err = get_key(this->config_, info->name, ACTIVATORS_ROOT_KEY, key);
+ int err = get_key (this->config_, info->name, ACTIVATORS_ROOT_KEY, key);
if (err != 0)
{
ACE_DEBUG((LM_INFO,
ACE_TEXT ("ERROR: could not get key for activator %C\n"),
- info->name.c_str()));
+ info->name.c_str ()));
return err;
}
if (this->opts_.debug() > 9)
{
ACE_DEBUG((LM_INFO, ACE_TEXT ("updating activator %C\n"),
- info->name.c_str()));
+ info->name.c_str ()));
}
- this->config_.set_integer_value(key, TOKEN, info->token);
- this->config_.set_string_value(key, IOR, info->ior.c_str());
+ this->config_.set_integer_value (key, TOKEN, info->token);
+ this->config_.set_string_value (key, IOR, info->ior.c_str());
return 0;
}
int
-Config_Backing_Store::init_repo(PortableServer::POA_ptr )
+Config_Backing_Store::init_repo (PortableServer::POA_ptr )
{
if (status_ != 0)
{
- if (this->opts_.debug() > 9)
+ if (this->opts_.debug () > 9)
{
- ACE_DEBUG((LM_INFO, ACE_TEXT ("not loading\n")));
+ ACE_DEBUG ((LM_INFO, ACE_TEXT ("not loading\n")));
}
return status_;
}
@@ -235,16 +243,16 @@ Config_Backing_Store::init_repo(PortableServer::POA_ptr )
return 0;
}
-Heap_Backing_Store::Heap_Backing_Store(const Options& opts,
- CORBA::ORB_ptr orb)
-: Config_Backing_Store(opts, orb, heap_),
- filename_(opts.persist_file_name())
+Heap_Backing_Store::Heap_Backing_Store (const Options& opts,
+ CORBA::ORB_ptr orb)
+: Config_Backing_Store (opts, orb, heap_),
+ filename_ (opts.persist_file_name())
{
- if (opts.repository_erase())
+ if (opts.repository_erase ())
{
- if (this->opts_.debug() > 9)
+ if (this->opts_.debug () > 9)
{
- ACE_DEBUG((LM_INFO, ACE_TEXT ("Heap start clean\n")));
+ ACE_DEBUG ((LM_INFO, ACE_TEXT ("Heap start clean\n")));
}
ACE_OS::unlink ( this->filename_.c_str() );
}
@@ -252,7 +260,7 @@ Heap_Backing_Store::Heap_Backing_Store(const Options& opts,
status_ = heap_.open (this->filename_.c_str());
}
-Heap_Backing_Store::~Heap_Backing_Store()
+Heap_Backing_Store::~Heap_Backing_Store ()
{
}
@@ -263,7 +271,7 @@ Heap_Backing_Store::repo_mode() const
}
#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY)
-static HKEY setup_registry(const bool start_clean)
+static HKEY setup_registry (const bool start_clean)
{
if (start_clean)
{
@@ -282,9 +290,9 @@ Registry_Backing_Store::Registry_Backing_Store(const Options& opts,
CORBA::ORB_ptr orb)
#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY)
: Config_Backing_Store(opts, orb, win32registry_),
- win32registry_(setup_registry(opts.repository_erase()))
+ win32registry_ (setup_registry (opts.repository_erase()))
#else
-: Config_Backing_Store(opts, orb, invalid_config_)
+: Config_Backing_Store (opts, orb, invalid_config_)
#endif
{
#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY)
@@ -296,12 +304,12 @@ Registry_Backing_Store::Registry_Backing_Store(const Options& opts,
#endif
}
-Registry_Backing_Store::~Registry_Backing_Store()
+Registry_Backing_Store::~Registry_Backing_Store ()
{
}
const ACE_TCHAR*
-Registry_Backing_Store::repo_mode() const
+Registry_Backing_Store::repo_mode () const
{
return ACE_TEXT("Registry");
}
diff --git a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp
index 4dea3d2dbd0..a364a85db5e 100644
--- a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp
@@ -79,18 +79,22 @@ INS_Locator::locate (const char* object_key)
{
if (imr_locator_.debug () > 1)
{
- ACE_DEBUG ((LM_DEBUG, "ImR: Try activating server using <%s>.\n",
- key2.c_str ()));
+ ACE_DEBUG ((LM_DEBUG,
+ ACE_TEXT ("ImR: Try activating server using <%s>.\n"),
+ key2.c_str ()));
}
- CORBA::String_var located = this->imr_locator_.activate_server_by_object (key2.c_str ());
+ CORBA::String_var located =
+ this->imr_locator_.activate_server_by_object (key2.c_str ());
ACE_CString tmp = located.in ();
tmp += object_key;
if (imr_locator_.debug () > 0)
{
- ACE_DEBUG ((LM_DEBUG, "ImR: Forwarding invocation on <%s> to <%s>\n", key2.c_str (), tmp.c_str()));
+ ACE_DEBUG ((LM_DEBUG,
+ ACE_TEXT ("ImR: Forwarding invocation on <%s> ")
+ ACE_TEXT ("to <%s>\n"), key2.c_str (), tmp.c_str()));
}
return CORBA::string_dup (tmp.c_str ());
@@ -119,11 +123,11 @@ INS_Locator::locate (const char* object_key)
}
} // while()
- // No match is found
- throw CORBA::TRANSIENT (
- CORBA::SystemException::_tao_minor_code (
- TAO_IMPLREPO_MINOR_CODE,
- 0),
- CORBA::COMPLETED_NO);
- }
+ // No match is found
+ throw CORBA::TRANSIENT (
+ CORBA::SystemException::_tao_minor_code (
+ TAO_IMPLREPO_MINOR_CODE,
+ 0),
+ CORBA::COMPLETED_NO);
+ }
}
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
index 6fa857bfdd8..3946f8bdc11 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
@@ -20,7 +20,8 @@
static const int DEFAULT_START_LIMIT = 1;
-static const int PING_RETRY_SCHEDULE[] = {0, 10, 100, 500, 1000, 1000, 1000, 1000, 5000, 5000};
+static const int PING_RETRY_SCHEDULE[] = {0, 10, 100, 500, 1000, 1000, 1000,
+ 1000, 5000, 5000};
static const ACE_Time_Value DEFAULT_SERVER_TIMEOUT (0, 10 * 1000); // 10ms
@@ -107,7 +108,8 @@ ImR_Locator_i::init_with_orb (CORBA::ORB_ptr orb, Options& opts)
ACE_ASSERT (! CORBA::is_nil (this->imr_poa_.in ()));
waiter_svt_.debug (debug_ > 1);
- PortableServer::ObjectId_var id = PortableServer::string_to_ObjectId ("ImR_AsyncStartupWaiter");
+ PortableServer::ObjectId_var id =
+ PortableServer::string_to_ObjectId ("ImR_AsyncStartupWaiter");
this->imr_poa_->activate_object_with_id (id.in (), &waiter_svt_);
obj = this->imr_poa_->id_to_reference (id.in ());
if (startup_timeout_ > ACE_Time_Value::zero)
@@ -159,7 +161,7 @@ ImR_Locator_i::init_with_orb (CORBA::ORB_ptr orb, Options& opts)
ACE_ASSERT (invalid_rmode_specified);
ACE_UNUSED_ARG (invalid_rmode_specified);
ACE_ERROR_RETURN ((
- LM_ERROR, ACE_TEXT("Repository failed to initialize\n")), -1);
+ LM_ERROR, ACE_TEXT ("Repository failed to initialize\n")), -1);
}
}
@@ -199,19 +201,19 @@ ImR_Locator_i::run (void)
// debug () came out garbled and the read-only string
// caused an ACCESS VIOLATION -- Chad Elliott 10/4/2006
ACE_DEBUG ((LM_DEBUG,
- ACE_TEXT("Implementation Repository: Running\n")
- ACE_TEXT("\tPing Interval : %dms\n")
- ACE_TEXT("\tStartup Timeout : %ds\n")
- ACE_TEXT("\tPersistence : %s\n")
- ACE_TEXT("\tMulticast : %C\n"),
+ ACE_TEXT ("Implementation Repository: Running\n")
+ ACE_TEXT ("\tPing Interval : %dms\n")
+ ACE_TEXT ("\tStartup Timeout : %ds\n")
+ ACE_TEXT ("\tPersistence : %s\n")
+ ACE_TEXT ("\tMulticast : %C\n"),
ping_interval_.msec (),
startup_timeout_.sec (),
this->repository_->repo_mode (),
(this->repository_->multicast () != 0 ?
"Enabled" : "Disabled")));
ACE_DEBUG ((LM_DEBUG,
- ACE_TEXT("\tDebug : %d\n")
- ACE_TEXT("\tLocked : %C\n\n"),
+ ACE_TEXT ("\tDebug : %d\n")
+ ACE_TEXT ("\tLocked : %C\n\n"),
debug (),
(read_only_ ? "True" : "False")));
}
@@ -229,7 +231,7 @@ ImR_Locator_i::shutdown (CORBA::Boolean activators, CORBA::Boolean servers)
// Note : shutdown is oneway, so we can't throw
ACE_ERROR ((
LM_ERROR,
- ACE_TEXT("ImR: Shutdown of all servers not implemented.\n")));
+ ACE_TEXT ("ImR: Shutdown of all servers not implemented.\n")));
}
if (activators != 0 && this->repository_->activators ().current_size () > 0)
{
@@ -260,7 +262,7 @@ ImR_Locator_i::shutdown (CORBA::Boolean activators, CORBA::Boolean servers)
if (debug_ > 1)
{
ex._tao_print_exception (
- "ImR: shutdown activator");
+ ACE_TEXT ("ImR: shutdown activator"));
}
}
}
@@ -268,7 +270,7 @@ ImR_Locator_i::shutdown (CORBA::Boolean activators, CORBA::Boolean servers)
{
ACE_DEBUG ((
LM_DEBUG,
- ACE_TEXT("ImR: Some activators could not be shut down.\n")));
+ ACE_TEXT ("ImR: Some activators could not be shut down.\n")));
}
}
// Technically, we should wait for all the activators to unregister, but
@@ -288,7 +290,7 @@ ImR_Locator_i::fini (void)
try
{
if (debug_ > 1)
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT("ImR: Shutting down...\n")));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Shutting down...\n")));
this->repository_.release();
@@ -297,11 +299,11 @@ ImR_Locator_i::fini (void)
this->orb_->destroy ();
if (debug_ > 0)
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT("ImR: Shut down successfully.\n")));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Shut down successfully.\n")));
}
catch (const CORBA::Exception& ex)
{
- ex._tao_print_exception ("ImR_Locator_i::fini");
+ ex._tao_print_exception (ACE_TEXT ("ImR_Locator_i::fini"));
throw;
}
return 0;
@@ -328,7 +330,7 @@ ImR_Locator_i::register_activator (const char* aname,
ACE_UNUSED_ARG (err);
if (this->debug_ > 0)
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT("ImR: Activator registered for %C.\n"),
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Activator registered for %C.\n"),
aname));
return token;
@@ -347,7 +349,7 @@ ImR_Locator_i::unregister_activator (const char* aname,
{
ACE_DEBUG ((
LM_DEBUG,
- ACE_TEXT("ImR: Ignoring unregister activator:%C. Wrong token.\n"),
+ ACE_TEXT ("ImR: Ignoring unregister activator:%C. Wrong token.\n"),
aname));
return;
}
@@ -355,7 +357,7 @@ ImR_Locator_i::unregister_activator (const char* aname,
this->unregister_activator_i (aname);
if (this->debug_ > 0)
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT("ImR: Activator %C unregistered.\n"),
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Activator %C unregistered.\n"),
aname));
}
else
@@ -363,8 +365,8 @@ ImR_Locator_i::unregister_activator (const char* aname,
if (this->debug_ > 0)
ACE_DEBUG ((
LM_DEBUG,
- ACE_TEXT("ImR: Ignoring unregister activator: %C. ")
- ACE_TEXT("Unknown activator.\n"),
+ ACE_TEXT ("ImR: Ignoring unregister activator: %C. ")
+ ACE_TEXT ("Unknown activator.\n"),
aname));
}
}
@@ -383,7 +385,7 @@ ImR_Locator_i::notify_child_death (const char* name)
ACE_ASSERT (name != 0);
if (this->debug_ > 1)
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT("ImR: Server has died <%C>.\n"), name));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Server has died <%C>.\n"), name));
UpdateableServerInfo info(this->repository_.get(), name);
if (! info.null ())
@@ -395,7 +397,7 @@ ImR_Locator_i::notify_child_death (const char* name)
{
if (this->debug_ > 1)
ACE_DEBUG ((LM_DEBUG,
- ACE_TEXT("ImR: Failed to find server in repository.\n")));
+ ACE_TEXT ("ImR: Failed to find server in repository.\n")));
}
}
@@ -404,7 +406,7 @@ ImR_Locator_i::activate_server (const char* server)
{
if (debug_ > 1)
{
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT("ImR: Manually activating server <%C>\n"),
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Manually activating server <%C>\n"),
server));
}
@@ -430,7 +432,7 @@ ImR_Locator_i::activate_server_by_name (const char* name, bool manual_start)
{
ACE_ERROR ((
LM_ERROR,
- ACE_TEXT("ImR: Cannot find info for server <%C>\n"),
+ ACE_TEXT ("ImR: Cannot find info for server <%C>\n"),
name));
throw ImplementationRepository::NotFound ();
}
@@ -485,10 +487,10 @@ ImR_Locator_i::activate_server_i (UpdateableServerInfo& info,
{
ACE_DEBUG ((
LM_DEBUG,
- ACE_TEXT("ImR: Successfully activated <%C> at \n\t%C\n"),
+ ACE_TEXT ("ImR: Successfully activated <%C> at \n\t%C\n"),
info->name.c_str (), info->partial_ior.c_str ()));
}
- info.edit()->start_count = 0;
+ info.edit ()->start_count = 0;
waiter_svt_.unblock_all (info->name.c_str ());
@@ -502,7 +504,7 @@ ImR_Locator_i::activate_server_i (UpdateableServerInfo& info,
if (this->debug_ > 0)
{
ACE_DEBUG ((LM_DEBUG,
- ACE_TEXT("ImR: Cannot Activate <%C>.\n"),
+ ACE_TEXT ("ImR: Cannot Activate <%C>.\n"),
info->name.c_str ()));
}
@@ -524,20 +526,20 @@ ImR_Locator_i::activate_perclient_server_i (UpdateableServerInfo& shared_info,
{
// create a copy of shared_info that can be edited without affecting memory
// in the repository
- UpdateableServerInfo info(*shared_info);
+ UpdateableServerInfo info (*shared_info);
do
{
ImplementationRepository::StartupInfo* psi =
start_server (info, manual_start, shared_info.edit()->waiting_clients);
// waiting_clients will be updated by each call to start_server
- shared_info.update_repo();
+ shared_info.update_repo ();
if (psi != 0)
{
ImplementationRepository::StartupInfo_var si = psi;
ACE_ASSERT (info->name == si->name.in ());
- info.edit()->partial_ior = si->partial_ior.in ();
- info.edit()->ior = si->ior.in ();
+ info.edit ()->partial_ior = si->partial_ior.in ();
+ info.edit ()->ior = si->ior.in ();
if (is_alive (info))
{
@@ -545,7 +547,7 @@ ImR_Locator_i::activate_perclient_server_i (UpdateableServerInfo& shared_info,
{
ACE_DEBUG ((
LM_DEBUG,
- ACE_TEXT("ImR: Successfully activated <%C> at \n\t%C\n"),
+ ACE_TEXT ("ImR: Successfully activated <%C> at \n\t%C\n"),
info->name.c_str (), info->partial_ior.c_str ()));
}
return CORBA::string_dup (info->partial_ior.c_str ());
@@ -558,7 +560,7 @@ ImR_Locator_i::activate_perclient_server_i (UpdateableServerInfo& shared_info,
{
ACE_DEBUG ((
LM_DEBUG,
- ACE_TEXT("ImR: Cannot Activate <%C>.\n"),
+ ACE_TEXT ("ImR: Cannot Activate <%C>.\n"),
info->name.c_str ()));
}
throw ImplementationRepository::CannotActivate("Cannot start server.");
@@ -573,7 +575,7 @@ ImR_Locator_i::start_server (UpdateableServerInfo& info, bool manual_start,
if (debug_ > 0)
ACE_DEBUG ((
LM_DEBUG,
- ACE_TEXT("ImR: Cannot start server <%C>. ActivationMode=MANUAL\n"),
+ ACE_TEXT ("ImR: Cannot start server <%C>. ActivationMode=MANUAL\n"),
info->name.c_str ()));
throw ImplementationRepository::CannotActivate(
@@ -582,8 +584,8 @@ ImR_Locator_i::start_server (UpdateableServerInfo& info, bool manual_start,
if (info->cmdline.length () == 0)
{
if (debug_ > 0)
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT("ImR: Cannot start server <%C>.")
- ACE_TEXT(" No command line.\n"), info->name.c_str ()));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Cannot start server <%C>.")
+ ACE_TEXT (" No command line.\n"), info->name.c_str ()));
throw ImplementationRepository::CannotActivate(
"No command line registered for server.");
}
@@ -593,8 +595,8 @@ ImR_Locator_i::start_server (UpdateableServerInfo& info, bool manual_start,
if (ainfo.null () || CORBA::is_nil (ainfo->activator.in ()))
{
if (debug_ > 0)
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT("ImR: Cannot start server <%C>. ")
- ACE_TEXT("Activator <%C> not found.\n"),
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Cannot start server <%C>. ")
+ ACE_TEXT ("Activator <%C> not found.\n"),
info->name.c_str (), info->activator.c_str ()));
throw ImplementationRepository::CannotActivate(
"No activator registered for server.");
@@ -615,7 +617,7 @@ ImR_Locator_i::start_server (UpdateableServerInfo& info, bool manual_start,
{
ACE_DEBUG ((
LM_DEBUG,
- ACE_TEXT("ImR: Starting server <%C>. Attempt %d/%d.\n"),
+ ACE_TEXT ("ImR: Starting server <%C>. Attempt %d/%d.\n"),
info->name.c_str (), info->start_count, info->start_limit));
}
ainfo->activator->start_server (
@@ -630,7 +632,7 @@ ImR_Locator_i::start_server (UpdateableServerInfo& info, bool manual_start,
if (this->debug_ > 0)
{
ACE_DEBUG ((LM_DEBUG,
- ACE_TEXT("ImR: Waiting for <%C> to start...\n"),
+ ACE_TEXT ("ImR: Waiting for <%C> to start...\n"),
info->name.c_str ()));
}
@@ -648,7 +650,7 @@ ImR_Locator_i::start_server (UpdateableServerInfo& info, bool manual_start,
{
ACE_DEBUG ((
LM_DEBUG,
- ACE_TEXT("ImR: <%C> Skipping wait. Already started.\n"),
+ ACE_TEXT ("ImR: <%C> Skipping wait. Already started.\n"),
info->name.c_str ()));
}
--waiting_clients;
@@ -666,7 +668,7 @@ ImR_Locator_i::start_server (UpdateableServerInfo& info, bool manual_start,
{
if (debug_ > 0)
ACE_DEBUG ((LM_DEBUG,
- ACE_TEXT("ImR : Timeout waiting for <%C> to start.\n"),
+ ACE_TEXT ("ImR : Timeout waiting for <%C> to start.\n"),
info->name.c_str ()));
info.edit()->reset ();
}
@@ -678,7 +680,7 @@ ImR_Locator_i::start_server (UpdateableServerInfo& info, bool manual_start,
info.edit()->reset ();
if (debug_ > 0)
ACE_DEBUG ((LM_DEBUG,
- ACE_TEXT("ImR: Activator cannot start <%C>.\n"),
+ ACE_TEXT ("ImR: Activator cannot start <%C>.\n"),
info->name.c_str ()));
}
catch (const CORBA::Exception& ex)
@@ -688,7 +690,7 @@ ImR_Locator_i::start_server (UpdateableServerInfo& info, bool manual_start,
if (debug_ > 0)
ACE_DEBUG ((
LM_DEBUG,
- ACE_TEXT("ImR: Unexpected exception while starting <%C>.\n"),
+ ACE_TEXT ("ImR: Unexpected exception while starting <%C>.\n"),
info->name.c_str ()));
if (debug_ > 1)
ex._tao_print_exception ("");
@@ -732,7 +734,8 @@ ImR_Locator_i::set_timeout_policy (CORBA::Object_ptr obj, const ACE_Time_Value&
CORBA::PolicyList policies (1);
policies.length (1);
- policies[0] = orb_->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, tmp);
+ policies[0] = orb_->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
+ tmp);
ret = obj->_set_policy_overrides (policies, CORBA::ADD_OVERRIDE);
@@ -743,7 +746,7 @@ ImR_Locator_i::set_timeout_policy (CORBA::Object_ptr obj, const ACE_Time_Value&
if (this->debug_ > 0)
{
ACE_DEBUG ((LM_DEBUG,
- ACE_TEXT("ImR: Unable to set timeout policy.\n")));
+ ACE_TEXT ("ImR: Unable to set timeout policy.\n")));
}
ret = CORBA::Object::_duplicate (obj);
}
@@ -751,7 +754,7 @@ ImR_Locator_i::set_timeout_policy (CORBA::Object_ptr obj, const ACE_Time_Value&
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception (
- "ImR_Locator_i::set_timeout_policy ()");
+ ACE_TEXT ("ImR_Locator_i::set_timeout_policy ()"));
}
return ret._retn ();
@@ -768,8 +771,8 @@ ImR_Locator_i::add_or_update_server (
{
ACE_DEBUG ((
LM_DEBUG,
- ACE_TEXT("ImR: Cannot add/update server <%C> due to locked ")
- ACE_TEXT("database.\n"),
+ ACE_TEXT ("ImR: Cannot add/update server <%C> due to locked ")
+ ACE_TEXT ("database.\n"),
server));
throw CORBA::NO_PERMISSION (
CORBA::SystemException::_tao_minor_code (
@@ -779,7 +782,7 @@ ImR_Locator_i::add_or_update_server (
}
if (debug_ > 0)
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT("ImR: Add/Update server <%C>.\n"), server));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Add/Update server <%C>.\n"), server));
int limit = options.start_limit;
if (limit < 0)
@@ -799,7 +802,7 @@ ImR_Locator_i::add_or_update_server (
if (info.null ())
{
if (this->debug_ > 1)
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT("ImR: Adding server <%C>.\n"), server));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Adding server <%C>.\n"), server));
this->repository_->add_server ("",
serverKey,
@@ -814,16 +817,16 @@ ImR_Locator_i::add_or_update_server (
else
{
if (this->debug_ > 1)
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT("ImR: Updating server <%C>.\n"),
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Updating server <%C>.\n"),
server));
- info.edit()->activator = options.activator.in ();
- info.edit()->cmdline = options.command_line.in ();
- info.edit()->env_vars = options.environment;
- info.edit()->dir = options.working_directory.in ();
- info.edit()->activation_mode = options.activation;
- info.edit()->start_limit = limit;
- info.edit()->start_count = 0;
+ info.edit ()->activator = options.activator.in ();
+ info.edit ()->cmdline = options.command_line.in ();
+ info.edit ()->env_vars = options.environment;
+ info.edit ()->dir = options.working_directory.in ();
+ info.edit ()->activation_mode = options.activation;
+ info.edit ()->start_limit = limit;
+ info.edit ()->start_count = 0;
info.update_repo();
}
@@ -831,13 +834,13 @@ ImR_Locator_i::add_or_update_server (
if (this->debug_ > 1)
{
// Note : The info var may be null, so we use options.
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT("ImR: Server: %C\n")
- ACE_TEXT("\tActivator: %C\n")
- ACE_TEXT("\tCommand Line: %C\n")
- ACE_TEXT("\tWorking Directory: %C\n")
- ACE_TEXT("\tActivation: %C\n")
- ACE_TEXT("\tStart Limit: %d\n")
- ACE_TEXT("\n"),
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Server: %C\n")
+ ACE_TEXT ("\tActivator: %C\n")
+ ACE_TEXT ("\tCommand Line: %C\n")
+ ACE_TEXT ("\tWorking Directory: %C\n")
+ ACE_TEXT ("\tActivation: %C\n")
+ ACE_TEXT ("\tStart Limit: %d\n")
+ ACE_TEXT ("\n"),
server,
options.activator.in (),
options.command_line.in (),
@@ -847,14 +850,17 @@ ImR_Locator_i::add_or_update_server (
));
for (CORBA::ULong i = 0; i < options.environment.length (); ++i)
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Environment variable %C=%C\n"),
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Environment variable %C=%C\n"),
options.environment[i].name.in (),
options.environment[i].value.in ()));
}
}
void
-ImR_Locator_i::parse_id(const char* id, ACE_CString& server_id, ACE_CString& name, bool& jacorb_server)
+ImR_Locator_i::parse_id(const char* id,
+ ACE_CString& server_id,
+ ACE_CString& name,
+ bool& jacorb_server)
{
const char *pos = ACE_OS::strchr (id, ':');
if (pos)
@@ -883,7 +889,7 @@ ImR_Locator_i::remove_server (const char* name)
{
ACE_ERROR ((
LM_ERROR,
- ACE_TEXT("ImR: Can't remove server <%C> due to locked database.\n"),
+ ACE_TEXT ("ImR: Can't remove server <%C> due to locked database.\n"),
name));
throw CORBA::NO_PERMISSION (
CORBA::SystemException::_tao_minor_code (
@@ -906,7 +912,9 @@ ImR_Locator_i::remove_server (const char* name)
if (this->repository_->remove_server (serverKey) == 0)
{
if (this->debug_ > 1)
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT("ImR: Removing Server <%C>...\n"), name));
+ ACE_DEBUG ((LM_DEBUG,
+ ACE_TEXT ("ImR: Removing Server <%C>...\n"),
+ name));
PortableServer::POA_var poa = findPOA (serverKey.c_str());
if (! CORBA::is_nil (poa.in ()))
@@ -916,14 +924,14 @@ ImR_Locator_i::remove_server (const char* name)
poa->destroy (etherealize, wait);
}
if (this->debug_ > 0)
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT("ImR: Removed Server <%C>.\n"),
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Removed Server <%C>.\n"),
name));
}
}
else
{
ACE_ERROR ((LM_ERROR,
- ACE_TEXT("ImR: Can't remove unknown server <%C>.\n"), name));
+ ACE_TEXT ("ImR: Can't remove unknown server <%C>.\n"), name));
throw ImplementationRepository::NotFound ();
}
}
@@ -948,7 +956,7 @@ ImR_Locator_i::shutdown_server (const char* server)
ACE_ASSERT (server != 0);
if (this->debug_ > 0)
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT("ImR: Shutting down server <%C>.\n"),
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Shutting down server <%C>.\n"),
server));
ACE_CString name;
@@ -961,7 +969,7 @@ ImR_Locator_i::shutdown_server (const char* server)
{
ACE_ERROR ((
LM_ERROR,
- ACE_TEXT("ImR: shutdown_server () Cannot find info for server <%C>\n"),
+ ACE_TEXT ("ImR: shutdown_server () Cannot find info for server <%C>\n"),
server));
throw ImplementationRepository::NotFound ();
}
@@ -972,28 +980,29 @@ ImR_Locator_i::shutdown_server (const char* server)
{
ACE_ERROR ((
LM_ERROR,
- ACE_TEXT("ImR: shutdown_server () Cannot connect to server <%C>\n"),
+ ACE_TEXT ("ImR: shutdown_server () Cannot connect to server <%C>\n"),
server));
throw ImplementationRepository::NotFound ();
}
try
{
- CORBA::Object_var obj = this->set_timeout_policy (info->server.in (), DEFAULT_SHUTDOWN_TIMEOUT);
+ CORBA::Object_var obj = this->set_timeout_policy (info->server.in (),
+ DEFAULT_SHUTDOWN_TIMEOUT);
ImplementationRepository::ServerObject_var server =
ImplementationRepository::ServerObject::_unchecked_narrow (obj.in ());
server->shutdown ();
}
catch (const CORBA::TIMEOUT&)
{
- info.edit()->reset ();
+ info.edit ()->reset ();
// Note : This is a good thing. It means we didn't waste our time waiting for
// the server to finish shutting down.
if (this->debug_ > 1)
{
ACE_DEBUG ((
LM_DEBUG,
- ACE_TEXT("ImR: Timeout while waiting for <%C> shutdown.\n"),
+ ACE_TEXT ("ImR: Timeout while waiting for <%C> shutdown.\n"),
server));
}
throw;
@@ -1004,14 +1013,14 @@ ImR_Locator_i::shutdown_server (const char* server)
{
ACE_DEBUG ((
LM_DEBUG,
- ACE_TEXT("ImR: Exception ignored while shutting down <%C>\n"),
+ ACE_TEXT ("ImR: Exception ignored while shutting down <%C>\n"),
server));
}
}
// Note : In most cases this has already been done in the server_is_shutting_down ()
// operation, but it doesn't hurt to update it again.
- info.edit()->reset ();
+ info.edit ()->reset ();
}
void
@@ -1029,14 +1038,14 @@ ImR_Locator_i::server_is_running (const char* id,
parse_id(id, server_id, name, jacorb_server);
if (this->debug_ > 0)
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT("ImR: Server %C is running at %C.\n"),
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Server %C is running at %C.\n"),
name.c_str (), partial_ior));
CORBA::String_var ior = orb_->object_to_string (server);
if (this->debug_ > 1)
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT("ImR: Server %C callback at %C.\n"),
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Server %C callback at %C.\n"),
name.c_str (), ior.in ()));
if (this->unregister_if_address_reused_)
@@ -1048,7 +1057,7 @@ ImR_Locator_i::server_is_running (const char* id,
if (this->debug_ > 0)
ACE_DEBUG ((
LM_DEBUG,
- ACE_TEXT("ImR: Auto adding NORMAL server <%C>.\n"),
+ ACE_TEXT ("ImR: Auto adding NORMAL server <%C>.\n"),
name.c_str ()));
ImplementationRepository::EnvironmentList env (0);
@@ -1075,13 +1084,14 @@ ImR_Locator_i::server_is_running (const char* id,
ACE_TEXT ("ImR - WARNING: server \"%C\" changed server id from ")
ACE_TEXT ("\"%C\" to \"%C\" waiting PER_CLIENT clients.\n"),
name.c_str (), info->server_id.c_str (), server_id.c_str ()));
- info.edit()->server_id = server_id;
+ info.edit ()->server_id = server_id;
}
if (info->activation_mode != ImplementationRepository::PER_CLIENT) {
- info.edit()->ior = ior.in ();
- info.edit()->partial_ior = partial_ior;
- info.edit()->server = ImplementationRepository::ServerObject::_nil (); // Will connect at first access
+ info.edit ()->ior = ior.in ();
+ info.edit ()->partial_ior = partial_ior;
+ // Will connect at first access
+ info.edit ()->server = ImplementationRepository::ServerObject::_nil ();
info.update_repo();
@@ -1114,18 +1124,18 @@ ImR_Locator_i::server_is_shutting_down (const char* server)
{
ACE_DEBUG ((
LM_DEBUG,
- ACE_TEXT("ImR_Locator_i::server_is_shutting_down: ")
- ACE_TEXT("Unknown server:%C\n"),
+ ACE_TEXT ("ImR_Locator_i::server_is_shutting_down: ")
+ ACE_TEXT ("Unknown server:%C\n"),
server));
}
return;
}
if (this->debug_ > 0)
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT("ImR: Server <%C> is shutting down.\n"),
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Server <%C> is shutting down.\n"),
server));
- info.edit()->reset ();
+ info.edit ()->reset ();
}
void
@@ -1144,31 +1154,33 @@ ImR_Locator_i::find (const char* server,
imr_info = info->createImRServerInfo ();
if (this->debug_ > 1)
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT("ImR: Found server %C.\n"), server));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Found server %C.\n"), server));
}
else
{
- ACE_NEW_THROW_EX (imr_info, ImplementationRepository::ServerInformation, CORBA::NO_MEMORY ());
+ ACE_NEW_THROW_EX (imr_info, ImplementationRepository::ServerInformation,
+ CORBA::NO_MEMORY ());
imr_info->startup.activation= ImplementationRepository::NORMAL;
if (this->debug_ > 1)
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT("ImR: Cannot find server <%C>\n"),
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Cannot find server <%C>\n"),
server));
}
}
void
ImR_Locator_i::list (CORBA::ULong how_many,
- ImplementationRepository::ServerInformationList_out server_list,
- ImplementationRepository::ServerInformationIterator_out server_iterator)
+ ImplementationRepository::ServerInformationList_out server_list,
+ ImplementationRepository::ServerInformationIterator_out server_iterator)
{
if (this->debug_ > 1)
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT("ImR: List servers.\n")));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: List servers.\n")));
// Initialize the out variables, so if we return early, they will
// not be dangling.
server_iterator = ImplementationRepository::ServerInformationIterator::_nil ();
ACE_NEW_THROW_EX (server_list,
- ImplementationRepository::ServerInformationList (0), CORBA::NO_MEMORY ());
+ ImplementationRepository::ServerInformationList (0),
+ CORBA::NO_MEMORY ());
Locator_Repository::SIMap::ENTRY* entry = 0;
Locator_Repository::SIMap::ITERATOR it (this->repository_->servers ());
@@ -1185,7 +1197,7 @@ ImR_Locator_i::list (CORBA::ULong how_many,
if (this->debug_ > 1)
ACE_DEBUG ((
LM_DEBUG,
- ACE_TEXT("ImR_Locator_i::list: Filling ServerList with %d servers\n"),
+ ACE_TEXT ("ImR_Locator_i::list: Filling ServerList with %d servers\n"),
n));
for (CORBA::ULong i = 0; i < n; i++)
@@ -1206,8 +1218,8 @@ ImR_Locator_i::list (CORBA::ULong how_many,
if (this->debug_ > 1)
ACE_DEBUG ((
LM_DEBUG,
- ACE_TEXT("ImR_Locator_i::list: Creating ServerInformation ")
- ACE_TEXT("Iterator\n")));
+ ACE_TEXT ("ImR_Locator_i::list: Creating ServerInformation ")
+ ACE_TEXT ("Iterator\n")));
ImR_Iterator* imr_iter = 0;
@@ -1278,7 +1290,7 @@ ImR_Locator_i::connect_activator (Activator_Info& info)
if (debug_ > 1)
ACE_DEBUG ((
LM_DEBUG,
- ACE_TEXT("ImR: Connected to activator <%C>\n"),
+ ACE_TEXT ("ImR: Connected to activator <%C>\n"),
info.name.c_str ()));
}
catch (const CORBA::Exception&)
@@ -1319,7 +1331,7 @@ ImR_Locator_i::auto_start_servers (void)
{
ACE_DEBUG ((
LM_DEBUG,
- ACE_TEXT("ImR: AUTO_START Could not activate <%C>\n"),
+ ACE_TEXT ("ImR: AUTO_START Could not activate <%C>\n"),
server_entry->ext_id_.c_str ()));
ex._tao_print_exception ("AUTO_START");
}
@@ -1338,7 +1350,7 @@ ImR_Locator_i::connect_server (UpdateableServerInfo& info)
if (info->ior.length () == 0)
{
- info.edit()->reset ();
+ info.edit ()->reset ();
return; // can't connect
}
@@ -1348,29 +1360,29 @@ ImR_Locator_i::connect_server (UpdateableServerInfo& info)
if (CORBA::is_nil (obj.in ()))
{
- info.edit()->reset ();
+ info.edit ()->reset ();
return;
}
obj = this->set_timeout_policy (obj.in (), DEFAULT_SERVER_TIMEOUT);
- info.edit()->server =
+ info.edit ()->server =
ImplementationRepository::ServerObject::_unchecked_narrow (obj.in ());
if (CORBA::is_nil (info->server.in ()))
{
- info.edit()->reset ();
+ info.edit ()->reset ();
return;
}
if (debug_ > 1)
ACE_DEBUG ((LM_DEBUG,
- ACE_TEXT("ImR: Connected to server <%C>\n"),
+ ACE_TEXT ("ImR: Connected to server <%C>\n"),
info->name.c_str ()));
}
catch (const CORBA::Exception&)
{
- info.edit()->reset ();
+ info.edit ()->reset ();
}
}
@@ -1412,13 +1424,14 @@ ImR_Locator_i::is_alive (UpdateableServerInfo& info)
{
ACE_DEBUG ((
LM_DEBUG,
- ACE_TEXT("ImR: <%C> Ping retry count exceeded. alive=maybe.\n"),
+ ACE_TEXT ("ImR: <%C> Ping retry count exceeded. alive=maybe.\n"),
info->name.c_str ()));
}
- // We return true here, because the server *might* be alive, it's just not starting in a timely
- // manner. We can't return false, because then we'll just try to start another instance, and the
- // same thing will likely happen.
- info.edit()->last_ping = ACE_OS::gettimeofday ();
+ // We return true here, because the server *might* be alive, it's just
+ // not starting in a timely manner. We can't return false, because then
+ // we'll just try to start another instance, and the same thing will
+ // likely happen.
+ info.edit ()->last_ping = ACE_OS::gettimeofday ();
return true;
}
@@ -1432,10 +1445,10 @@ ImR_Locator_i::is_alive_i (UpdateableServerInfo& info)
if (debug_ > 1)
{
ACE_DEBUG ((LM_DEBUG,
- ACE_TEXT("ImR: <%C> not running. alive=false.\n"),
+ ACE_TEXT ("ImR: <%C> not running. alive=false.\n"),
info->name.c_str ()));
}
- info.edit()->last_ping = ACE_Time_Value::zero;
+ info.edit ()->last_ping = ACE_Time_Value::zero;
return 0;
}
@@ -1445,7 +1458,7 @@ ImR_Locator_i::is_alive_i (UpdateableServerInfo& info)
{
ACE_DEBUG ((
LM_DEBUG,
- ACE_TEXT("ImR: <%C> Ping verification disabled. alive=true.\n"),
+ ACE_TEXT ("ImR: <%C> Ping verification disabled. alive=true.\n"),
info->name.c_str ()));
}
return 1;
@@ -1457,7 +1470,7 @@ ImR_Locator_i::is_alive_i (UpdateableServerInfo& info)
{
ACE_DEBUG ((
LM_DEBUG,
- ACE_TEXT("ImR: <%C> within ping interval. alive=true.\n"),
+ ACE_TEXT ("ImR: <%C> within ping interval. alive=true.\n"),
info->name.c_str ()));
}
return 1;
@@ -1472,7 +1485,7 @@ ImR_Locator_i::is_alive_i (UpdateableServerInfo& info)
{
ACE_DEBUG ((
LM_DEBUG,
- ACE_TEXT("ImR: Ping verification skipped. <%C> not startable.\n"),
+ ACE_TEXT ("ImR: Ping verification skipped. <%C> not startable.\n"),
info->name.c_str ()));
}
return 1;
@@ -1486,7 +1499,7 @@ ImR_Locator_i::is_alive_i (UpdateableServerInfo& info)
{
ACE_DEBUG ((
LM_DEBUG,
- ACE_TEXT("ImR: <%C> Could not connect. alive=false.\n"),
+ ACE_TEXT ("ImR: <%C> Could not connect. alive=false.\n"),
info->name.c_str ()));
}
return 0;
@@ -1504,10 +1517,10 @@ ImR_Locator_i::is_alive_i (UpdateableServerInfo& info)
{
ACE_DEBUG ((
LM_DEBUG,
- ACE_TEXT("ImR: <%C> Ping successful. alive=true\n"),
+ ACE_TEXT ("ImR: <%C> Ping successful. alive=true\n"),
info->name.c_str ()));
}
- info.edit()->last_ping = ACE_OS::gettimeofday ();
+ info.edit ()->last_ping = ACE_OS::gettimeofday ();
}
catch (const CORBA::TRANSIENT& ex)
{
@@ -1520,11 +1533,11 @@ ImR_Locator_i::is_alive_i (UpdateableServerInfo& info)
{
ACE_DEBUG ((
LM_DEBUG,
- ACE_TEXT("ImR: <%C> Local TRANSIENT. alive=false.\n"),
+ ACE_TEXT ("ImR: <%C> Local TRANSIENT. alive=false.\n"),
info->name.c_str ()));
}
}
- info.edit()->last_ping = ACE_Time_Value::zero;
+ info.edit ()->last_ping = ACE_Time_Value::zero;
return 0;
case TAO_POA_DISCARDING:
case TAO_POA_HOLDING:
@@ -1533,7 +1546,7 @@ ImR_Locator_i::is_alive_i (UpdateableServerInfo& info)
{
ACE_DEBUG ((
LM_DEBUG,
- ACE_TEXT("ImR: <%C> Remote TRANSIENT. alive=maybe.\n"),
+ ACE_TEXT ("ImR: <%C> Remote TRANSIENT. alive=maybe.\n"),
info->name.c_str ()));
}
}
@@ -1546,10 +1559,10 @@ ImR_Locator_i::is_alive_i (UpdateableServerInfo& info)
{
ACE_DEBUG ((
LM_DEBUG,
- ACE_TEXT("ImR: <%C> TRANSIENT exception. alive=false.\n"),
+ ACE_TEXT ("ImR: <%C> TRANSIENT exception. alive=false.\n"),
info->name.c_str ()));
}
- info.edit()->last_ping = ACE_Time_Value::zero;
+ info.edit ()->last_ping = ACE_Time_Value::zero;
}
return 0;
}
@@ -1562,21 +1575,23 @@ ImR_Locator_i::is_alive_i (UpdateableServerInfo& info)
{
ACE_DEBUG ((
LM_DEBUG,
- ACE_TEXT("ImR: <%C> Ping timed out during connection. ")
- ACE_TEXT("alive=false.\n"),
+ ACE_TEXT ("ImR: <%C> Ping timed out during connection. ")
+ ACE_TEXT ("alive=false.\n"),
info->name.c_str ()));
}
- info.edit()->last_ping = ACE_Time_Value::zero;
- return 0; // still potentially ambiguous, the server could be so busy it couldn't
- // even accept a connection. However the more likely assumption is the server is on
- // windows, and is dead, but the host ignored the request rather than rejecting it.
+ info.edit ()->last_ping = ACE_Time_Value::zero;
+ // still potentially ambiguous, the server could be so busy
+ // it couldn't even accept a connection. However the more
+ // likely assumption is the server is on windows, and is dead,
+ // but the host ignored the request rather than rejecting it.
+ return 0;
}
if (debug_ > 1)
{
ACE_DEBUG ((
LM_DEBUG,
- ACE_TEXT("ImR: <%C> Ping timed out, maybe completed. ")
- ACE_TEXT("alive=true.\n"),
+ ACE_TEXT ("ImR: <%C> Ping timed out, maybe completed. ")
+ ACE_TEXT ("alive=true.\n"),
info->name.c_str ()));
}
return 1; // This is "alive" as far as we're concerned. Presumably the client
@@ -1590,11 +1605,11 @@ ImR_Locator_i::is_alive_i (UpdateableServerInfo& info)
{
ACE_DEBUG ((
LM_DEBUG,
- ACE_TEXT("ImR: <%C> Unexpected Ping exception. alive=false\n"),
+ ACE_TEXT ("ImR: <%C> Unexpected Ping exception. alive=false\n"),
info->name.c_str ()));
ex._tao_print_exception ("\n");
}
- info.edit()->last_ping = ACE_Time_Value::zero;
+ info.edit ()->last_ping = ACE_Time_Value::zero;
return 0;
}
return 1;
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp
index e27e1c22532..265e6bd69ed 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp
@@ -29,12 +29,12 @@ Options::Options ()
, debug_ (1)
, multicast_ (false)
, service_ (false)
-, ping_interval_(DEFAULT_PING_INTERVAL)
-, startup_timeout_(DEFAULT_START_TIMEOUT)
+, ping_interval_ (DEFAULT_PING_INTERVAL)
+, startup_timeout_ (DEFAULT_START_TIMEOUT)
, readonly_ (false)
-, service_command_(SC_NONE)
+, service_command_ (SC_NONE)
, unregister_if_address_reused_ (false)
-, imr_type_(STANDALONE_IMR)
+, imr_type_ (STANDALONE_IMR)
{
}
@@ -58,21 +58,21 @@ Options::parse_args (int &argc, ACE_TCHAR *argv[])
}
if (ACE_OS::strcasecmp (shifter.get_current (),
- ACE_TEXT ("install")) == 0)
+ ACE_TEXT ("install")) == 0)
{
this->service_command_ = SC_INSTALL;
}
else if (ACE_OS::strcasecmp (shifter.get_current (),
- ACE_TEXT ("remove")) == 0)
+ ACE_TEXT ("remove")) == 0)
{
this->service_command_ = SC_REMOVE;
}
else
{
- ACE_ERROR((
+ ACE_ERROR ((
LM_ERROR,
- ACE_TEXT("Error: Unknown service command : %s\n"),
- shifter.get_current()));
+ ACE_TEXT ("Error: Unknown service command : %s\n"),
+ shifter.get_current ()));
this->print_usage ();
return -1;
}
@@ -186,7 +186,7 @@ Options::parse_args (int &argc, ACE_TCHAR *argv[])
if (!shifter.is_anything_left () || shifter.get_current ()[0] == '-')
{
ACE_ERROR ((LM_ERROR,
- "Error: --directory option needs a filename\n"));
+ ACE_TEXT ("Error: --directory option needs a filename\n")));
this->print_usage ();
return -1;
}
@@ -212,7 +212,8 @@ Options::parse_args (int &argc, ACE_TCHAR *argv[])
if (!shifter.is_anything_left () || shifter.get_current ()[0] == '-')
{
- ACE_ERROR ((LM_ERROR, "Error: -t option needs a value\n"));
+ ACE_ERROR ((LM_ERROR,
+ ACE_TEXT ("Error: -t option needs a value\n")));
this->print_usage ();
return -1;
}
@@ -226,7 +227,8 @@ Options::parse_args (int &argc, ACE_TCHAR *argv[])
if (!shifter.is_anything_left () || shifter.get_current ()[0] == '-')
{
- ACE_ERROR ((LM_ERROR, "Error: -v option needs a value\n"));
+ ACE_ERROR ((LM_ERROR,
+ ACE_TEXT ("Error: -v option needs a value\n")));
this->print_usage ();
return -1;
}
@@ -275,28 +277,28 @@ void
Options::print_usage (void) const
{
ACE_ERROR ((LM_ERROR,
- "Usage:\n"
- "\n"
- "ImplRepo_Service [-c cmd] [-d 0|1|2] [-e] [-m] [-o file]\n"
- " [-r|-p file|-x file|--directory dir [--primary|--backup] ]\n"
- " [-s] [-t secs] [-v secs]\n"
- " -c command Runs nt service commands ('install' or 'remove')\n"
- " -d level Sets the debug level (default 1)\n"
- " -e Erase the persisted repository at startup\n"
- " -l Lock the database\n"
- " -m Turn on multicast\n"
- " -o file Outputs the ImR's IOR to a file\n"
- " -p file Use file for storing/loading settings\n"
- " -x file Use XML file for storing/loading settings\n"
- " --directory dir Use individual XML files for storing/loading\n"
- " settings in the provided directory\n"
- " --primary Replicate the ImplRepo as the primary ImR\n"
- " --backup Replicate the ImplRepo as the backup ImR\n"
- " -r Use the registry for storing/loading settings\n"
- " -s Run as a service\n"
- " -t secs Server startup timeout.(Default=60s)\n"
- " -v msecs Server verification interval.(Default=10s)\n"
- ));
+ ACE_TEXT ("Usage:\n")
+ ACE_TEXT ("\n")
+ ACE_TEXT ("ImplRepo_Service [-c cmd] [-d 0|1|2] [-e] [-m] [-o file]\n")
+ ACE_TEXT (" [-r|-p file|-x file|--directory dir [--primary|--backup] ]\n")
+ ACE_TEXT (" [-s] [-t secs] [-v secs]\n")
+ ACE_TEXT (" -c command Runs nt service commands ('install' or 'remove')\n")
+ ACE_TEXT (" -d level Sets the debug level (default 1)\n")
+ ACE_TEXT (" -e Erase the persisted repository at startup\n")
+ ACE_TEXT (" -l Lock the database\n")
+ ACE_TEXT (" -m Turn on multicast\n")
+ ACE_TEXT (" -o file Outputs the ImR's IOR to a file\n")
+ ACE_TEXT (" -p file Use file for storing/loading settings\n")
+ ACE_TEXT (" -x file Use XML file for storing/loading settings\n")
+ ACE_TEXT (" --directory dir Use individual XML files for storing/loading\n")
+ ACE_TEXT (" settings in the provided directory\n")
+ ACE_TEXT (" --primary Replicate the ImplRepo as the primary ImR\n")
+ ACE_TEXT (" --backup Replicate the ImplRepo as the backup ImR\n")
+ ACE_TEXT (" -r Use the registry for storing/loading settings\n")
+ ACE_TEXT (" -s Run as a service\n")
+ ACE_TEXT (" -t secs Server startup timeout.(Default=60s)\n")
+ ACE_TEXT (" -v msecs Server verification interval.(Default=10s)\n")
+ ));
}
int
@@ -308,7 +310,7 @@ Options::save_registry_options ()
LONG err = ACE_TEXT_RegCreateKeyEx (SERVICE_REG_ROOT,
SERVICE_REG_PATH,
0,
- const_cast<ACE_TCHAR*> (ACE_TEXT("")), // class
+ const_cast<ACE_TCHAR*> (ACE_TEXT ("")), // class
REG_OPTION_NON_VOLATILE,
KEY_ALL_ACCESS,
0,
@@ -319,48 +321,48 @@ Options::save_registry_options ()
{
return -1;
}
- err = ACE_TEXT_RegSetValueEx (key, ACE_TEXT("ORBInitOptions"), 0, REG_SZ,
+ err = ACE_TEXT_RegSetValueEx (key, ACE_TEXT ("ORBInitOptions"), 0, REG_SZ,
(LPBYTE) this->cmdline_.c_str (), this->cmdline_.length () + 1);
ACE_ASSERT (err == ERROR_SUCCESS);
- err = ACE_TEXT_RegSetValueEx (key, ACE_TEXT("IORFile"), 0, REG_SZ,
+ err = ACE_TEXT_RegSetValueEx (key, ACE_TEXT ("IORFile"), 0, REG_SZ,
(LPBYTE) ior_output_file_.c_str (), ior_output_file_.length () + 1);
ACE_ASSERT (err == ERROR_SUCCESS);
- err = ACE_TEXT_RegSetValueEx (key, ACE_TEXT("DebugLevel"), 0, REG_DWORD,
+ err = ACE_TEXT_RegSetValueEx (key, ACE_TEXT ("DebugLevel"), 0, REG_DWORD,
(LPBYTE) &debug_ , sizeof (debug_));
ACE_ASSERT(err == ERROR_SUCCESS);
- err = ACE_TEXT_RegSetValueEx (key, ACE_TEXT("PersistFile"), 0, REG_SZ,
+ err = ACE_TEXT_RegSetValueEx (key, ACE_TEXT ("PersistFile"), 0, REG_SZ,
(LPBYTE) this->persist_file_name_.c_str (), this->persist_file_name_.length () + 1);
ACE_ASSERT (err == ERROR_SUCCESS);
DWORD tmp = this->ping_interval_.msec ();
- err = ACE_TEXT_RegSetValueEx (key, ACE_TEXT("PingInterval"), 0, REG_DWORD,
+ err = ACE_TEXT_RegSetValueEx (key, ACE_TEXT ("PingInterval"), 0, REG_DWORD,
(LPBYTE) &tmp, sizeof (DWORD));
ACE_ASSERT (err == ERROR_SUCCESS);
tmp = this->readonly_ ? 1 : 0;
- err = ACE_TEXT_RegSetValueEx (key, ACE_TEXT("Lock"), 0, REG_DWORD,
+ err = ACE_TEXT_RegSetValueEx (key, ACE_TEXT ("Lock"), 0, REG_DWORD,
(LPBYTE) &tmp, sizeof (DWORD));
ACE_ASSERT (err == ERROR_SUCCESS);
tmp = this->repo_mode_;
- err = ACE_TEXT_RegSetValueEx (key, ACE_TEXT("PersistType"), 0, REG_DWORD,
+ err = ACE_TEXT_RegSetValueEx (key, ACE_TEXT ("PersistType"), 0, REG_DWORD,
(LPBYTE) &tmp, sizeof (DWORD));
ACE_ASSERT (err == ERROR_SUCCESS);
tmp = static_cast<DWORD> (this->startup_timeout_.sec());
- err = ACE_TEXT_RegSetValueEx (key, ACE_TEXT("Timeout"), 0, REG_DWORD,
+ err = ACE_TEXT_RegSetValueEx (key, ACE_TEXT ("Timeout"), 0, REG_DWORD,
(LPBYTE) &tmp, sizeof (DWORD));
ACE_ASSERT (err == ERROR_SUCCESS);
tmp = this->multicast_ ? 1 : 0;
- err = ACE_TEXT_RegSetValueEx (key, ACE_TEXT("Multicast"), 0, REG_DWORD,
+ err = ACE_TEXT_RegSetValueEx (key, ACE_TEXT ("Multicast"), 0, REG_DWORD,
(LPBYTE) &tmp, sizeof (DWORD));
ACE_ASSERT (err == ERROR_SUCCESS);
- err = ACE_TEXT_RegSetValueEx (key, ACE_TEXT("ImrType"), 0, REG_DWORD,
+ err = ACE_TEXT_RegSetValueEx (key, ACE_TEXT ("ImrType"), 0, REG_DWORD,
(LPBYTE) &this->imr_type_ , sizeof (this->imr_type_));
ACE_ASSERT (err == ERROR_SUCCESS);
@@ -390,7 +392,7 @@ Options::load_registry_options ()
ACE_TCHAR tmpstr[4096];
DWORD sz = sizeof (tmpstr);
DWORD type = 0;
- err = ACE_TEXT_RegQueryValueEx (key, ACE_TEXT("ORBInitOptions"), 0, &type,
+ err = ACE_TEXT_RegQueryValueEx (key, ACE_TEXT ("ORBInitOptions"), 0, &type,
(LPBYTE) tmpstr, &sz);
if (err == ERROR_SUCCESS)
{
@@ -400,7 +402,7 @@ Options::load_registry_options ()
}
sz = sizeof(tmpstr);
- err = ACE_TEXT_RegQueryValueEx (key, ACE_TEXT("IORFile"), 0, &type,
+ err = ACE_TEXT_RegQueryValueEx (key, ACE_TEXT ("IORFile"), 0, &type,
(LPBYTE) tmpstr, &sz);
if (err == ERROR_SUCCESS)
{
@@ -410,7 +412,7 @@ Options::load_registry_options ()
}
sz = sizeof(debug_);
- err = ACE_TEXT_RegQueryValueEx (key, ACE_TEXT("DebugLevel"), 0, &type,
+ err = ACE_TEXT_RegQueryValueEx (key, ACE_TEXT ("DebugLevel"), 0, &type,
(LPBYTE) &this->debug_ , &sz);
if (err == ERROR_SUCCESS)
{
@@ -419,7 +421,7 @@ Options::load_registry_options ()
DWORD tmp = 0;
sz = sizeof(tmp);
- err = ACE_TEXT_RegQueryValueEx (key, ACE_TEXT("PingInterval"), 0, &type,
+ err = ACE_TEXT_RegQueryValueEx (key, ACE_TEXT ("PingInterval"), 0, &type,
(LPBYTE) &tmp, &sz);
if (err == ERROR_SUCCESS)
{
@@ -429,7 +431,7 @@ Options::load_registry_options ()
tmp = 0;
sz = sizeof(tmp);
- err = ACE_TEXT_RegQueryValueEx (key, ACE_TEXT("Lock"), 0, &type,
+ err = ACE_TEXT_RegQueryValueEx (key, ACE_TEXT ("Lock"), 0, &type,
(LPBYTE) &tmp, &sz);
if (err == ERROR_SUCCESS)
{
@@ -438,7 +440,7 @@ Options::load_registry_options ()
}
sz = sizeof(this->repo_mode_);
- err = ACE_TEXT_RegQueryValueEx (key, ACE_TEXT("PersistType"), 0, &type,
+ err = ACE_TEXT_RegQueryValueEx (key, ACE_TEXT ("PersistType"), 0, &type,
(LPBYTE) &this->repo_mode_, &sz);
if (err == ERROR_SUCCESS)
{
@@ -447,7 +449,7 @@ Options::load_registry_options ()
tmp = 0;
sz = sizeof(tmp);
- err = ACE_TEXT_RegQueryValueEx (key, ACE_TEXT("Timeout"), 0, &type,
+ err = ACE_TEXT_RegQueryValueEx (key, ACE_TEXT ("Timeout"), 0, &type,
(LPBYTE) &tmp, &sz);
if (err == ERROR_SUCCESS)
{
@@ -457,7 +459,7 @@ Options::load_registry_options ()
tmp = 0;
sz = sizeof(tmp);
- err = ACE_TEXT_RegQueryValueEx (key, ACE_TEXT("Multicast"), 0, &type,
+ err = ACE_TEXT_RegQueryValueEx (key, ACE_TEXT ("Multicast"), 0, &type,
(LPBYTE) &tmp, &sz);
if (err == ERROR_SUCCESS)
{
@@ -466,7 +468,7 @@ Options::load_registry_options ()
}
sz = sizeof(tmpstr);
- err = ACE_TEXT_RegQueryValueEx (key, ACE_TEXT("PersistFile"), 0, &type,
+ err = ACE_TEXT_RegQueryValueEx (key, ACE_TEXT ("PersistFile"), 0, &type,
(LPBYTE) tmpstr, &sz);
if (err == ERROR_SUCCESS)
{
@@ -476,7 +478,7 @@ Options::load_registry_options ()
}
sz = sizeof(imr_type_);
- err = ACE_TEXT_RegQueryValueEx (key, ACE_TEXT("ImrType"), 0, &type,
+ err = ACE_TEXT_RegQueryValueEx (key, ACE_TEXT ("ImrType"), 0, &type,
(LPBYTE) &this->imr_type_ , &sz);
if (err == ERROR_SUCCESS)
{
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
index 2ac0d3e8574..9dcc0d4383b 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
@@ -19,15 +19,15 @@ Locator_Repository::Locator_Repository (const Options& opts,
{
}
-Locator_Repository::~Locator_Repository()
+Locator_Repository::~Locator_Repository ()
{
teardown_multicast();
}
int
-Locator_Repository::init(PortableServer::POA_ptr root_poa,
- PortableServer::POA_ptr imr_poa,
- const char* this_ior)
+Locator_Repository::init (PortableServer::POA_ptr root_poa,
+ PortableServer::POA_ptr imr_poa,
+ const char* this_ior)
{
this->imr_ior_ = this_ior;
int err = init_repo(imr_poa);
@@ -48,18 +48,18 @@ Locator_Repository::init(PortableServer::POA_ptr root_poa,
}
int
-Locator_Repository::report_ior(PortableServer::POA_ptr )
+Locator_Repository::report_ior (PortableServer::POA_ptr )
{
if (this->registered_)
{
ACE_ERROR_RETURN ((LM_ERROR,
- "ERROR: Repository already reported IOR\n"), -1);
+ ACE_TEXT ("ERROR: Repository already reported IOR\n")), -1);
}
- if (this->opts_.debug() > 0)
+ if (this->opts_.debug () > 0)
{
- ACE_DEBUG((LM_INFO, ACE_TEXT("report_ior <%C>\n"),
- this->imr_ior_.in()));
+ ACE_DEBUG ((LM_INFO, ACE_TEXT ("report_ior <%C>\n"),
+ this->imr_ior_.in ()));
}
// Register the ImR for use with INS
@@ -67,8 +67,8 @@ Locator_Repository::report_ior(PortableServer::POA_ptr )
IORTable::Table_var ior_table = IORTable::Table::_narrow (obj.in ());
ACE_ASSERT (! CORBA::is_nil (ior_table.in ()));
- ior_table->bind("ImplRepoService", this->imr_ior_.in());
- ior_table->bind("ImR", this->imr_ior_.in());
+ ior_table->bind ("ImplRepoService", this->imr_ior_.in());
+ ior_table->bind ("ImR", this->imr_ior_.in());
// Set up multicast support (if enabled)
if (this->opts_.multicast ())
@@ -198,7 +198,7 @@ Locator_Repository::lcase (const ACE_CString& s)
ACE_CString ret(s);
for (size_t i = 0; i < ret.length (); ++i)
{
- ret[i] = static_cast<char>(ACE_OS::ace_tolower (s[i]));
+ ret[i] = static_cast<char> (ACE_OS::ace_tolower (s[i]));
}
return ret;
}
@@ -211,9 +211,12 @@ Locator_Repository::unregister_if_address_reused (
{
if (this->opts_.debug() > 0)
{
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t)ImR: checking reuse address ")
+ ACE_DEBUG ((LM_DEBUG,
+ ACE_TEXT ("(%P|%t)ImR: checking reuse address ")
ACE_TEXT ("for server \"%C %C\" ior \"%C\"\n"),
- server_id.c_str(), name.c_str (), partial_ior));
+ server_id.c_str(),
+ name.c_str (),
+ partial_ior));
}
ACE_Vector<ACE_CString> srvs;
@@ -427,12 +430,12 @@ Locator_Repository::sync_load ()
}
bool
-Locator_Repository::registered() const
+Locator_Repository::registered () const
{
return this->registered_;
}
-UpdateableServerInfo::UpdateableServerInfo(
+UpdateableServerInfo::UpdateableServerInfo (
Locator_Repository* repo, const ACE_CString& name)
: repo_(repo),
si_(repo->get_server (name)),
@@ -440,7 +443,7 @@ UpdateableServerInfo::UpdateableServerInfo(
{
}
-UpdateableServerInfo::UpdateableServerInfo(Locator_Repository* repo,
+UpdateableServerInfo::UpdateableServerInfo (Locator_Repository* repo,
const Server_Info_Ptr& si)
: repo_(repo),
si_(si),
@@ -448,20 +451,20 @@ UpdateableServerInfo::UpdateableServerInfo(Locator_Repository* repo,
{
}
-UpdateableServerInfo::UpdateableServerInfo(const Server_Info& si)
+UpdateableServerInfo::UpdateableServerInfo (const Server_Info& si)
: repo_(0),
si_(new Server_Info(si)),
needs_update_(false)
{
}
-UpdateableServerInfo::~UpdateableServerInfo()
+UpdateableServerInfo::~UpdateableServerInfo ()
{
update_repo();
}
void
-UpdateableServerInfo::update_repo()
+UpdateableServerInfo::update_repo ()
{
if (!needs_update_)
return;
@@ -473,27 +476,27 @@ UpdateableServerInfo::update_repo()
}
const Server_Info*
-UpdateableServerInfo::operator->() const
+UpdateableServerInfo::operator-> () const
{
return si_.get();
}
const Server_Info&
-UpdateableServerInfo::operator*() const
+UpdateableServerInfo::operator* () const
{
return *(si_.get());
}
const Server_Info_Ptr&
-UpdateableServerInfo::edit()
+UpdateableServerInfo::edit ()
{
needs_update_ = repo_ != 0;
return si_;
}
void
-UpdateableServerInfo::needs_update()
+UpdateableServerInfo::needs_update ()
{
needs_update_ = true;
}
@@ -504,24 +507,24 @@ UpdateableServerInfo::null() const
return si_.null();
}
-No_Backing_Store::No_Backing_Store(const Options& opts,
- CORBA::ORB_ptr orb)
-: Locator_Repository(opts, orb)
+No_Backing_Store::No_Backing_Store (const Options& opts,
+ CORBA::ORB_ptr orb)
+ : Locator_Repository(opts, orb)
{
}
-No_Backing_Store::~No_Backing_Store()
+No_Backing_Store::~No_Backing_Store ()
{
}
const ACE_TCHAR*
-No_Backing_Store::repo_mode() const
+No_Backing_Store::repo_mode () const
{
- return ACE_TEXT("Disabled");
+ return ACE_TEXT ("Disabled");
}
int
-No_Backing_Store::init_repo(PortableServer::POA_ptr )
+No_Backing_Store::init_repo (PortableServer::POA_ptr )
{
// nothing more to do for no backing store init
return 0;
@@ -535,14 +538,14 @@ No_Backing_Store::persistent_update (const Server_Info_Ptr& , bool )
}
int
-No_Backing_Store::persistent_update(const Activator_Info_Ptr& , bool )
+No_Backing_Store::persistent_update (const Activator_Info_Ptr& , bool )
{
// nothing more to do for no backing store update
return 0;
}
int
-No_Backing_Store::persistent_remove(const ACE_CString& , bool )
+No_Backing_Store::persistent_remove (const ACE_CString& , bool )
{
// nothing more to do for no backing store remove
return 0;
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp
index e71ffe13d54..765edf5deef 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp
@@ -22,7 +22,8 @@ Locator_XMLHandler::Locator_XMLHandler (XML_Backing_Store& repo,
{
}
-static void convertEnvList (const Locator_XMLHandler::EnvList& in, ImplementationRepository::EnvironmentList& out)
+static void convertEnvList (const Locator_XMLHandler::EnvList& in,
+ ImplementationRepository::EnvironmentList& out)
{
CORBA::ULong sz = in.size ();
out.length (sz);
@@ -86,10 +87,12 @@ Locator_XMLHandler::startElement (const ACEXML_Char*,
if (attrs != 0 && attrs->getLength () >= 3)
{
size_t index = 0;
- const ACE_CString aname = ACE_TEXT_ALWAYS_CHAR(attrs->getValue (index++));
+ const ACE_CString aname =
+ ACE_TEXT_ALWAYS_CHAR(attrs->getValue (index++));
const ACE_TString token_str = attrs->getValue (index++);
long token = ACE_OS::atoi (token_str.c_str ());
- const ACE_CString ior = ACE_TEXT_ALWAYS_CHAR(attrs->getValue (index++));
+ const ACE_CString ior =
+ ACE_TEXT_ALWAYS_CHAR(attrs->getValue (index++));
NameValues extra_params;
for ( ; index < attrs->getLength(); ++index)
{
diff --git a/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp b/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
index 5a70ab4f818..23ad5469001 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
@@ -37,16 +37,19 @@ ImplementationRepository::ServerInformation*
Server_Info::createImRServerInfo (void) const
{
ImplementationRepository::ServerInformation* info;
- ACE_NEW_THROW_EX (info, ImplementationRepository::ServerInformation, CORBA::NO_MEMORY ());
+ ACE_NEW_THROW_EX (info,
+ ImplementationRepository::ServerInformation,
+ CORBA::NO_MEMORY ());
info->startup.command_line = cmdline.c_str ();
if (jacorb_server)
{
- ACE_CString jacorb_name ("JACORB:" + name);
+ ACE_CString jacorb_name (ACE_TEXT ("JACORB:") + name);
info->server = jacorb_name.c_str();
}
else
info->server = name.c_str();
+
info->startup.command_line = cmdline.c_str ();
info->startup.environment = env_vars;
info->startup.working_directory = dir.c_str ();
@@ -72,5 +75,6 @@ Server_Info::reset (void)
partial_ior = "";
last_ping = ACE_Time_Value::zero;
server = ImplementationRepository::ServerObject::_nil ();
- // start_count = 0; Note : We can't do this, because it would be reset during startup.
+ // start_count = 0; Note : We can't do this, because it would
+ // be reset during startup.
}
diff --git a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp
index cbc8685c3fa..4e3a9dcd55d 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp
@@ -122,13 +122,12 @@ namespace {
if (this->locked_)
return;
- int ret = -1;
if ((this->flags_ & O_RDWR) != 0)
- ret = file_lock_->acquire();
+ file_lock_->acquire();
if ((this->flags_ & O_WRONLY) != 0)
- ret = file_lock_->acquire_write();
+ file_lock_->acquire_write();
else
- ret = file_lock_->acquire_read();
+ file_lock_->acquire_read();
this->locked_ = true;
#endif
@@ -154,14 +153,16 @@ Shared_Backing_Store::Shared_Backing_Store(const Options& opts,
repo_id_(1),
repo_values_(2)
{
- IMR_REPLICA[Options::PRIMARY_IMR] = "ImR_ReplicaPrimary";
- IMR_REPLICA[Options::BACKUP_IMR] = "ImR_ReplicaBackup";
- IMR_REPLICA[Options::STANDALONE_IMR] = "ImR_NoReplica";
+ IMR_REPLICA[Options::PRIMARY_IMR] = ACE_TEXT ("ImR_ReplicaPrimary");
+ IMR_REPLICA[Options::BACKUP_IMR] = ACE_TEXT ("ImR_ReplicaBackup");
+ IMR_REPLICA[Options::STANDALONE_IMR] = ACE_TEXT ("ImR_NoReplica");
this->repo_values_[REPO_TYPE] =
- std::make_pair(ACE_CString("repo_type"), ACE_CString());
+ std::make_pair(ACE_CString(ACE_TEXT ("repo_type")),
+ ACE_CString());
this->repo_values_[REPO_ID] =
- std::make_pair(ACE_CString("repo_id"), ACE_CString());
+ std::make_pair(ACE_CString(ACE_TEXT ("repo_id")),
+ ACE_CString());
}
Shared_Backing_Store::~Shared_Backing_Store()
@@ -913,13 +914,16 @@ static const typename Map::ENTRY& unique_id(
size));
};
- XML_Backing_Store::NameValues::const_iterator name_value = extra_params.begin();
unsigned int repo_id = 0;
// default to this repo
Options::ImrType repo_type = this_repo_type;
for (unsigned int i = 0; i < size; ++i)
{
- ACE_DEBUG((LM_INFO, "name values %C=%C (%C)\n", extra_params[i].first.c_str(), extra_params[i].second.c_str(), repo_values[i].first.c_str()));
+ ACE_DEBUG((LM_INFO,
+ ACE_TEXT ("name values %C=%C (%C)\n"),
+ extra_params[i].first.c_str(),
+ extra_params[i].second.c_str(),
+ repo_values[i].first.c_str()));
}
if ((size > Shared_Backing_Store::REPO_TYPE) &&
(extra_params[Shared_Backing_Store::REPO_TYPE].first ==
@@ -971,8 +975,9 @@ Shared_Backing_Store::load_server (
{
// create new or replace the existing entry
XML_Backing_Store::load_server(
- server_id, server_name, jacorb_server, activator_name, startup_cmd, env_vars, working_dir,
- actmode, start_limit, partial_ior, ior, server_started, extra_params);
+ server_id, server_name, jacorb_server, activator_name, startup_cmd,
+ env_vars, working_dir, actmode, start_limit, partial_ior, ior,
+ server_started, extra_params);
return;
}
diff --git a/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp b/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp
index e4eaa33a4b4..0262a98f1b8 100644
--- a/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp
@@ -190,7 +190,10 @@ XML_Backing_Store::load (const ACE_TString& filename,
FILE* open_file)
{
// xml input source will take ownership
- ACEXML_FileCharStream* fstm = new ACEXML_FileCharStream;
+ ACEXML_FileCharStream* fstm;
+ ACE_NEW_RETURN (fstm,
+ ACEXML_FileCharStream,
+ -1);
int err;
// use the open_file stream if it is provided
@@ -202,8 +205,9 @@ XML_Backing_Store::load (const ACE_TString& filename,
if (debug > 9)
{
- ACE_DEBUG((LM_INFO, ACE_TEXT ("load %s%C\n"), filename.c_str(),
- ((err == 0) ? "" : " (file doesn't exist)")));
+ ACE_DEBUG ((LM_INFO, ACE_TEXT ("load %s%C\n"), filename.c_str(),
+ ((err == 0) ? ACE_TEXT ("")
+ : ACE_TEXT (" (file doesn't exist)"))));
}
if (err != 0)
@@ -262,16 +266,23 @@ XML_Backing_Store::load_server (
{
const int limit = start_limit < 1 ? 1 : start_limit;
- Server_Info_Ptr si(
- new Server_Info (server_id, server_name, jacorb_server, activator_name, startup_cmd,
- env_vars, working_dir, actmode, limit, partial_ior, ior));
+ Server_Info *serv_inf;
+ ACE_NEW (serv_inf,
+ Server_Info (server_id, server_name, jacorb_server,
+ activator_name, startup_cmd, env_vars,
+ working_dir, actmode, limit,
+ partial_ior, ior));
+
+ Server_Info_Ptr si (serv_inf);
+
this->servers().rebind(server_name, si);
create_server(server_started, si);
}
void
-XML_Backing_Store::create_server(bool server_started, const Server_Info_Ptr& si)
+XML_Backing_Store::create_server(bool server_started,
+ const Server_Info_Ptr& si)
{
if (!server_started || si->ior.is_empty())
return;
@@ -293,6 +304,10 @@ XML_Backing_Store::load_activator (const ACE_CString& activator_name,
const ACE_CString& ior,
const NameValues& )
{
- Activator_Info_Ptr info (new Activator_Info (activator_name, token, ior));
+ Activator_Info *ai;
+ ACE_NEW (ai,
+ Activator_Info (activator_name, token, ior));
+
+ Activator_Info_Ptr info (ai);
this->activators().rebind(activator_name, info);
}
diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
index 61753e679ee..2837ef12135 100644
--- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
@@ -817,7 +817,7 @@ TAO_IMR_Op_IOR::run (void)
ACE_CString ior (imr_str.in ());
// Add the key
- const char jacorb[] = "JACORB:";
+ const char jacorb[] = ACE_TEXT_ALWAYS_CHAR ("JACORB:");
const char *posjacorb = ACE_OS::strstr (server_name_.c_str (), jacorb);
if (posjacorb)
{
@@ -828,7 +828,7 @@ TAO_IMR_Op_IOR::run (void)
ior += this->server_name_;
}
- ACE_DEBUG ((LM_DEBUG, "%s\n", ior.c_str ()));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s\n"), ior.c_str ()));
if (this->filename_.length () > 0)
{
@@ -837,7 +837,7 @@ TAO_IMR_Op_IOR::run (void)
if (file == 0)
{
ACE_ERROR_RETURN ((LM_ERROR,
- "Error: Unable to open %s for writing: %p\n",
+ ACE_TEXT ("Error: Unable to open %s for writing: %p\n"),
this->filename_.c_str ()),
-1);
}
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
index 7740e7fd27b..18e2bb69a54 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
@@ -315,7 +315,7 @@ get_remote_oid_ptr(CORBA::ORB_ptr orb)
{
PortableServer::Current_var current =
resolve_init<PortableServer::Current>(orb,
- "POACurrent");
+ "POACurrent");
const PortableServer::ObjectId_var object_id =
current->get_object_id();
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
index 1d41b3d4e62..0ba928de2fe 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
@@ -155,7 +155,7 @@ TAO_LB_LeastLoaded::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
this->push_loads (the_location,
loads.in (),
- loads.inout()[0]);
+ loads.inout ()[0]);
return loads._retn ();
}
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
index 7f7199d2c61..463f4c3da83 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
@@ -153,7 +153,7 @@ TAO_LB_LoadAverage::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
this->push_loads (the_location,
loads.in (),
- loads.inout()[0]);
+ loads.inout ()[0]);
return loads._retn ();
}
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
index 3750c9ac632..6f2e8a65abf 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
@@ -154,7 +154,7 @@ TAO_LB_LoadMinimum::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
this->push_loads (the_location,
loads.in (),
- loads.inout()[0]);
+ loads.inout ()[0]);
return loads._retn ();
}
diff --git a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
index f9f465e8315..6e05e19bfd1 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
@@ -127,26 +127,30 @@ namespace
// Use an ACE::Value_Ptr to provide exception safety and proper
// copying semantics.
- typedef ACE::Value_Ptr<TAO::TypeCode::Case<CORBA::String_var, CORBA::TypeCode_var> > union_elem_type;
+ typedef ACE::Value_Ptr<TAO::TypeCode::Case<CORBA::String_var,
+ CORBA::TypeCode_var> > union_elem_type;
typedef ACE_Array_Base<union_elem_type> union_case_array_type;
// ------------------------------------------------------------
/// Demarshal a TypeCode.
- bool tc_demarshal (TAO_InputCDR & cdr,
- CORBA::TypeCode_ptr & tc,
- TAO::TypeCodeFactory::TC_Info_List & indirect_infos,
- TAO::TypeCodeFactory::TC_Info_List & direct_infos);
+ bool tc_demarshal (
+ TAO_InputCDR & cdr,
+ CORBA::TypeCode_ptr & tc,
+ TAO::TypeCodeFactory::TC_Info_List & indirect_infos,
+ TAO::TypeCodeFactory::TC_Info_List & direct_infos);
/// Demarshal an indirected TypeCode.
- bool tc_demarshal_indirection (TAO_InputCDR & cdr,
- CORBA::TypeCode_ptr & tc,
- TAO::TypeCodeFactory::TC_Info_List & indirect_infos,
- TAO::TypeCodeFactory::TC_Info_List & direct_infos);
-
- bool find_recursive_tc (char const * id,
- TAO::TypeCodeFactory::TC_Info_List & tcs,
- TAO::TypeCodeFactory::TC_Info_List & infos)
+ bool tc_demarshal_indirection (
+ TAO_InputCDR & cdr,
+ CORBA::TypeCode_ptr & tc,
+ TAO::TypeCodeFactory::TC_Info_List & indirect_infos,
+ TAO::TypeCodeFactory::TC_Info_List & direct_infos);
+
+ bool find_recursive_tc (
+ char const * id,
+ TAO::TypeCodeFactory::TC_Info_List & tcs,
+ TAO::TypeCodeFactory::TC_Info_List & infos)
{
// See comments above for rationale behind using an array instead
// of a map.
@@ -175,7 +179,7 @@ namespace
// For TC_Info_List whose elements are duplicated prior to addition,
// clean up the list by calling release on the typecode pointers.
- void cleanup_tc_info_list(TAO::TypeCodeFactory::TC_Info_List & infos)
+ void cleanup_tc_info_list (TAO::TypeCodeFactory::TC_Info_List & infos)
{
size_t const len = infos.size ();
@@ -372,11 +376,14 @@ TAO::TypeCodeFactory::tc_objref_factory (CORBA::TCKind kind,
if (!(cdr >> TAO_InputCDR::to_string (id.out (), 0)))
return false;
- static char const Object_id[] = "IDL:omg.org/CORBA/Object:1.0";
- static char const CCMObject_id[] = "IDL:omg.org/CORBA/CCMObject:1.0";
- static char const CCMHome_id[] = "IDL:omg.org/CORBA/CCMHome:1.0";
+ static char const Object_id[] =
+ ACE_TEXT_ALWAYS_CHAR ("IDL:omg.org/CORBA/Object:1.0");
+ static char const CCMObject_id[] =
+ ACE_TEXT_ALWAYS_CHAR ("IDL:omg.org/CORBA/CCMObject:1.0");
+ static char const CCMHome_id[] =
+ ACE_TEXT_ALWAYS_CHAR ("IDL:omg.org/CORBA/CCMHome:1.0");
- char const * tc_constant_id = "";
+ char const * tc_constant_id = ACE_TEXT_ALWAYS_CHAR ("");
switch (kind)
{
@@ -473,7 +480,10 @@ TAO::TypeCodeFactory::tc_struct_factory (CORBA::TCKind kind,
for (CORBA::ULong i = 0; i < nfields; ++i)
{
if (!(cdr >> TAO_InputCDR::to_string (fields[i].name.out (), 0)
- && tc_demarshal (cdr, fields[i].type.out (), indirect_infos, direct_infos)))
+ && tc_demarshal (cdr,
+ fields[i].type.out (),
+ indirect_infos,
+ direct_infos)))
return false;
}
@@ -485,7 +495,9 @@ TAO::TypeCodeFactory::tc_struct_factory (CORBA::TCKind kind,
// Check if struct TypeCode is recursive.
TAO::TypeCodeFactory::TC_Info_List recursive_tc;
- if (kind == CORBA::tk_struct && find_recursive_tc (id.in (), recursive_tc, indirect_infos))
+ if (kind == CORBA::tk_struct && find_recursive_tc (id.in (),
+ recursive_tc,
+ indirect_infos))
{
// Set remaining parameters.
typedef TAO::TypeCode::Recursive_Type<typecode_type,
@@ -506,7 +518,9 @@ TAO::TypeCodeFactory::tc_struct_factory (CORBA::TCKind kind,
if (!rtc)
return false; // Should never occur.
- assigned_params |= rtc->struct_parameters (name.in (), fields, nfields);
+ assigned_params |= rtc->struct_parameters (name.in (),
+ fields,
+ nfields);
}
// If no parameters were assigned then the reference in the
@@ -594,7 +608,8 @@ TAO::TypeCodeFactory::tc_union_factory (CORBA::TCKind /* kind */,
{
elem_type & member = cases[i];
- TAO::TypeCode::Case<CORBA::String_var, CORBA::TypeCode_var> * the_case = 0;
+ TAO::TypeCode::Case<CORBA::String_var, CORBA::TypeCode_var> *
+ the_case = 0;
// Ugly. *sigh*
switch (discriminant_kind)
@@ -744,7 +759,9 @@ TAO::TypeCodeFactory::tc_union_factory (CORBA::TCKind /* kind */,
CORBA::TypeCode_var the_type;
if (!(cdr >> TAO_InputCDR::to_string (the_name.out (), 0)
- && tc_demarshal (cdr, the_type.out (), indirect_infos, direct_infos)))
+ && tc_demarshal (cdr, the_type.out (),
+ indirect_infos,
+ direct_infos)))
return false;
member->name (the_name.in ());
@@ -962,7 +979,10 @@ TAO::TypeCodeFactory::tc_alias_factory (CORBA::TCKind kind,
CORBA::TypeCode_var content_type;
if (!(cdr >> TAO_InputCDR::to_string (id.out (), 0)
&& cdr >> TAO_InputCDR::to_string (name.out (), 0)
- && tc_demarshal (cdr, content_type.out (), indirect_infos, direct_infos)))
+ && tc_demarshal (cdr,
+ content_type.out (),
+ indirect_infos,
+ direct_infos)))
{
return false;
}
@@ -1213,7 +1233,11 @@ TAO::TypeCodeFactory::tc_abstract_interface_factory (CORBA::TCKind,
TC_Info_List & indirect_infos,
TC_Info_List & direct_infos)
{
- return tc_objref_factory (CORBA::tk_abstract_interface, cdr, tc, indirect_infos, direct_infos);
+ return tc_objref_factory (CORBA::tk_abstract_interface,
+ cdr,
+ tc,
+ indirect_infos,
+ direct_infos);
}
bool
@@ -1329,10 +1353,11 @@ namespace
}
bool
- tc_demarshal_indirection (TAO_InputCDR & cdr,
- CORBA::TypeCode_ptr & tc,
- TAO::TypeCodeFactory::TC_Info_List & indirect_infos,
- TAO::TypeCodeFactory::TC_Info_List & direct_infos)
+ tc_demarshal_indirection (
+ TAO_InputCDR & cdr,
+ CORBA::TypeCode_ptr & tc,
+ TAO::TypeCodeFactory::TC_Info_List & indirect_infos,
+ TAO::TypeCodeFactory::TC_Info_List & direct_infos)
{
CORBA::Long offset;
@@ -1399,7 +1424,10 @@ namespace
CORBA::String_var name;
CORBA::TypeCode_var content_type;
if (!(indir_stream >> TAO_InputCDR::to_string (name.out (), 0)
- && tc_demarshal (indir_stream, content_type.out (), indirect_infos, direct_infos)))
+ && tc_demarshal (indir_stream,
+ content_type.out (),
+ indirect_infos,
+ direct_infos)))
{
return false;
}
@@ -1453,7 +1481,8 @@ namespace
id.in ()),
false);
- // Since we created a new recursive tc, add it to the "Recursive" list.
+ // Since we created a new recursive tc, add it to
+ // the "Recursive" list.
return add_to_tc_info_list (tc, indirect_infos);
}
break;
@@ -1477,7 +1506,8 @@ namespace
id.in ()),
false);
- // Since we created a new recursive tc, add it to the "Recursive" list.
+ // Since we created a new recursive tc, add it
+ // to the "Recursive" list.
return add_to_tc_info_list (tc, indirect_infos);
}
break;
@@ -1505,7 +1535,8 @@ namespace
id.in ()),
false);
- // Since we created a new recursive tc, add it to the "Recursive" list.
+ // Since we created a new recursive tc, add it
+ // to the "Recursive" list.
return add_to_tc_info_list (tc, indirect_infos);
}
break;
@@ -1573,9 +1604,10 @@ operator>> (TAO_InputCDR & cdr, CORBA::TypeCode_ptr & tc)
if (!rtc)
return false; // Should never occur.
- assigned_params |= rtc->struct_parameters (tc_struct->name(),
- tc_struct->fields(),
- tc_struct->member_count());
+ assigned_params |= rtc->struct_parameters (
+ tc_struct->name(),
+ tc_struct->fields(),
+ tc_struct->member_count());
}
}
break;
@@ -1606,11 +1638,12 @@ operator>> (TAO_InputCDR & cdr, CORBA::TypeCode_ptr & tc)
if (!rtc)
return false; // Should never occur.
- assigned_params |= rtc->union_parameters (tc_union->name(),
- tc_union->discriminator_type(),
- tc_union->cases(), // Will be copied.
- tc_union->member_count(),
- tc_union->default_index());
+ assigned_params |= rtc->union_parameters (
+ tc_union->name(),
+ tc_union->discriminator_type(),
+ tc_union->cases(), // Will be copied.
+ tc_union->member_count(),
+ tc_union->default_index());
}
}
break;
@@ -1644,11 +1677,12 @@ operator>> (TAO_InputCDR & cdr, CORBA::TypeCode_ptr & tc)
if (!rtc)
return false; // Should never occur.
- assigned_params |= rtc->valuetype_parameters (tc_value->name(),
- tc_value->type_modifier(),
- tc_value->concrete_base(),
- tc_value->fields(), // Will be copied.
- tc_value->member_count());
+ assigned_params |= rtc->valuetype_parameters (
+ tc_value->name(),
+ tc_value->type_modifier(),
+ tc_value->concrete_base(),
+ tc_value->fields(), // Will be copied.
+ tc_value->member_count());
}
}
break;
View Lorry Controller Status