diff options
Diffstat (limited to 'TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp')
| -rw-r--r-- | TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp | 54 |
1 files changed, 5 insertions, 49 deletions
diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp index 83e325bcde7..5ee5019fab1 100644 --- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp +++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp @@ -57,16 +57,12 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[]) // Initialize ORB manager. this->orb_manager_.init (command_line.get_argc(), command_line.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; orb = this->orb_manager_.orb (); - ACE_TRY_CHECK; poa_manager = this->orb_manager_.poa_manager (); - ACE_TRY_CHECK; - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); // Check the non-ORB arguments. this needs to come before we // initialize the scheduler implementation so that we know which @@ -79,26 +75,16 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[]) // Construct a scheduler implementation of the specified type. switch (this->scheduler_type_) { - -// The templatized method parameters needed by the reconfig scheduler -// class template are hopelessly broken on pre-2.8 versions of g++. -#if (! defined (__GNUC__)) || (__GNUC__ > 2) || \ -(__GNUC__ == 2 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 8) - case RECONFIG: ACE_NEW_THROW_EX (scheduler_impl_, RECONFIG_SCHED_TYPE, CORBA::NO_MEMORY ()); - ACE_TRY_CHECK; break; -#endif /* __GNUC__ */ - case CONFIG: ACE_NEW_THROW_EX (scheduler_impl_, CONFIG_SCHED_TYPE, CORBA::NO_MEMORY ()); - ACE_TRY_CHECK; break; default: @@ -110,7 +96,6 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[]) // Locate the naming service. CORBA::Object_var naming_obj = orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (naming_obj.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -118,15 +103,12 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[]) -1); CosNaming::NamingContext_var naming_context = CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RtecScheduler::Scheduler_var scheduler = - this->scheduler_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->scheduler_impl_->_this (); CORBA::String_var scheduler_ior_string = orb->object_to_string (scheduler.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, ACE_TEXT("The scheduler IOR is <%s>\n"), ACE_TEXT_CHAR_TO_TCHAR(scheduler_ior_string.in ()))); @@ -136,7 +118,6 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[]) schedule_name.length (1); schedule_name[0].id = CORBA::string_dup (this->service_name_.rep()); naming_context->rebind (schedule_name, scheduler.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (this->ior_file_name_.rep() != 0) { @@ -176,10 +157,10 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[]) // Runs the TAO_Scheduling_Service. int -TAO_Scheduling_Service::run (ACE_ENV_SINGLE_ARG_DECL) +TAO_Scheduling_Service::run (void) { // Run the ORB manager. - return this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->orb_manager_.run (); } @@ -207,11 +188,6 @@ TAO_Scheduling_Service::parse_args (int argc, ACE_TCHAR* argv[]) this->ior_file_name_ = ACE_TEXT_ALWAYS_CHAR(get_opt.opt_arg ()); break; -// The templatized method parameters needed by the reconfig scheduler -// class template are hopelessly broken on pre-2.8 versions of g++. -#if (! defined (__GNUC__)) || (__GNUC__ > 2) || \ -(__GNUC__ == 2 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 8) - case 's': if (ACE_OS::strcasecmp (ACE_TEXT("CONFIG"), get_opt.optarg) == 0) { @@ -236,16 +212,9 @@ TAO_Scheduling_Service::parse_args (int argc, ACE_TCHAR* argv[]) } break; -#endif /* __GNUC__ */ - case '?': default: -// The templatized method parameters needed by the reconfig scheduler -// class template are hopelessly broken on pre-2.8 versions of g++. -#if (! defined (__GNUC__)) || (__GNUC__ > 2) || \ -(__GNUC__ == 2 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 8) - ACE_DEBUG ((LM_DEBUG, "Usage: %s " "[-n service_name] " @@ -255,18 +224,6 @@ TAO_Scheduling_Service::parse_args (int argc, ACE_TCHAR* argv[]) "\n", argv[0])); -#else /* __GNUC__ <= 2.8 */ - - ACE_DEBUG ((LM_DEBUG, - "Usage: %s " - "[-n service_name] " - "[-p pid_file_name] " - "[-o ior_file_name] " - "\n", - argv[0])); - -#endif /* __GNUC__ */ - return -1; } } @@ -289,8 +246,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) ACE_DEBUG ((LM_DEBUG, "%s; running scheduling service\n", __FILE__)); - scheduling_service.run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + scheduling_service.run (); } ACE_CATCHANY { |