diff options
Diffstat (limited to 'TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp')
| -rw-r--r-- | TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp | 38 |
1 files changed, 13 insertions, 25 deletions
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp index a137b5d45f8..9e6ba4f9394 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp @@ -90,7 +90,7 @@ main (int argc, char *argv[]) if (sched_policy == ACE_SCHED_RR) flags = THR_NEW_LWP | THR_BOUND | THR_JOINABLE | THR_SCHED_RR; - else + else flags = THR_NEW_LWP | THR_BOUND | THR_JOINABLE | THR_SCHED_FIFO; task_stats.init (100000); @@ -99,11 +99,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -112,11 +110,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -126,12 +122,10 @@ main (int argc, char *argv[]) CORBA::Object_ptr manager_obj = orb->resolve_initial_references ("RTSchedulerManager" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Kokyu::DSRT_Dispatcher_Impl_t disp_impl_type; if (enable_yield) @@ -142,9 +136,9 @@ main (int argc, char *argv[]) { disp_impl_type = Kokyu::DSRT_OS_BASED; } - + ACE_NEW_RETURN (scheduler, - MIF_Scheduler (orb.in (), + MIF_Scheduler (orb.in (), disp_impl_type, sched_policy, sched_scope), -1); @@ -154,25 +148,21 @@ main (int argc, char *argv[]) CORBA::Object_var object = orb->resolve_initial_references ("RTScheduler_Current" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; current = RTScheduling::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } - Simple_Server_i server_impl (orb.in (), - current.in (), - task_stats, + Simple_Server_i server_impl (orb.in (), + current.in (), + task_stats, enable_yield); Simple_Server_var server = - server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server_impl._this (); CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -189,17 +179,16 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); Worker worker (orb.in ()); if (worker.activate (flags, - nthreads, + nthreads, 0, - ACE_Sched_Params::priority_max(sched_policy, + ACE_Sched_Params::priority_max(sched_policy, sched_scope)) != 0) { - ACE_ERROR ((LM_ERROR, + ACE_ERROR ((LM_ERROR, "Cannot activate threads in RT class.", "Trying to activate in non-RT class\n")); @@ -228,7 +217,7 @@ main (int argc, char *argv[]) ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "Exiting main...\n")); - task_stats.dump_samples ("timeline.txt", + task_stats.dump_samples ("timeline.txt", "Time\t\tGUID", ACE_High_Res_Timer::global_scale_factor ()); return 0; @@ -250,7 +239,6 @@ Worker::svc (void) ACE_TRY { this->orb_->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { |