diff options
Diffstat (limited to 'TAO/performance-tests')
10 files changed, 55 insertions, 12 deletions
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp index 5cd76fa46b3..0a13e813d60 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp @@ -217,8 +217,13 @@ Cubit_Task::create_servants (void) // to stdout. Someone will take that string and give it to // some client. Then release the object. + PortableServer::ObjectId_var id_act = + poa->activate_object (this->servants_[i]); + + CORBA::Object_var object_act = poa->id_to_reference (id_act.in ()); + Cubit_var cubit = - this->servants_[i]->_this (); + Cubit::_narrow (object_act.in ()); CORBA::String_var str = diff --git a/TAO/performance-tests/Latency/Single_Threaded/server.cpp b/TAO/performance-tests/Latency/Single_Threaded/server.cpp index 1e5b9bb067f..d779b7f755a 100644 --- a/TAO/performance-tests/Latency/Single_Threaded/server.cpp +++ b/TAO/performance-tests/Latency/Single_Threaded/server.cpp @@ -90,8 +90,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(roundtrip_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (roundtrip_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Roundtrip_var roundtrip = - roundtrip_impl->_this (); + Test::Roundtrip::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (roundtrip.in ()); diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp index 5545b3a0fa4..c159645d6ab 100644 --- a/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp +++ b/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp @@ -90,8 +90,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(roundtrip_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (roundtrip_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Roundtrip_var roundtrip = - roundtrip_impl->_this (); + Test::Roundtrip::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (roundtrip.in ()); diff --git a/TAO/performance-tests/Latency/Thread_Pool/server.cpp b/TAO/performance-tests/Latency/Thread_Pool/server.cpp index e2fe122c00e..7219b6d4736 100644 --- a/TAO/performance-tests/Latency/Thread_Pool/server.cpp +++ b/TAO/performance-tests/Latency/Thread_Pool/server.cpp @@ -91,8 +91,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(roundtrip_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (roundtrip_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Roundtrip_var roundtrip = - roundtrip_impl->_this (); + Test::Roundtrip::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (roundtrip.in ()); diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp index f3945c14ae4..15875f51c2b 100644 --- a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp +++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp @@ -377,7 +377,10 @@ main (int argc, char **argv) for (i = 0; i < iterations; i++) { - objects[i] = servants[i]._this (); + PortableServer::ObjectId_var id = + root_poa->activate_object (&servants[i]); + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + objects[i] = test::_narrow (object.in ()); } } diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp index 9d14fe6f957..f6b95c7bada 100644 --- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp @@ -90,8 +90,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(roundtrip_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (roundtrip_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Roundtrip_var roundtrip = - roundtrip_impl->_this (); + Test::Roundtrip::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (roundtrip.in ()); diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp index 5545b3a0fa4..c159645d6ab 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp @@ -90,8 +90,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(roundtrip_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (roundtrip_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Roundtrip_var roundtrip = - roundtrip_impl->_this (); + Test::Roundtrip::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (roundtrip.in ()); diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp index 86ab5121e98..6e48e7f464f 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp @@ -91,8 +91,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(roundtrip_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (roundtrip_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Roundtrip_var roundtrip = - roundtrip_impl->_this (); + Test::Roundtrip::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (roundtrip.in ()); diff --git a/TAO/performance-tests/Throughput/Throughput.mpc b/TAO/performance-tests/Throughput/Throughput.mpc index e0baa06c094..febd63f91ed 100644 --- a/TAO/performance-tests/Throughput/Throughput.mpc +++ b/TAO/performance-tests/Throughput/Throughput.mpc @@ -1,14 +1,14 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { +project(*idl): taoidldefaults, avoids_corba_e_compact { IDL_Files { Test.idl } custom_only = 1 } -project(*server): taoserver, strategies { +project(*server): taoserver, strategies, avoids_corba_e_compact { after += *idl Source_Files { TestC.cpp @@ -21,7 +21,7 @@ project(*server): taoserver, strategies { } } -project(*client): taoclient, strategies { +project(*client): taoclient, strategies, avoids_corba_e_compact { after += *idl Source_Files { TestC.cpp diff --git a/TAO/performance-tests/Throughput/server.cpp b/TAO/performance-tests/Throughput/server.cpp index aa4c0cbab90..87ca6634d03 100644 --- a/TAO/performance-tests/Throughput/server.cpp +++ b/TAO/performance-tests/Throughput/server.cpp @@ -64,8 +64,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var receiver_factory_owner_transfer(receiver_factory_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (receiver_factory_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Receiver_Factory_var receiver_factory = - receiver_factory_impl->_this (); + Test::Receiver_Factory::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (receiver_factory.in ()); |