summaryrefslogtreecommitdiff
path: root/TAO/performance-tests/Throughput
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/performance-tests/Throughput')
-rw-r--r--TAO/performance-tests/Throughput/Receiver.cpp10
-rw-r--r--TAO/performance-tests/Throughput/Receiver.h4
-rw-r--r--TAO/performance-tests/Throughput/Receiver_Factory.cpp8
-rw-r--r--TAO/performance-tests/Throughput/Receiver_Factory.h4
-rw-r--r--TAO/performance-tests/Throughput/client.cpp16
-rw-r--r--TAO/performance-tests/Throughput/server.cpp20
6 files changed, 31 insertions, 31 deletions
diff --git a/TAO/performance-tests/Throughput/Receiver.cpp b/TAO/performance-tests/Throughput/Receiver.cpp
index 05b0fe9a001..79ac824f5d4 100644
--- a/TAO/performance-tests/Throughput/Receiver.cpp
+++ b/TAO/performance-tests/Throughput/Receiver.cpp
@@ -18,7 +18,7 @@ Receiver::Receiver (void)
void
Receiver::receive_data (const Test::Message &the_message
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -45,7 +45,7 @@ Receiver::receive_data (const Test::Message &the_message
}
void
-Receiver::done (TAO_ENV_SINGLE_ARG_DECL)
+Receiver::done (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (this->message_count_ == 0)
@@ -87,12 +87,12 @@ Receiver::done (TAO_ENV_SINGLE_ARG_DECL)
ACE_TRY
{
- PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+ PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
PortableServer::ObjectId_var oid =
- poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+ poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
+ poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY {} ACE_ENDTRY;
diff --git a/TAO/performance-tests/Throughput/Receiver.h b/TAO/performance-tests/Throughput/Receiver.h
index ab15144cacb..8217c7d6505 100644
--- a/TAO/performance-tests/Throughput/Receiver.h
+++ b/TAO/performance-tests/Throughput/Receiver.h
@@ -26,10 +26,10 @@ public:
// = The skeleton methods
virtual void receive_data (const Test::Message &message
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void done (TAO_ENV_SINGLE_ARG_DECL)
+ virtual void done (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/performance-tests/Throughput/Receiver_Factory.cpp b/TAO/performance-tests/Throughput/Receiver_Factory.cpp
index 059a7d3bd6b..c804588b9b6 100644
--- a/TAO/performance-tests/Throughput/Receiver_Factory.cpp
+++ b/TAO/performance-tests/Throughput/Receiver_Factory.cpp
@@ -12,7 +12,7 @@ Receiver_Factory::Receiver_Factory (CORBA::ORB_ptr orb)
}
Test::Receiver_ptr
-Receiver_Factory::create_receiver (TAO_ENV_SINGLE_ARG_DECL)
+Receiver_Factory::create_receiver (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
Receiver *receiver_impl;
@@ -22,12 +22,12 @@ Receiver_Factory::create_receiver (TAO_ENV_SINGLE_ARG_DECL)
ACE_CHECK_RETURN (Test::Receiver::_nil ());
PortableServer::ServantBase_var transfer_ownership(receiver_impl);
- return receiver_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ return receiver_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
}
void
-Receiver_Factory::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Receiver_Factory::shutdown (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+ this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
}
diff --git a/TAO/performance-tests/Throughput/Receiver_Factory.h b/TAO/performance-tests/Throughput/Receiver_Factory.h
index 0b557ad4f09..05ef98836cb 100644
--- a/TAO/performance-tests/Throughput/Receiver_Factory.h
+++ b/TAO/performance-tests/Throughput/Receiver_Factory.h
@@ -25,10 +25,10 @@ public:
Receiver_Factory (CORBA::ORB_ptr orb);
// = The skeleton methods
- virtual Test::Receiver_ptr create_receiver (TAO_ENV_SINGLE_ARG_DECL)
+ virtual Test::Receiver_ptr create_receiver (ACE_ENV_SINGLE_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/performance-tests/Throughput/client.cpp b/TAO/performance-tests/Throughput/client.cpp
index e5ffb8b70fa..9d879e772d0 100644
--- a/TAO/performance-tests/Throughput/client.cpp
+++ b/TAO/performance-tests/Throughput/client.cpp
@@ -64,18 +64,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::Receiver_Factory_var receiver_factory =
- Test::Receiver_Factory::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
+ Test::Receiver_Factory::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (CORBA::is_nil (receiver_factory.in ()))
@@ -100,18 +100,18 @@ main (int argc, char *argv[])
message.the_payload.length (message_size);
Test::Receiver_var receiver =
- receiver_factory->create_receiver (TAO_ENV_SINGLE_ARG_PARAMETER);
+ receiver_factory->create_receiver (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
ACE_hrtime_t start = ACE_OS::gethrtime ();
for (int i = 0; i != message_count; ++i)
{
message.message_id = i;
- receiver->receive_data (message TAO_ENV_ARG_PARAMETER);
+ receiver->receive_data (message ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
- receiver->done (TAO_ENV_SINGLE_ARG_PARAMETER);
+ receiver->done (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
ACE_hrtime_t elapsed_time = ACE_OS::gethrtime () - start;
@@ -140,11 +140,11 @@ main (int argc, char *argv[])
if (do_shutdown)
{
- receiver_factory->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+ receiver_factory->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_CATCHANY
diff --git a/TAO/performance-tests/Throughput/server.cpp b/TAO/performance-tests/Throughput/server.cpp
index 467c3cbe003..68afc375a0d 100644
--- a/TAO/performance-tests/Throughput/server.cpp
+++ b/TAO/performance-tests/Throughput/server.cpp
@@ -39,11 +39,11 @@ 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;
if (CORBA::is_nil (poa_object.in ()))
@@ -52,11 +52,11 @@ main (int argc, char *argv[])
1);
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;
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 receiver_factory_owner_transfer(receiver_factory_impl);
Test::Receiver_Factory_var receiver_factory =
- receiver_factory_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ receiver_factory_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
CORBA::String_var ior =
- orb->object_to_string (receiver_factory.in () TAO_ENV_ARG_PARAMETER);
+ orb->object_to_string (receiver_factory.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
// If the ior_output_file exists, output the ior to it
@@ -86,18 +86,18 @@ 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;
- orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+ orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "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