summaryrefslogtreecommitdiff
path: root/TAO/tests/MT_Timeout
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/MT_Timeout')
-rw-r--r--TAO/tests/MT_Timeout/Client_Task.cpp22
-rw-r--r--TAO/tests/MT_Timeout/Client_Task.h6
-rw-r--r--TAO/tests/MT_Timeout/Server_Task.cpp4
-rw-r--r--TAO/tests/MT_Timeout/Sleep_Service.cpp6
-rw-r--r--TAO/tests/MT_Timeout/Sleep_Service.h4
-rw-r--r--TAO/tests/MT_Timeout/client.cpp12
-rw-r--r--TAO/tests/MT_Timeout/server.cpp18
7 files changed, 36 insertions, 36 deletions
diff --git a/TAO/tests/MT_Timeout/Client_Task.cpp b/TAO/tests/MT_Timeout/Client_Task.cpp
index 5bf38b970dd..cc078fe6cc9 100644
--- a/TAO/tests/MT_Timeout/Client_Task.cpp
+++ b/TAO/tests/MT_Timeout/Client_Task.cpp
@@ -46,22 +46,22 @@ Client_Task::too_big_difference_calls (void) const
int
Client_Task::svc (void)
{
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
int successful_calls = 0;
int timed_out_calls = 0;
ACE_TRY
{
- this->validate_connection (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
CORBA::Object_var object =
this->orb_->resolve_initial_references ("PolicyCurrent"
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
CORBA::PolicyCurrent_var policy_current =
- CORBA::PolicyCurrent::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+ CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
TimeBase::TimeT timeout_period = 10 * this->timeout_;
@@ -74,17 +74,17 @@ Client_Task::svc (void)
policy_list[0] =
this->orb_->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
timeout_as_any
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
policy_current->set_policy_overrides (policy_list,
CORBA::ADD_OVERRIDE
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
for (int i = 0; i != this->iterations_; ++i)
{
- int retval = this->one_iteration (TAO_ENV_SINGLE_ARG_PARAMETER);
+ int retval = this->one_iteration (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
if (retval == 1)
@@ -118,13 +118,13 @@ Client_Task::svc (void)
}
void
-Client_Task::validate_connection (TAO_ENV_SINGLE_ARG_DECL)
+Client_Task::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_TRY
{
for (int i = 0; i != 100; ++i)
{
- (void) this->sleep_service_->go_to_sleep (0 TAO_ENV_ARG_PARAMETER);
+ (void) this->sleep_service_->go_to_sleep (0 ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
}
@@ -137,14 +137,14 @@ Client_Task::validate_connection (TAO_ENV_SINGLE_ARG_DECL)
}
int
-Client_Task::one_iteration (TAO_ENV_SINGLE_ARG_DECL)
+Client_Task::one_iteration (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_TRY
{
ACE_Time_Value start = ACE_OS::gettimeofday ();
this->sleep_service_->go_to_sleep (this->sleep_time_
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
ACE_Time_Value end = ACE_OS::gettimeofday ();
diff --git a/TAO/tests/MT_Timeout/Client_Task.h b/TAO/tests/MT_Timeout/Client_Task.h
index 8b9ef41cc0e..6bc79a6c3ed 100644
--- a/TAO/tests/MT_Timeout/Client_Task.h
+++ b/TAO/tests/MT_Timeout/Client_Task.h
@@ -46,7 +46,7 @@ public:
/// Return the total number of timed out calls
int timed_out_calls (void) const;
- /// Return the number of calls with a too huge difference in
+ /// Return the number of calls with a too huge difference in
/// timeout versus actual response arrival.
int too_big_difference_calls (void) const;
@@ -55,10 +55,10 @@ public:
private:
/// Run one iteration of the test
- int one_iteration (TAO_ENV_SINGLE_ARG_DECL);
+ int one_iteration (ACE_ENV_SINGLE_ARG_DECL);
/// Make sure that the thread has a connection available
- void validate_connection (TAO_ENV_SINGLE_ARG_DECL);
+ void validate_connection (ACE_ENV_SINGLE_ARG_DECL);
private:
/// A reference to the ORB
diff --git a/TAO/tests/MT_Timeout/Server_Task.cpp b/TAO/tests/MT_Timeout/Server_Task.cpp
index 34c76abd7bf..863f5f50c64 100644
--- a/TAO/tests/MT_Timeout/Server_Task.cpp
+++ b/TAO/tests/MT_Timeout/Server_Task.cpp
@@ -18,10 +18,10 @@ Server_Task::Server_Task (ACE_Thread_Manager *thr_mgr,
int
Server_Task::svc (void)
{
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- this->orb_->run (this->running_time_ TAO_ENV_ARG_PARAMETER);
+ this->orb_->run (this->running_time_ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
diff --git a/TAO/tests/MT_Timeout/Sleep_Service.cpp b/TAO/tests/MT_Timeout/Sleep_Service.cpp
index 0650e317c9e..b234cb0feb0 100644
--- a/TAO/tests/MT_Timeout/Sleep_Service.cpp
+++ b/TAO/tests/MT_Timeout/Sleep_Service.cpp
@@ -12,7 +12,7 @@ Sleep_Service::Sleep_Service (CORBA::ORB_ptr orb)
void
Sleep_Service::go_to_sleep (CORBA::ULong microseconds
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::ULong secs = microseconds / 1000000;
@@ -23,9 +23,9 @@ Sleep_Service::go_to_sleep (CORBA::ULong microseconds
}
void
-Sleep_Service::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Sleep_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_DEBUG ((LM_DEBUG, "Shutting down the ORB\n"));
- this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+ this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
}
diff --git a/TAO/tests/MT_Timeout/Sleep_Service.h b/TAO/tests/MT_Timeout/Sleep_Service.h
index b25ddd7a66d..8742185553f 100644
--- a/TAO/tests/MT_Timeout/Sleep_Service.h
+++ b/TAO/tests/MT_Timeout/Sleep_Service.h
@@ -26,10 +26,10 @@ public:
// = The skeleton methods
virtual void go_to_sleep (CORBA::ULong microseconds
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+ virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/tests/MT_Timeout/client.cpp b/TAO/tests/MT_Timeout/client.cpp
index e8b3e285b7c..c2a1eae4ab6 100644
--- a/TAO/tests/MT_Timeout/client.cpp
+++ b/TAO/tests/MT_Timeout/client.cpp
@@ -51,18 +51,18 @@ main (int argc, char *argv[])
ACE_TRY_NEW_ENV
{
CORBA::ORB_var orb =
- CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+ CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (parse_args (argc, argv) != 0)
return 1;
CORBA::Object_var tmp =
- orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
+ orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
Test::Sleep_Service_var sleep_service =
- Test::Sleep_Service::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
+ Test::Sleep_Service::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (CORBA::is_nil (sleep_service.in ()))
@@ -95,13 +95,13 @@ main (int argc, char *argv[])
ACE_Thread_Manager::instance ()->wait ();
// Get back in sync with the server..
- sleep_service->go_to_sleep (0 TAO_ENV_ARG_PARAMETER);
+ sleep_service->go_to_sleep (0 ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- sleep_service->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+ sleep_service->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
- orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+ orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/MT_Timeout/server.cpp b/TAO/tests/MT_Timeout/server.cpp
index 2b60e0c130d..0f95a9e7194 100644
--- a/TAO/tests/MT_Timeout/server.cpp
+++ b/TAO/tests/MT_Timeout/server.cpp
@@ -39,15 +39,15 @@ main (int argc, char *argv[])
ACE_TRY_NEW_ENV
{
CORBA::ORB_var orb =
- CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+ CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
CORBA::Object_var poa_object =
- orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+ orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
PortableServer::POA_var root_poa =
- PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+ PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (CORBA::is_nil (root_poa.in ()))
@@ -56,7 +56,7 @@ main (int argc, char *argv[])
1);
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+ root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
if (parse_args (argc, argv) != 0)
@@ -69,11 +69,11 @@ main (int argc, char *argv[])
PortableServer::ServantBase_var owner_transfer(sleep_service_impl);
Test::Sleep_Service_var process =
- sleep_service_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ sleep_service_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
CORBA::String_var ior =
- orb->object_to_string (process.in () TAO_ENV_ARG_PARAMETER);
+ orb->object_to_string (process.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
// If the ior_output_file exists, output the ior to it
@@ -86,7 +86,7 @@ main (int argc, char *argv[])
ACE_OS::fprintf (output_file, "%s", ior.in ());
ACE_OS::fclose (output_file);
- poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+ poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
Server_Task server_task (ACE_Thread_Manager::instance (),
@@ -102,10 +102,10 @@ main (int argc, char *argv[])
ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
- root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+ root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+ orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
View Lorry Controller Status