diff options
Diffstat (limited to 'TAO/tests/RTScheduling/DT_Spawn/test.cpp')
| -rw-r--r-- | TAO/tests/RTScheduling/DT_Spawn/test.cpp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/TAO/tests/RTScheduling/DT_Spawn/test.cpp b/TAO/tests/RTScheduling/DT_Spawn/test.cpp index fab57bcd8ce..2f73288cd1a 100644 --- a/TAO/tests/RTScheduling/DT_Spawn/test.cpp +++ b/TAO/tests/RTScheduling/DT_Spawn/test.cpp @@ -5,10 +5,13 @@ #include "Thread_Action.h" #include "ace/Thread_Manager.h" #include "ace/SString.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char* argv []) +ACE_TMAIN (int argc, ACE_TCHAR* argv []) { + ACE_Argv_Type_Converter convert (argc, argv); + CORBA::ORB_var orb; RTScheduling::Current_var current; @@ -20,17 +23,17 @@ main (int argc, char* argv []) ACE_TRY_NEW_ENV { - orb = CORBA::ORB_init (argc, - argv, + orb = CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager" + 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.in () + TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -38,15 +41,14 @@ main (int argc, char* argv []) ACE_NEW_RETURN (scheduler, TAO_Scheduler (orb.in ()), -1); - RTScheduling::Scheduler_var safe_scheduler = scheduler; - + manager->rtscheduler (scheduler); - CORBA::Object_var current_obj = orb->resolve_initial_references ("RTScheduler_Current" + CORBA::Object_ptr current_obj = orb->resolve_initial_references ("RTScheduler_Current" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - current = RTScheduling::Current::_narrow (current_obj.in () + current = RTScheduling::Current::_narrow (current_obj ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -99,12 +101,11 @@ main (int argc, char* argv []) //Initialize data to be passed to the Thread_Action::do method Data spawn_data; - spawn_data.data = "Harry Potter"; + spawn_data.data = CORBA::string_dup ("Harry Potter"); spawn_data.current = RTScheduling::Current::_duplicate (current.in ()); ACE_DEBUG ((LM_DEBUG, "Spawning a new DT...\n")); - RTScheduling::DistributableThread_var dt = current->spawn (&thread_action, &spawn_data, "Chamber of Secrets", |