summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp')
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp1398
1 files changed, 636 insertions, 762 deletions
diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
index 67500e37945..abdd74b7e32 100644
--- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
@@ -2,35 +2,28 @@
#include "tao_imr_i.h"
+#include "tao/PortableServer/POA.h"
+
#include "tao/Stub.h"
#include "tao/Profile.h"
#include "ace/Get_Opt.h"
#include "ace/Read_Buffer.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/OS_NS_netdb.h"
-#include "ace/OS_NS_strings.h"
-#include "ace/OS_NS_unistd.h"
-
-// How many servers should we get at once?
-const size_t IR_LIST_CHUNK = 10;
TAO_IMR_i::TAO_IMR_i (void)
- : imr_locator_ (ImplementationRepository::Locator::_nil ()),
- op_ (0)
+: imr_ (ImplementationRepository::Administration::_nil ())
{
// Nothing
}
TAO_IMR_i::~TAO_IMR_i (void)
{
- delete this->op_;
}
int
TAO_IMR_i::run ()
{
- if (this->op_ == 0)
+ if (this->op_.get() == 0)
{
ACE_ERROR ((LM_ERROR, "Unknown operation"));
return TAO_IMR_Op::UNKNOWN;
@@ -49,47 +42,46 @@ TAO_IMR_i::init (int argc, char **argv)
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
- {
- // Retrieve the ORB.
- this->orb_ = CORBA::ORB_init (this->argc_,
- this->argv_,
- "internet"
- ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ {
+ // Retrieve the ORB.
+ this->orb_ = CORBA::ORB_init (this->argc_, this->argv_, "tao_imr_i" ACE_ENV_ARG_PARAMETER);
+ ACE_TRY_CHECK;
- // Parse command line and verify parameters.
- if (this->parse_args () == -1)
- return -1;
+ // Parse command line and verify parameters.
+ if (this->parse_args () == -1)
+ return -1;
- // Get the ImplRepo object
- CORBA::Object_var imr_locator =
- orb_->resolve_initial_references ("ImplRepoService"
- ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ // Get the ImplRepo object
+ CORBA::Object_var obj =
+ orb_->resolve_initial_references ("ImplRepoService" ACE_ENV_ARG_PARAMETER);
+ ACE_TRY_CHECK;
- if (CORBA::is_nil (imr_locator.in ()))
- {
- ACE_ERROR ((LM_ERROR,
- "Unable to resolve the ImR Locator.\n"));
- ACE_OS::exit (-1);
- }
+ if (CORBA::is_nil (obj.in ()))
+ {
+ ACE_ERROR ((LM_ERROR, "Unable to resolve the ImR Locator.\n"));
+ return -1;
+ }
- exception_message = "While narrowing ImR Locator";
+ exception_message = "While narrowing ImR Locator";
- this->imr_locator_ =
- ImplementationRepository::Locator::_narrow
- (imr_locator.in()
- ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->imr_ =
+ ImplementationRepository::Administration::_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
+ ACE_TRY_CHECK;
- this->op_->set_imr_locator (this->imr_locator_.in ());
- }
- ACE_CATCHANY
+ if (CORBA::is_nil (imr_.in ()))
{
- ACE_ERROR ((LM_ERROR, "TAO_IMR_i::init - %s\n", exception_message));
- ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception");
+ ACE_ERROR ((LM_ERROR, "Unable to narrow the ImR Locator.\n"));
return -1;
}
+
+ this->op_->set_imr(this->imr_.in ());
+ }
+ ACE_CATCHANY
+ {
+ ACE_ERROR ((LM_ERROR, "TAO_IMR_i::init - %s\n", exception_message));
+ ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception");
+ return -1;
+ }
ACE_ENDTRY;
return 0;
@@ -104,17 +96,18 @@ TAO_IMR_i::parse_args (void)
// Make sure one command was given
if (this->argc_ < 2)
{
+ ACE_ERROR((LM_ERROR, "Error: No operation specified.\n"));
this->print_usage ();
return -1;
}
- this->op_ = TAO_IMR_Op::make_op (this->argv_[1]);
+ this->op_.reset(TAO_IMR_Op::make_op (this->argv_[1]));
// Check for unrecognized operation
- if (this->op_ == 0)
+ if (this->op_.get() == 0)
{
- ACE_ERROR ((LM_ERROR, "ERROR: Unrecognized command: <%s>\n", this->argv_[1]));
+ ACE_ERROR((LM_ERROR, "Error: Unknown operation '%s'.\n", this->argv_[1]));
this->print_usage ();
return -1;
}
@@ -130,18 +123,17 @@ void
TAO_IMR_i::print_usage (void)
{
ACE_ERROR ((LM_ERROR, "Usage: tao_imr [options] command [command-arguments]\n"
- " where [options] are ORB options\n"
- " where command is one of the following:\n"
- " activate Activates a server through the IR\n"
- " add Add an entry to the IR\n"
- " autostart Activates all AUTO_START servers\n"
- " ior Creates a simplified IOR\n"
- " list List the entries in the IR\n"
- " remove Remove an entry from the IR\n"
- " shutdown Shuts down a server through the IR\n"
- " shutdown-repo Shuts down the IR\n"
- " update Update an entry in the IR\n"
- " where [command-arguments] depend on the command\n"));
+ " where [options] are ORB options\n"
+ " where command is one of the following:\n"
+ " activate Activates a server through the IR\n"
+ " add Add an entry to the IR\n"
+ " autostart Activates all AUTO_START servers\n"
+ " ior Creates a simplified IOR\n"
+ " list List the entries in the IR\n"
+ " remove Remove an entry from the IR\n"
+ " shutdown Shuts down a server through the IR\n"
+ " update Update an entry in the IR\n"
+ " where [command-arguments] depend on the command\n"));
}
@@ -164,8 +156,6 @@ TAO_IMR_Op::make_op (const ACE_TCHAR *op_name)
return new TAO_IMR_Op_Remove ();
else if (ACE_OS::strcasecmp (op_name, ACE_TEXT ("shutdown")) == 0)
return new TAO_IMR_Op_Shutdown ();
- else if (ACE_OS::strcasecmp (op_name, ACE_TEXT ("shutdown-repo")) == 0)
- return new TAO_IMR_Op_Shutdown_Repo ();
else if (ACE_OS::strcasecmp (op_name, ACE_TEXT ("update")) == 0)
return new TAO_IMR_Op_Update ();
@@ -179,9 +169,9 @@ TAO_IMR_Op::~TAO_IMR_Op ()
}
void
-TAO_IMR_Op::set_imr_locator (ImplementationRepository::Locator_ptr imr_locator)
+TAO_IMR_Op::set_imr (ImplementationRepository::Administration_ptr imr)
{
- this->imr_locator_ = imr_locator;
+ this->imr_ = imr;
}
void
@@ -200,37 +190,40 @@ TAO_IMR_Op::display_server_information (const ImplementationRepository::ServerIn
// Print out information
ACE_DEBUG ((LM_DEBUG, "Server <%s>\n", info.server.in ()));
+
ACE_DEBUG ((LM_DEBUG,
- " Activator: %s\n"
- " Command Line: %s\n"
- " Working Directory: %s\n"
- " Activation Mode: %s\n",
- info.startup.activator.in (),
- info.startup.command_line.in (),
- info.startup.working_directory.in (),
- act));
+ " Activator: %s\n"
+ " Command Line: %s\n"
+ " Working Directory: %s\n"
+ " Activation Mode: %s\n"
+ " Number of retries: %d\n",
+ info.startup.activator.in (),
+ info.startup.command_line.in (),
+ info.startup.working_directory.in (),
+ act,
+ info.startup.start_limit - 1));
for (CORBA::ULong i = 0; i < info.startup.environment.length (); ++i)
ACE_DEBUG ((LM_DEBUG, "Environment Variable: %s=%s \n",
- info.startup.environment[i].name.in (),
- info.startup.environment[i].value.in ()));
-
- // @@ add logical server once implemented
-
+ info.startup.environment[i].name.in (),
+ info.startup.environment[i].value.in ()));
if (info.startup.activation == ImplementationRepository::PER_CLIENT)
ACE_DEBUG ((LM_DEBUG, " No running info available for PER_CLIENT mode\n"));
- else if (ACE_OS::strlen (info.location.in()) > 0)
+ else if (ACE_OS::strlen (info.partial_ior.in()) > 0)
ACE_DEBUG ((LM_DEBUG,
- " Running at endpoint: %s\n",
- info.location.in ()));
- else // I am assuming that a blank location means currently not running.
+ " Running at endpoint: %s\n",
+ info.partial_ior.in ()));
+ else // I am assuming that a blank partial_ior means currently not running.
ACE_DEBUG ((LM_DEBUG,
- " Not currently running\n"));
+ " Not currently running\n"));
+
+ ACE_DEBUG ((LM_DEBUG, "\n"));
}
TAO_IMR_Op_Add::TAO_IMR_Op_Add (void)
- : activation_ (ImplementationRepository::NORMAL)
+: activation_ (ImplementationRepository::NORMAL)
+, retry_count_ (0)
{
// Nothing
}
@@ -242,9 +235,14 @@ TAO_IMR_Op_List::TAO_IMR_Op_List (void)
}
TAO_IMR_Op_Update::TAO_IMR_Op_Update (void)
-: set_command_line_ (0),
- set_working_dir_ (0),
- set_activation_ (0)
+: set_command_line_ (false)
+, set_environment_vars_(false)
+, set_working_dir_ (false)
+, set_activation_ (false)
+, activation_(ImplementationRepository::NORMAL)
+, set_retry_count_(false)
+, retry_count_ (0)
+, set_activator_ (false)
{
// Nothing
}
@@ -253,13 +251,11 @@ void
TAO_IMR_Op_Activate::print_usage (void)
{
ACE_ERROR ((LM_ERROR, "Activates a server\n"
- "\n"
- "Usage: tao_imr [options] activate <name> [command-arguments]\n"
- " where [options] are ORB options\n"
- " where <name> is the POA name used by the server object\n"
- " where [command-arguments] can be\n"
- " -l Activator name.\n"
- " -h Displays this\n"));
+ "\n"
+ "Usage: tao_imr [options] activate <name>\n"
+ " where [options] are ORB options\n"
+ " where <name> is the POA name used by the server object\n"
+ " -h Displays this\n"));
}
int
@@ -267,62 +263,63 @@ TAO_IMR_Op_Activate::parse (int argc, ACE_TCHAR **argv)
{
// Check for enough arguments (we need at least one for the server name)
if (argc < 2)
- {
- this->print_usage ();
- return -1;
- }
+ {
+ this->print_usage ();
+ return -1;
+ }
// Skip both the program name and the "activate" command
- ACE_Get_Opt get_opts (argc, argv, "l:h");
+ ACE_Get_Opt get_opts (argc, argv, "h");
this->server_name_ = argv[1];
int c;
while ((c = get_opts ()) != -1)
switch (c)
- {
- case 'l':
- this->activator_ = get_opts.optarg;
- break;
- case 'h': // display help
- default:
- this->print_usage ();
- return -1;
- }
+ {
+ case 'h': // display help
+ this->print_usage ();
+ return -1;
+ default:
+ ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c));
+ this->print_usage ();
+ return -1;
+ }
- // Success
return 0;
}
void
-TAO_IMR_Op_Add::setenv (ACE_TCHAR *opt)
+TAO_IMR_Op_Add::addenv (ACE_TCHAR *opt)
{
- CORBA::ULong length = this->environment_vars_.length ();
-
- // Increase the length of the sequence
- this->environment_vars_.length (length + 1);
- ACE_CString tokens (opt);
- int index = tokens.find ("=");
- // Insert at position length since that is our new element
- this->environment_vars_ [length].name =
- CORBA::string_dup (tokens.substr (0, index).c_str ());
- this->environment_vars_ [length].value =
- CORBA::string_dup (tokens.substr (index + 1).c_str ());
+ CORBA::ULong length = this->environment_vars_.length ();
+
+ // Increase the length of the sequence
+ this->environment_vars_.length (length + 1);
+ ACE_CString tokens (opt);
+ int index = tokens.find ("=");
+ // Insert at position length since that is our new element
+ this->environment_vars_ [length].name =
+ CORBA::string_dup (tokens.substr (0, index).c_str ());
+ this->environment_vars_ [length].value =
+ CORBA::string_dup (tokens.substr (index + 1).c_str ());
}
void
TAO_IMR_Op_Add::print_usage (void)
{
- ACE_ERROR ((LM_ERROR, "Usage: tao_imr [options] add <name> [command-arguments]\n"
- " where [options] are ORB options\n"
- " where <name> is the POA name used by the server object\n"
- " where [command-arguments] can be\n"
- " -l Activator name. Defaults to local hostname.\n"
- " -h Displays this\n"
- " -c command Startup command\n"
- " -w dir Working directory\n"
- " -e vars Set environment variables\n"
- " -a mode Set activate mode (NORMAL|MANUAL|PER_CLIENT|AUTO_START)\n"));
+ ACE_ERROR ((LM_ERROR,
+ "Usage: tao_imr [options] add <name> [command-arguments]\n"
+ " where [options] are ORB options\n"
+ " where <name> is the POA name used by the server object\n"
+ " where [command-arguments] can be\n"
+ " -l Activator name. Defaults to local hostname.\n"
+ " -h Displays this\n"
+ " -c command Startup command\n"
+ " -w dir Working directory\n"
+ " -e name=value Set environment variables\n"
+ " -a mode Set activate mode (NORMAL|MANUAL|PER_CLIENT|AUTO_START)\n"
+ " -r count Set how many times to attempt restart. (default 0)\n"));
}
int
@@ -330,70 +327,82 @@ TAO_IMR_Op_Add::parse (int argc, ACE_TCHAR **argv)
{
// Check for enough arguments (we need at least one for the server name)
if (argc < 2)
- {
- this->print_usage ();
- return -1;
- }
+ {
+ this->print_usage ();
+ return -1;
+ }
- // Skip both the program name and the "add" command
- ACE_Get_Opt get_opts (argc, argv, "hc:w:a:e:l:");
+ // Skip both the program name and the "add" command
+ ACE_Get_Opt get_opts (argc, argv, "hc:w:a:e:l:r:R:");
this->server_name_ = argv[1];
- if (this->server_name_.length() == 0)
+ if (this->server_name_.length() == 0 || this->server_name_[0] == '-')
{
- ACE_ERROR_RETURN ((LM_ERROR,
- "Server name > must be at least one character long!\n"),-1);
+ ACE_ERROR((LM_ERROR, "ERROR : name is required.\n"));
+ this->print_usage ();
+ return -1;
}
-
+
int c;
while ((c = get_opts ()) != -1)
+ {
switch (c)
+ {
+ case 'c': // Command line arguments
+ this->command_line_ = get_opts.opt_arg ();
+ break;
+ case 'e': // set environment variables
+ this->addenv( get_opts.opt_arg () ) ;
+ break;
+ case 'w': // Working Directory
+ this->working_dir_ = get_opts.opt_arg ();
+ break;
+ case 'a': // Activation Mode
+ if (ACE_OS::strcasecmp (get_opts.opt_arg (), "NORMAL") == 0)
+ this->activation_ = ImplementationRepository::NORMAL;
+ else if (ACE_OS::strcasecmp (get_opts.opt_arg (), "MANUAL") == 0)
+ this->activation_ = ImplementationRepository::MANUAL;
+ else if (ACE_OS::strcasecmp (get_opts.opt_arg (), "PER_CLIENT") == 0)
+ this->activation_ = ImplementationRepository::PER_CLIENT;
+ else if (ACE_OS::strcasecmp (get_opts.opt_arg (), "AUTO_START") == 0)
+ this->activation_ = ImplementationRepository::AUTO_START;
+ else
+ ACE_ERROR_RETURN ((LM_ERROR,
+ "Unknown Activation Mode <%s>!\n",
+ get_opts.opt_arg ()),
+ -1);
+ break;
+ case 'l': /// hostname of the activator
+ this->activator_ = get_opts.optarg;
+ break;
+ case 'r': // startup/ping Retry Count
+ case 'R':
{
- case 'c': // Command line arguments
- this->command_line_ = get_opts.opt_arg ();
- break;
- case 'e': // set environment variables
- this->setenv( get_opts.opt_arg () ) ;
- break;
- case 'w': // Working Directory
- this->working_dir_ = get_opts.opt_arg ();
- break;
- case 'a': // Activation Mode
- if (ACE_OS::strcasecmp (get_opts.opt_arg (), "NORMAL") == 0)
- this->activation_ = ImplementationRepository::NORMAL;
- else if (ACE_OS::strcasecmp (get_opts.opt_arg (), "MANUAL") == 0)
- this->activation_ = ImplementationRepository::MANUAL;
- else if (ACE_OS::strcasecmp (get_opts.opt_arg (), "PER_CLIENT") == 0)
- this->activation_ = ImplementationRepository::PER_CLIENT;
- else if (ACE_OS::strcasecmp (get_opts.opt_arg (), "AUTO_START") == 0)
- this->activation_ = ImplementationRepository::AUTO_START;
- else
- ACE_ERROR_RETURN ((LM_ERROR,
- "Unknown Activation Mode <%s>!\n",
- get_opts.opt_arg ()),
- -1);
- break;
- case 'l': /// hostname of the activator
- this->activator_ = get_opts.optarg;
- break;
- case 'h': // display help
- default:
- this->print_usage ();
- return -1;
+ int rc = ACE_OS::atoi(get_opts.optarg);
+ if (rc > 0)
+ this->retry_count_ = rc;
}
+ break;
+ case 'h': // display help
+ this->print_usage ();
+ return -1;
+ default:
+ ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c));
+ this->print_usage ();
+ return -1;
+ }
+ }
- // Success
return 0;
}
void
TAO_IMR_Op_Autostart::print_usage (void)
{
- ACE_ERROR ((LM_ERROR, "Usage: tao_imr [options] autostart [command-arguments]\n"
- " where [options] are ORB options\n"
- " where [command-arguments] can be\n"
- " -h Displays this\n"));
+ ACE_ERROR ((LM_ERROR, "Usage: tao_imr [options] autostart\n"
+ " where [options] are ORB options\n"
+ " -h Displays this\n"));
}
int
@@ -406,14 +415,16 @@ TAO_IMR_Op_Autostart::parse (int argc, ACE_TCHAR **argv)
while ((c = get_opts ()) != -1)
switch (c)
- {
- case 'h': // display help
- default:
- this->print_usage ();
- return -1;
- }
+ {
+ case 'h': // display help
+ this->print_usage ();
+ return -1;
+ default:
+ ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c));
+ this->print_usage ();
+ return -1;
+ }
- // Success
return 0;
}
@@ -421,15 +432,15 @@ void
TAO_IMR_Op_IOR::print_usage (void)
{
ACE_ERROR ((LM_ERROR, "Creates an IOR for a server that is registered with the IMR and uses\n"
- "the InterOperable Naming Service. Please see the documentation for\n"
- "more information on which server configurations work with this command.\n"
- "\n"
- "Usage: tao_imr [options] ior <name> [command-arguments]\n"
- " where [options] are ORB options\n"
- " where <name> is the POA name of the server\n"
- " where [command-arguments] can be\n"
- " -f filename filename to output the IOR to\n"
- " -h Displays this\n"));
+ "the InterOperable Naming Service. Please see the documentation for\n"
+ "more information on which server configurations work with this command.\n"
+ "\n"
+ "Usage: tao_imr [options] ior <name> [command-arguments]\n"
+ " where [options] are ORB options\n"
+ " where <name> is the POA name of the server\n"
+ " where [command-arguments] can be\n"
+ " -f filename filename to output the IOR to\n"
+ " -h Displays this\n"));
}
int
@@ -445,36 +456,29 @@ TAO_IMR_Op_IOR::parse (int argc, ACE_TCHAR **argv)
// Skip both the program name and the "ior" command
ACE_Get_Opt get_opts (argc, argv, "hf:");
- int c;
-
- while ((c = get_opts ()) != -1)
- switch (c)
- {
- case 'f': // File name
- this->filename_ = get_opts.opt_arg ();
- break;
- case 'h': // display help
- default:
- this->print_usage();
- return -1;
- }
-
- int remaining_index = get_opts.opt_ind();
- if (get_opts.argc() - remaining_index > 1) {
- ACE_DEBUG((LM_DEBUG, "Error : Too many arguments.\n\n"));
- this->print_usage();
+ this->server_name_ = argv[1];
+ if (this->server_name_.length() == 0 || this->server_name_[0] == '-')
+ {
+ ACE_ERROR((LM_ERROR, "ERROR : name is required.\n"));
+ this->print_usage ();
return -1;
}
- if (remaining_index < get_opts.argc()) {
- this->server_name_ = get_opts.argv()[remaining_index];
- }
+ int c;
- if (this->server_name_.length() == 0)
+ while ((c = get_opts ()) != -1)
+ switch (c)
{
- ACE_DEBUG((LM_DEBUG, "Error : Missing server name.\n\n"));
- this->print_usage();
- return -1;
+ case 'f': // File name
+ this->filename_ = get_opts.opt_arg ();
+ break;
+ case 'h': // display help
+ this->print_usage();
+ return -1;
+ default:
+ ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c));
+ this->print_usage ();
+ return -1;
}
return 0;
@@ -484,14 +488,14 @@ void
TAO_IMR_Op_List::print_usage (void)
{
ACE_ERROR ((LM_ERROR, "Lists all or one of the servers in the Implementation Repository\n"
- "\n"
- "Usage: tao_imr [options] list [name] [command-arguments]\n"
- " where [options] are ORB options\n"
- " where [name] is the optional server name to search for\n"
- " where [command-arguments] can be\n"
- " -v Verbose: Displays more info for each server when\n"
- " displaying more than one server\n"
- " -h Displays this\n"));
+ "\n"
+ "Usage: tao_imr [options] list [name] [command-arguments]\n"
+ " where [options] are ORB options\n"
+ " where [name] is the optional server name to search for\n"
+ " where [command-arguments] can be\n"
+ " -v Verbose: Displays more info for each server when\n"
+ " displaying more than one server\n"
+ " -h Displays this\n"));
}
int
@@ -500,10 +504,10 @@ TAO_IMR_Op_List::parse (int argc, ACE_TCHAR **argv)
int server_flag = 0;
if (argc > 1 && argv[1][0] != '-')
- {
- this->server_name_ = argv[1];
- server_flag = 2;
- }
+ {
+ this->server_name_ = argv[1];
+ server_flag = 2;
+ }
// Skip both the program name and the "list" command
ACE_Get_Opt get_opts (argc, argv, "vh", server_flag);
@@ -512,17 +516,19 @@ TAO_IMR_Op_List::parse (int argc, ACE_TCHAR **argv)
while ((c = get_opts ()) != -1)
switch (c)
- {
- case 'v': // verbose server display
- this->verbose_server_information_ = 1;
- break;
- case 'h': // display help
- default:
- this->print_usage ();
- return -1;
- }
+ {
+ case 'v': // verbose server display
+ this->verbose_server_information_ = 1;
+ break;
+ case 'h': // display help
+ this->print_usage ();
+ return -1;
+ default:
+ ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c));
+ this->print_usage ();
+ return -1;
+ }
- // Success
return 0;
}
@@ -530,13 +536,11 @@ void
TAO_IMR_Op_Remove::print_usage (void)
{
ACE_ERROR ((LM_ERROR, "Removes a server entry\n"
- "\n"
- "Usage: tao_imr [options] remove <name> [command-arguments]\n"
- " where [options] are ORB options\n"
- " where <name> is the POA name used by the server object\n"
- " where [command-arguments] can be\n"
- " -l Activator name.\n"
- " -h Displays this\n"));
+ "\n"
+ "Usage: tao_imr [options] remove <name>\n"
+ " where [options] are ORB options\n"
+ " where <name> is the POA name used by the server object\n"
+ " -h Displays this\n"));
}
int
@@ -544,30 +548,29 @@ TAO_IMR_Op_Remove::parse (int argc, ACE_TCHAR **argv)
{
// Check for enough arguments (we need at least one for the server name)
if (argc < 2)
- {
- this->print_usage ();
- return -1;
- }
+ {
+ this->print_usage ();
+ return -1;
+ }
// Skip both the program name and the "remove" command
- ACE_Get_Opt get_opts (argc, argv, "l:h");
+ ACE_Get_Opt get_opts (argc, argv, "h");
this->server_name_ = argv[1];
int c;
while ((c = get_opts ()) != -1)
switch (c)
- {
- case 'l':
- this->activator_ = get_opts.optarg;
- break;
- case 'h':
- default:
- this->print_usage ();
- return -1;
- }
+ {
+ case 'h':
+ this->print_usage ();
+ return -1;
+ default:
+ ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c));
+ this->print_usage ();
+ return -1;
+ }
- // Success
return 0;
}
@@ -575,13 +578,11 @@ void
TAO_IMR_Op_Shutdown::print_usage (void)
{
ACE_ERROR ((LM_ERROR, "Shuts down a server\n"
- "\n"
- "Usage: tao_imr [options] shutdown <name> [command-arguments]\n"
- " where [options] are ORB options\n"
- " where <name> is the POA name used by the server object\n"
- " where [command-arguments] can be\n"
- " -l Activator name.\n"
- " -h Displays this\n"));
+ "\n"
+ "Usage: tao_imr [options] shutdown <name>\n"
+ " where [options] are ORB options\n"
+ " where <name> is the name of the server object\n"
+ " -h Displays this\n"));
}
int
@@ -589,94 +590,64 @@ TAO_IMR_Op_Shutdown::parse (int argc, ACE_TCHAR **argv)
{
// Check for enough arguments (we need at least one for the server name)
if (argc < 2)
- {
- this->print_usage ();
- return -1;
- }
+ {
+ this->print_usage ();
+ return -1;
+ }
// Skip both the program name and the "shutdown" command
- ACE_Get_Opt get_opts (argc, argv, "l:h");
+ ACE_Get_Opt get_opts (argc, argv, "h");
this->server_name_ = argv[1];
int c;
while ((c = get_opts ()) != -1)
switch (c)
- {
- case 'l':
- this->activator_ = get_opts.optarg;
- break;
- case 'h':
- default:
- this->print_usage ();
- return -1;
- }
-
- // Success
- return 0;
-}
-
-void
-TAO_IMR_Op_Shutdown_Repo::print_usage (void)
-{
- ACE_ERROR ((LM_ERROR, "Shuts down the Implementation Repository\n"
- "\n"
- "Usage: tao_imr [options] shutdown-repo [command-arguments]\n"
- " where [options] are ORB options\n"
- " where [command-arguments] can be\n"
- " -h Displays this\n"));
-}
-
-int
-TAO_IMR_Op_Shutdown_Repo::parse (int argc, ACE_TCHAR **argv)
-{
- // Skip both the program name and the "shutdown" command
- ACE_Get_Opt get_opts (argc, argv, "h");
- int c;
- while ((c = get_opts ()) != -1)
- switch (c)
- {
- case 'h': // display help
- default:
- this->print_usage ();
- return -1;
- }
+ {
+ case 'h':
+ this->print_usage ();
+ return -1;
+ default:
+ ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c));
+ this->print_usage ();
+ return -1;
+ }
- // Success
return 0;
}
void
-TAO_IMR_Op_Update::setenv (ACE_TCHAR *opt)
+TAO_IMR_Op_Update::addenv (ACE_TCHAR *opt)
{
- this->set_environment_vars_ = 1;
- CORBA::ULong length = this->environment_vars_.length ();
- // Increase the length of the sequence
- this->environment_vars_.length (length + 1);
- ACE_CString tokens (opt);
- int index = tokens.find ("=");
- // Insert at position length since that is our new element
- this->environment_vars_ [length].name =
- CORBA::string_dup (tokens.substr (0, index).c_str ());
- this->environment_vars_ [length].value =
- CORBA::string_dup (tokens.substr (index + 1).c_str ());
+ CORBA::ULong length = this->environment_vars_.length ();
+ // Increase the length of the sequence
+ this->environment_vars_.length (length + 1);
+ ACE_CString tokens (opt);
+ int index = tokens.find ("=");
+ // Insert at position length since that is our new element
+ this->environment_vars_ [length].name =
+ CORBA::string_dup (tokens.substr (0, index).c_str ());
+ this->environment_vars_ [length].value =
+ CORBA::string_dup (tokens.substr (index + 1).c_str ());
}
void
TAO_IMR_Op_Update::print_usage (void)
{
- ACE_ERROR ((LM_ERROR, "Updates a server entry\n"
- "\n"
- "Usage: tao_imr [options] update <name> [command-arguments]\n"
- " where [options] are ORB options\n"
- " where <name> is the POA name used by the server object\n"
- " where [command-arguments] can be\n"
- " -l Activator name.\n"
- " -h Displays this\n"
- " -c command Startup command\n"
- " -w dir Working directory\n"
- " -e vars Set environment variables\n"
- " -a mode Set activate mode (NORMAL|MANUAL|PER_CLIENT|AUTO_START)\n"));
+ ACE_ERROR ((LM_ERROR,
+ "Updates a server entry\n"
+ "\n"
+ "Usage: tao_imr [options] update <name> [command-arguments]\n"
+ " where [options] are ORB options\n"
+ " where <name> is the POA name used by the server object\n"
+ " where [command-arguments] can be\n"
+ " -h Displays this\n"
+ " -l Activator name.\n"
+ " -c command Startup command\n"
+ " -w dir Working directory\n"
+ " -e name=value Set environment variables\n"
+ " -a mode Set activate mode (NORMAL|MANUAL|PER_CLIENT|AUTO_START)\n"
+ " -r count Set the startup/ping retry count to count\n"));
}
int
@@ -684,55 +655,70 @@ TAO_IMR_Op_Update::parse (int argc, ACE_TCHAR **argv)
{
// Check for enough arguments (we need at least one for the server name)
if (argc < 2)
- {
- this->print_usage ();
- return -1;
- }
+ {
+ ACE_ERROR((LM_ERROR, "Error: Must supply at least a server name.\n"));
+ this->print_usage ();
+ return -1;
+ }
// Skip both the program name and the "update" command
- ACE_Get_Opt get_opts (argc, argv, "hc:w:a:e:l:");
+ ACE_Get_Opt get_opts (argc, argv, "hc:w:a:e:r:R:l:");
this->server_name_ = argv[1];
int c;
while ((c = get_opts ()) != -1)
switch (c)
+ {
+ case 'c': // Command line arguments
+ this->set_command_line_ = true;
+ this->command_line_ = get_opts.opt_arg ();
+ break;
+ case 'e': // set environment variables
+ this->set_environment_vars_ = true;
+ this->addenv( get_opts.opt_arg () );
+ break;
+ case 'w': // Working Directory
+ this->set_working_dir_ = true;
+ this->working_dir_ = get_opts.opt_arg ();
+ break;
+ case 'a': // Activation Mode
+ this->set_activation_ = true;
+ if (ACE_OS::strcasecmp (get_opts.opt_arg (), "NORMAL") == 0)
+ this->activation_ = ImplementationRepository::NORMAL;
+ else if (ACE_OS::strcasecmp (get_opts.opt_arg (), "MANUAL") == 0)
+ this->activation_ = ImplementationRepository::MANUAL;
+ else if (ACE_OS::strcasecmp (get_opts.opt_arg (), "PER_CLIENT") == 0)
+ this->activation_ = ImplementationRepository::PER_CLIENT;
+ else if (ACE_OS::strcasecmp (get_opts.opt_arg (), "AUTO_START") == 0)
+ this->activation_ = ImplementationRepository::AUTO_START;
+ else
+ ACE_ERROR_RETURN ((LM_ERROR,
+ "Unknown Activation Mode <%s>!\n",
+ get_opts.opt_arg ()),
+ -1);
+ break;
+ case 'r':
+ case 'R': // startup/ping Retry Count
{
- case 'c': // Command line arguments
- this->set_command_line_ = 1;
- this->command_line_ = get_opts.opt_arg ();
- break;
- case 'e': // set environment variables
- this->setenv( get_opts.opt_arg () );
- break;
- case 'w': // Working Directory
- this->set_working_dir_ = 1;
- this->working_dir_ = get_opts.opt_arg ();
- break;
- case 'a': // Activation Mode
- this->set_activation_ = 1;
- if (ACE_OS::strcasecmp (get_opts.opt_arg (), "NORMAL") == 0)
- this->activation_ = ImplementationRepository::NORMAL;
- else if (ACE_OS::strcasecmp (get_opts.opt_arg (), "MANUAL") == 0)
- this->activation_ = ImplementationRepository::MANUAL;
- else if (ACE_OS::strcasecmp (get_opts.opt_arg (), "PER_CLIENT") == 0)
- this->activation_ = ImplementationRepository::PER_CLIENT;
- else if (ACE_OS::strcasecmp (get_opts.opt_arg (), "AUTO_START") == 0)
- this->activation_ = ImplementationRepository::AUTO_START;
- else
- ACE_ERROR_RETURN ((LM_ERROR,
- "Unknown Activation Mode <%s>!\n",
- get_opts.opt_arg ()),
- -1);
- break;
- case 'l':
- this->activator_ = get_opts.optarg;
- break;
- case 'h': // display help
- default:
- this->print_usage ();
- return -1;
+ this->set_retry_count_ = true;
+ int rc = ACE_OS::atoi(get_opts.optarg);
+ if (rc > 0)
+ this->retry_count_ = rc;
}
+ break;
+ case 'l': /// hostname of the activator
+ this->activator_ = get_opts.optarg;
+ this->set_activator_ = true;
+ break;
+ case 'h': // display help
+ this->print_usage ();
+ return -1;
+ default:
+ ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c));
+ this->print_usage ();
+ return -1;
+ }
return 0;
}
@@ -745,53 +731,47 @@ TAO_IMR_Op_Update::parse (int argc, ACE_TCHAR **argv)
int
TAO_IMR_Op_Activate::run (void)
{
+ ACE_ASSERT(! CORBA::is_nil(imr_));
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
- {
- if (this->activator_.length() == 0)
- {
- this->imr_locator_->activate_server (this->server_name_.c_str ()
- ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- }
- else
- {
- this->imr_locator_->activate_server_in_activator (
- this->server_name_.c_str (),
- this->activator_.c_str ()
- ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- }
- ACE_DEBUG ((LM_DEBUG,
- "Successfully Activated server <%s>\n",
- this->server_name_.c_str ()));
- }
+ {
+ this->imr_->activate_server (this->server_name_.c_str() ACE_ENV_ARG_PARAMETER);
+ ACE_TRY_CHECK;
+ ACE_DEBUG ((LM_DEBUG,
+ "Successfully Activated server <%s>\n",
+ this->server_name_.c_str ()));
+ }
ACE_CATCH (ImplementationRepository::CannotActivate, ex)
- {
- ACE_ERROR ((LM_ERROR, "Cannot activate server <%s>, reason: <%s>\n",
- this->server_name_.c_str (),
- ex.reason.in ()));
- return TAO_IMR_Op::CANNOT_ACTIVATE;
- }
+ {
+ ACE_ERROR ((LM_ERROR, "Cannot activate server <%s>, reason: <%s>\n",
+ this->server_name_.c_str (),
+ ex.reason.in ()));
+ return TAO_IMR_Op::CANNOT_ACTIVATE;
+ }
ACE_CATCH (ImplementationRepository::NotFound, ex)
- {
- ACE_ERROR ((LM_ERROR, "Could not find server <%s>!\n", this->server_name_.c_str ()));
- return TAO_IMR_Op::NOT_FOUND;
- }
+ {
+ ACE_ERROR ((LM_ERROR, "Could not find server <%s>!\n", this->server_name_.c_str ()));
+ return TAO_IMR_Op::NOT_FOUND;
+ }
+ ACE_CATCH (PortableServer::ForwardRequest, ex)
+ {
+ ACE_RE_THROW;
+ }
ACE_CATCHANY
- {
- ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Activating Server");
- return TAO_IMR_Op::UNKNOWN;
- }
+ {
+ ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Activating Server");
+ return TAO_IMR_Op::UNKNOWN;
+ }
ACE_ENDTRY;
- // Success
return TAO_IMR_Op::NORMAL;
}
int
TAO_IMR_Op_Add::run (void)
{
+ ACE_ASSERT(! CORBA::is_nil(imr_));
+
ImplementationRepository::StartupOptions startup_options;
startup_options.command_line =
@@ -801,128 +781,102 @@ TAO_IMR_Op_Add::run (void)
startup_options.working_directory =
CORBA::string_dup (this->working_dir_.c_str ());
startup_options.activation = this->activation_;
+ startup_options.start_limit = this->retry_count_ + 1;
if (this->activator_.length() != 0)
- {
- startup_options.activator = CORBA::string_dup (this->activator_.c_str ());
- }
+ {
+ startup_options.activator = CORBA::string_dup (this->activator_.c_str ());
+ }
else
- {
- // else use the hostname on which tao_imr is run
- char host_name[MAXHOSTNAMELEN + 1];
- ACE_OS::hostname (host_name, MAXHOSTNAMELEN);
- startup_options.activator = CORBA::string_dup (host_name);
- }
+ {
+ // else use the hostname on which tao_imr is run
+ char host_name[MAXHOSTNAMELEN + 1];
+ ACE_OS::hostname (host_name, MAXHOSTNAMELEN);
+ startup_options.activator = CORBA::string_dup (host_name);
+ }
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
- {
- this->imr_locator_->register_server (this->server_name_.c_str (),
- startup_options ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ {
+ this->imr_->register_server (this->server_name_.c_str (),
+ startup_options ACE_ENV_ARG_PARAMETER);
+ ACE_TRY_CHECK;
- ACE_DEBUG ((LM_DEBUG,
- "Successfully registered server <%s>\n",
- this->server_name_.c_str ()));
- }
+ ACE_DEBUG ((LM_DEBUG,
+ "Successfully registered server <%s>\n",
+ this->server_name_.c_str ()));
+ }
ACE_CATCH (ImplementationRepository::NotFound, ex)
- {
- ACE_ERROR ((LM_ERROR,
- "Could not register server <%s>. Activator <%s> not found!\n",
- this->server_name_.c_str (),
- this->activator_.c_str()
- ));
- return TAO_IMR_Op::ALREADY_REGISTERED;
- }
+ {
+ ACE_ERROR ((LM_ERROR,
+ "Could not register server <%s>. Activator <%s> not found!\n",
+ this->server_name_.c_str (),
+ this->activator_.c_str()
+ ));
+ return TAO_IMR_Op::ALREADY_REGISTERED;
+ }
ACE_CATCH (ImplementationRepository::AlreadyRegistered, ex)
- {
- ACE_ERROR ((LM_ERROR,
- "Server <%s> already registered!\n",
- this->server_name_.c_str ()));
- return TAO_IMR_Op::ALREADY_REGISTERED;
- }
+ {
+ ACE_ERROR ((LM_ERROR,
+ "Server <%s> already registered!\n",
+ this->server_name_.c_str ()));
+ return TAO_IMR_Op::ALREADY_REGISTERED;
+ }
ACE_CATCH (CORBA::NO_PERMISSION, ex)
- {
- ACE_ERROR ((LM_ERROR, "No Permission: ImplRepo is in Locked mode\n"));
- return TAO_IMR_Op::NO_PERMISSION;
- }
+ {
+ ACE_ERROR ((LM_ERROR, "No Permission: ImplRepo is in Locked mode\n"));
+ return TAO_IMR_Op::NO_PERMISSION;
+ }
ACE_CATCHANY
- {
- ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Adding server");
- return TAO_IMR_Op::UNKNOWN;
- }
+ {
+ ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Adding server");
+ return TAO_IMR_Op::UNKNOWN;
+ }
ACE_ENDTRY;
- // Success
return TAO_IMR_Op::NORMAL;
}
int
TAO_IMR_Op_Autostart::run (void)
{
+ ACE_ASSERT(! CORBA::is_nil(imr_));
+
ImplementationRepository::ServerInformationList_var server_list;
ImplementationRepository::ServerInformationIterator_var server_iter;
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
- {
- this->imr_locator_->list (0,
- server_list,
- server_iter
- ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ {
+ this->imr_->list (0,
+ server_list,
+ server_iter
+ ACE_ENV_ARG_PARAMETER);
+ ACE_TRY_CHECK;
- // Check for more to be displayed
- if (!CORBA::is_nil (server_iter.in ()))
- {
- int flag = 1;
-
- while (flag)
- {
- server_iter->next_n (IR_LIST_CHUNK,
- server_list
- ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
- CORBA::ULong list_length = server_list->length ();
- if (list_length > 0)
- {
- for (CORBA::ULong i = 0; i < list_length; i++)
- {
- ACE_TRY_EX (inside)
- {
- this->imr_locator_->activate_server_in_activator (
- server_list[i].server.in (),
- server_list[i].startup.activator.in()
- ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK_EX (inside);
- }
- ACE_CATCHANY
- {
- ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
- server_list[i].server.in ());
- // Ignore exception
- }
- ACE_ENDTRY;
- }
- }
- else
- {
- flag = 0;
- }
- }
-
- // We are done with the iterator, so it can go away now.
- server_iter->destroy ();
- } else {
- ACE_DEBUG((LM_DEBUG, "There were no servers to start.\n"));
- }
- }
- ACE_CATCHANY
+ ACE_ASSERT(CORBA::is_nil(server_iter.in()));
+
+ CORBA::ULong len = server_list->length ();
+ for (CORBA::ULong i = 0; i < len; ++i)
{
- ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "autostart");
- return TAO_IMR_Op::UNKNOWN;
+ ACE_TRY_EX (inside)
+ {
+ this->imr_->activate_server(server_list[i].server.in() ACE_ENV_ARG_PARAMETER);
+ ACE_TRY_CHECK_EX (inside);
+ }
+ ACE_CATCHANY
+ {
+ ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, server_list[i].server.in ());
+ // Ignore exception
+ }
+ ACE_ENDTRY;
}
+ }
+ ACE_CATCHANY
+ {
+ ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "autostart");
+ return TAO_IMR_Op::UNKNOWN;
+ }
ACE_ENDTRY;
return TAO_IMR_Op::NORMAL;
@@ -931,78 +885,79 @@ TAO_IMR_Op_Autostart::run (void)
int
TAO_IMR_Op_IOR::run (void)
{
- // Todo : Most of this logic duplicates that in the POA.cpp
+ ACE_ASSERT(! CORBA::is_nil(imr_));
+
+ // Create a corbaloc string
+ // Todo : Most of this logic duplicates that in the POA.cpp
ACE_TRY_NEW_ENV
+ {
+ if (CORBA::is_nil (this->imr_)
+ || !this->imr_->_stubobj ()
+ || !this->imr_->_stubobj ()->profile_in_use ())
{
- if (CORBA::is_nil (this->imr_locator_)
- || !this->imr_locator_->_stubobj ()
- || !this->imr_locator_->_stubobj ()->profile_in_use ())
- {
- ACE_ERROR_RETURN ((
- LM_ERROR,
- ACE_TEXT ("Invalid ImR Locator IOR\n")
- ),
- -1
- );
- }
-
- CORBA::String_var imr_str =
- this->imr_locator_->_stubobj ()->
- profile_in_use ()->to_string (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ACE_ERROR_RETURN ((
+ LM_ERROR,
+ ACE_TEXT ("Invalid ImR Locator IOR\n")
+ ), -1);
+ }
- // Search for "corbaloc:" alone, without the protocol. This code
- // should be protocol neutral.
- const char corbaloc[] = "corbaloc:";
- char *pos = ACE_OS::strstr (imr_str.inout (), corbaloc);
+ CORBA::String_var imr_str =
+ this->imr_->_stubobj ()->
+ profile_in_use ()->to_string (ACE_ENV_SINGLE_ARG_PARAMETER);
+ ACE_TRY_CHECK;
- if (pos == 0)
- ACE_ERROR_RETURN ((LM_ERROR,
- "Could not parse IMR IOR\n"),
- -1);
+ // Search for "corbaloc:" alone, without the protocol. This code
+ // should be protocol neutral.
+ const char corbaloc[] = "corbaloc:";
+ char *pos = ACE_OS::strstr (imr_str.inout (), corbaloc);
+
+ if (pos == 0)
+ {
+ ACE_ERROR_RETURN ((LM_ERROR, "Could not parse IMR IOR\n"), -1);
+ }
+ else
+ {
+ pos = ACE_OS::strchr (pos + sizeof (corbaloc), ':');
+ pos = ACE_OS::strchr (pos + 1,
+ this->imr_->_stubobj ()->profile_in_use ()->object_key_delimiter ());
+
+ if (pos)
+ {
+ *(pos + 1) = 0; // Crop the string
+ }
else
- {
- pos = ACE_OS::strchr (pos + sizeof (corbaloc), ':');
- pos = ACE_OS::strchr (pos + 1,
- this->imr_locator_->_stubobj ()->profile_in_use ()->object_key_delimiter ());
-
- if (pos)
- *(pos + 1) = 0; // Crop the string
- else
- ACE_ERROR_RETURN ((LM_ERROR,
- "Could not parse IMR IOR\n"),
- -1);
- }
- ACE_CString ior (imr_str.in ());
-
- // Add the key
- ior += this->server_name_;
-
- ACE_DEBUG ((LM_DEBUG, "%s\n", ior.c_str ()));
-
- if (this->filename_.length () > 0)
- {
- FILE *file = ACE_OS::fopen (this->filename_.c_str (), "w");
-
- if (file == 0)
- {
- ACE_ERROR_RETURN ((LM_ERROR,
- "Error: Unable to open %s for writing: %p\n",
- this->filename_.c_str ()),
- -1);
- }
-
- ACE_OS::fprintf (file,
- "%s",
- ior.c_str ());
- ACE_OS::fclose (file);
- }
+ {
+ ACE_ERROR_RETURN ((LM_ERROR, "Could not parse IMR IOR\n"), -1);
+ }
}
- ACE_CATCHANY
+ ACE_CString ior (imr_str.in ());
+
+ // Add the key
+ ior += this->server_name_;
+
+ ACE_DEBUG ((LM_DEBUG, "%s\n", ior.c_str ()));
+
+ if (this->filename_.length () > 0)
{
- ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Ior");
- return TAO_IMR_Op::UNKNOWN;
+ FILE *file = ACE_OS::fopen (this->filename_.c_str (), "w");
+
+ if (file == 0)
+ {
+ ACE_ERROR_RETURN ((LM_ERROR,
+ "Error: Unable to open %s for writing: %p\n",
+ this->filename_.c_str ()),
+ -1);
+ }
+
+ ACE_OS::fprintf (file, "%s", ior.c_str ());
+ ACE_OS::fclose (file);
}
+ }
+ ACE_CATCHANY
+ {
+ ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "IOR");
+ return TAO_IMR_Op::UNKNOWN;
+ }
ACE_ENDTRY;
return TAO_IMR_Op::NORMAL;
@@ -1011,81 +966,57 @@ TAO_IMR_Op_IOR::run (void)
int
TAO_IMR_Op_List::run (void)
{
+ ACE_ASSERT(! CORBA::is_nil(imr_));
+
ImplementationRepository::ServerInformationList_var server_list;
ImplementationRepository::ServerInformationIterator_var server_iter;
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
+ {
+ // If there is a server name, list only that server. Otherwise, look
+ // at all of them.
+ if (this->server_name_.length () == 0)
{
- // If there is a server name, list only that server. Otherwise, look
- // at all of them.
- if (this->server_name_.length () == 0)
- {
- this->imr_locator_->list (IR_LIST_CHUNK,
- server_list.out(),
- server_iter.out()
- ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
- if (server_list->length() == 0)
- {
- ACE_DEBUG((LM_DEBUG, "No servers found.\n"));
- return TAO_IMR_Op::NORMAL;
- }
-
- for (CORBA::ULong i = 0; i < server_list->length (); i++)
- this->display_server_information (server_list[i]);
-
- // Check for more to be displayed
- if (!CORBA::is_nil (server_iter.in ()))
- {
- int flag = 1;
-
- while (flag)
- {
- server_iter->next_n (IR_LIST_CHUNK,
- server_list
- ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
- CORBA::ULong list_length = server_list->length ();
- if (list_length > 0)
- {
- for (CORBA::ULong i = 0; i < list_length; i++)
- this->display_server_information (server_list[i]);
- }
- else
- {
- flag = 0;
- }
- }
-
- // We are done with the iterator, so it can go away now.
- server_iter->destroy ();
- }
- }
- else
- {
- ImplementationRepository::ServerInformation_var server_information;
+ this->imr_->list (0,
+ server_list.out(),
+ server_iter.out()
+ ACE_ENV_ARG_PARAMETER);
+ ACE_TRY_CHECK;
- this->imr_locator_->find (this->server_name_.c_str (), server_information ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ if (server_list->length() == 0)
+ {
+ ACE_DEBUG((LM_DEBUG, "No servers found.\n"));
+ return TAO_IMR_Op::NORMAL;
+ }
- this->verbose_server_information_ = 1;
+ for (CORBA::ULong i = 0; i < server_list->length (); i++)
+ this->display_server_information (server_list[i]);
- this->display_server_information (server_information.in ());
- }
+ ACE_ASSERT (CORBA::is_nil (server_iter.in ()));
}
- ACE_CATCH (ImplementationRepository::NotFound, ex)
+ else
{
- ACE_ERROR ((LM_ERROR, "Could not find server <%s>!\n", this->server_name_.c_str ()));
- return TAO_IMR_Op::NOT_FOUND;
+ ImplementationRepository::ServerInformation_var si;
+
+ this->imr_->find (this->server_name_.c_str (), si ACE_ENV_ARG_PARAMETER);
+ ACE_TRY_CHECK;
+
+ this->verbose_server_information_ = 1;
+
+ this->display_server_information (si.in ());
}
+ }
+ ACE_CATCH (ImplementationRepository::NotFound, ex)
+ {
+ ACE_ERROR ((LM_ERROR, "Could not find server <%s>!\n", this->server_name_.c_str ()));
+ return TAO_IMR_Op::NOT_FOUND;
+ }
ACE_CATCHANY
- {
- ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "List");
- return TAO_IMR_Op::UNKNOWN;
- }
+ {
+ ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "List");
+ return TAO_IMR_Op::UNKNOWN;
+ }
ACE_ENDTRY;
return TAO_IMR_Op::NORMAL;
@@ -1094,180 +1025,123 @@ TAO_IMR_Op_List::run (void)
int
TAO_IMR_Op_Remove::run (void)
{
+ ACE_ASSERT(! CORBA::is_nil(imr_));
+
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
- {
- if (this->activator_.length() == 0)
- {
- this->imr_locator_->remove_server (this->server_name_.c_str ()
- ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- }
- else
- {
- this->imr_locator_->remove_server_in_activator (
- this->server_name_.c_str (),
- this->activator_.c_str ()
- ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- }
-
- ACE_DEBUG ((LM_DEBUG,
- "Successfully removed server <%s>\n",
- this->server_name_.c_str ()));
- }
+ {
+ this->imr_->remove_server (this->server_name_.c_str() ACE_ENV_ARG_PARAMETER);
+ ACE_TRY_CHECK;
+
+ ACE_DEBUG ((LM_DEBUG, "Successfully removed server <%s>\n",
+ this->server_name_.c_str ()));
+ }
ACE_CATCH (ImplementationRepository::NotFound, ex)
- {
- ACE_ERROR ((LM_ERROR, "Could not find server <%s>!\n",
- this->server_name_.c_str ()));
- return TAO_IMR_Op::NOT_FOUND;
- }
+ {
+ ACE_ERROR ((LM_ERROR, "Could not find server <%s>!\n",
+ this->server_name_.c_str ()));
+ return TAO_IMR_Op::NOT_FOUND;
+ }
ACE_CATCH (CORBA::NO_PERMISSION, ex)
- {
- ACE_ERROR ((LM_ERROR, "No Permission: ImplRepo is in Locked mode\n"));
- return TAO_IMR_Op::NO_PERMISSION;
- }
+ {
+ ACE_ERROR ((LM_ERROR, "No Permission: ImplRepo is in Locked mode\n"));
+ return TAO_IMR_Op::NO_PERMISSION;
+ }
ACE_CATCHANY
- {
- ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Removing Server");
- return TAO_IMR_Op::UNKNOWN;
- }
+ {
+ ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Removing Server");
+ return TAO_IMR_Op::UNKNOWN;
+ }
ACE_ENDTRY;
- // Success
return TAO_IMR_Op::NORMAL;
}
int
TAO_IMR_Op_Shutdown::run (void)
{
- ACE_DECLARE_NEW_CORBA_ENV;
- ACE_TRY
- {
- if (this->activator_.length() == 0)
- {
- this->imr_locator_->shutdown_server (this->server_name_.c_str ()
- ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- }
- else
- {
- this->imr_locator_->shutdown_server_in_activator (
- this->server_name_.c_str (),
- this->activator_.c_str ()
- ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- }
-
- ACE_DEBUG ((LM_DEBUG,
- "Successfully shut down server <%s>\n",
- this->server_name_.c_str ()));
- }
- ACE_CATCH (ImplementationRepository::NotFound, ex)
- {
- ACE_ERROR ((LM_ERROR, "Could not find server <%s>!\n", this->server_name_.c_str ()));
- return TAO_IMR_Op::NOT_FOUND;
- }
- ACE_CATCHANY
- {
- ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Shutting Down Server");
- return TAO_IMR_Op::UNKNOWN;
- }
- ACE_ENDTRY;
+ ACE_ASSERT(! CORBA::is_nil(imr_));
- // Success
- return TAO_IMR_Op::NORMAL;
-}
-
-int
-TAO_IMR_Op_Shutdown_Repo::run (void)
-{
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
- {
- this->imr_locator_->shutdown_repo( ACE_ENV_SINGLE_ARG_PARAMETER ) ;
- ACE_TRY_CHECK;
+ {
+ this->imr_->shutdown_server (this->server_name_.c_str () ACE_ENV_ARG_PARAMETER);
+ ACE_TRY_CHECK;
- ACE_DEBUG((LM_DEBUG,
- "Successfully shut down Implementation Repository\n"));
- }
+ ACE_DEBUG ((LM_DEBUG, "Successfully shut down server <%s>\n",
+ this->server_name_.c_str ()));
+ }
+ ACE_CATCH (ImplementationRepository::NotFound, ex)
+ {
+ ACE_ERROR ((LM_ERROR, "Could not find server <%s>!\n", this->server_name_.c_str ()));
+ return TAO_IMR_Op::NOT_FOUND;
+ }
ACE_CATCHANY
- {
- ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Shutting Down Repository");
- return UNKNOWN;
- }
+ {
+ ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Shutting Down Server");
+ return TAO_IMR_Op::UNKNOWN;
+ }
ACE_ENDTRY;
- // Success
- return NORMAL;
+ return TAO_IMR_Op::NORMAL;
}
int
TAO_IMR_Op_Update::run (void)
{
+ ACE_ASSERT(! CORBA::is_nil(imr_));
+
ImplementationRepository::ServerInformation_var server_information;
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
- {
- if (this->activator_.length() == 0) {
- this->imr_locator_->find(this->server_name_.c_str (),
- server_information.out() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- } else {
- this->imr_locator_->find_in_activator (this->server_name_.c_str (),
- this->activator_.c_str(),
- server_information.out() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- }
+ {
+ this->imr_->find(this->server_name_.c_str (),
+ server_information.out() ACE_ENV_ARG_PARAMETER);
+ ACE_TRY_CHECK;
- // Conditionally update the startup options
- if (this->set_command_line_ == 1)
- server_information->startup.command_line =
- CORBA::string_dup (this->command_line_.c_str ());
+ // Conditionally update the startup options
+ if (this->set_command_line_)
+ server_information->startup.command_line =
+ CORBA::string_dup (this->command_line_.c_str ());
- if (this->set_environment_vars_ == 1)
- server_information->startup.environment = this->environment_vars_;
+ if (this->set_environment_vars_)
+ server_information->startup.environment = this->environment_vars_;
- if (this->set_working_dir_ == 1)
- server_information->startup.working_directory =
- CORBA::string_dup (this->working_dir_.c_str ());
+ if (this->set_working_dir_)
+ server_information->startup.working_directory = CORBA::string_dup (this->working_dir_.c_str ());
- if (this->set_activation_ == 1)
- server_information->startup.activation = this->activation_;
+ if (this->set_activation_)
+ server_information->startup.activation = this->activation_;
- // @@ Add logical server support here also
- this->imr_locator_->reregister_server (this->server_name_.c_str (),
- server_information->startup
- ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ if (this->set_retry_count_)
+ server_information->startup.start_limit = this->retry_count_ + 1;
- // Now that we've reregistered the server, update the server
- // information before we display it.
- this->imr_locator_->find(this->server_name_.c_str (),
- server_information.out() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ if (this->set_activator_)
+ server_information->startup.activator = CORBA::string_dup(this->activator_.c_str());
- this->display_server_information (server_information.in ());
- }
+ this->imr_->reregister_server (this->server_name_.c_str (),
+ server_information->startup
+ ACE_ENV_ARG_PARAMETER);
+ ACE_TRY_CHECK;
+ }
ACE_CATCH (ImplementationRepository::NotFound, ex)
- {
- ACE_ERROR ((LM_ERROR, "Could not find server <%s>\n", this->server_name_.c_str ()));
- return TAO_IMR_Op::NOT_FOUND;
- }
+ {
+ ACE_ERROR ((LM_ERROR, "Could not find server <%s>\n", this->server_name_.c_str ()));
+ return TAO_IMR_Op::NOT_FOUND;
+ }
ACE_CATCH (CORBA::NO_PERMISSION, ex)
- {
- ACE_ERROR ((LM_ERROR, "No Permission: ImplRepo is in Locked mode\n"));
- return TAO_IMR_Op::NO_PERMISSION;
- }
+ {
+ ACE_ERROR ((LM_ERROR, "No Permission: ImplRepo is in Locked mode\n"));
+ return TAO_IMR_Op::NO_PERMISSION;
+ }
ACE_CATCHANY
- {
- ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Updating server");
- return TAO_IMR_Op::UNKNOWN;
- }
+ {
+ ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Updating server");
+ return TAO_IMR_Op::UNKNOWN;
+ }
ACE_ENDTRY;
- // Success
return TAO_IMR_Op::NORMAL;
}
View Lorry Controller Status