diff options
author | nobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-09-16 21:19:02 +0000 |
---|---|---|
committer | nobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-09-16 21:19:02 +0000 |
commit | 40fdc8a404e75ab03b68cc62e9987cf208fd8c30 (patch) | |
tree | 37d9c4d3abe4aefd8a34ed797883dd2cd4862ca7 /TAO/CIAO/tests/RTCCM | |
parent | c254b281f1b9a4ca19dd0c3ee73a0654a7718909 (diff) | |
download | ATCD-typecode-overhaul.tar.gz |
This commit was manufactured by cvs2svn to create branchtypecode-overhaul
'typecode-overhaul'.
Diffstat (limited to 'TAO/CIAO/tests/RTCCM')
-rw-r--r-- | TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver.mpc | 8 | ||||
-rw-r--r-- | TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender_exec.cpp | 162 |
2 files changed, 72 insertions, 98 deletions
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver.mpc b/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver.mpc index 6397c59a41e..a86285e2534 100644 --- a/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver.mpc +++ b/TAO/CIAO/tests/RTCCM/DiffServ/Receiver/Receiver.mpc @@ -19,8 +19,8 @@ project(DiffServ_Receiver_stub): ciao_client { project(DiffServ_Receiver_svnt) : ciao_servant { after += DiffServ_svnt DiffServ_Receiver_stub - sharedname = DiffServ_Receiver_svnt - libs += DiffServ_Receiver_stub DiffServ_stub DiffServ_svnt + sharedname = DoffServ_Receiver_svnt + libs += Receiver_stub DiffServ_stub DiffServ_svnt idlflags += -Wb,export_macro=RECEIVER_SVNT_Export -Wb,export_include=Receiver_svnt_export.h dynamicflags = RECEIVER_SVNT_BUILD_DLL @@ -43,8 +43,8 @@ project(DiffServ_Receiver_svnt) : ciao_servant { project(DiffServ_Receiver_exec) : ciao_component { after += DiffServ_Receiver_svnt - sharedname = DiffServ_Receiver_exec - libs += DiffServ_Receiver_stub DiffServ_Receiver_svnt DiffServ_stub DiffServ_svnt + sharedname = DoffServ_Receiver_exec + libs += Receiver_stub Receiver_svnt DiffServ_stub DiffServ_svnt idlflags += -Wb,export_macro=RECEIVER_EXEC_Export -Wb,export_include=Receiver_exec_export.h dynamicflags = RECEIVER_EXEC_BUILD_DLL diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender_exec.cpp b/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender_exec.cpp index c63a0d32d2d..b34e2f696b0 100644 --- a/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender_exec.cpp +++ b/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender_exec.cpp @@ -14,100 +14,74 @@ SenderImpl::SenderExec_i::SenderExec_i (void) int argc = 0; char **argv = 0; - ACE_DECLARE_NEW_CORBA_ENV; - - ACE_TRY - { - this->orb_ = - CORBA::ORB_init (argc, - argv, - "" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::Object_var object = - this->orb_->resolve_initial_references ("RTORB" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - RTCORBA::RTORB_var rt_orb = - RTCORBA::RTORB::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); - - ACE_TRY_CHECK; - - RTCORBA::TCPProtocolProperties_var normal_tcp_protocol_properties = - rt_orb->create_tcp_protocol_properties (ACE_DEFAULT_MAX_SOCKET_BUFSIZ, - ACE_DEFAULT_MAX_SOCKET_BUFSIZ, - 1, - 0, - 1, - 0); - - RTCORBA::TCPProtocolProperties_var diffserv_tcp_protocol_properties = - rt_orb->create_tcp_protocol_properties (ACE_DEFAULT_MAX_SOCKET_BUFSIZ, - ACE_DEFAULT_MAX_SOCKET_BUFSIZ, - 1, - 0, - 1, - 1); - - RTCORBA::ProtocolList protocols; - protocols.length (1); - protocols[0].protocol_type = 0; - protocols[0].transport_protocol_properties = - RTCORBA::ProtocolProperties::_duplicate (normal_tcp_protocol_properties.in ()); - protocols[0].orb_protocol_properties = - RTCORBA::ProtocolProperties::_nil (); - - this->normal_policy_list_.length (1); - this->normal_policy_list_[0] = - rt_orb->create_client_protocol_policy (protocols); - - protocols[0].transport_protocol_properties = - RTCORBA::ProtocolProperties::_duplicate (diffserv_tcp_protocol_properties.in ()); - - this->diffserv_policy_list_.length (1); - this->diffserv_policy_list_[0] = - rt_orb->create_client_protocol_policy (protocols); - - object = - this->orb_->resolve_initial_references ("ORBPolicyManager" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - this->policy_manager_ = - CORBA::PolicyManager::_narrow (object.in ()); - - object = - this->orb_->resolve_initial_references ("PolicyCurrent" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - this->policy_current_ = - CORBA::PolicyCurrent::_narrow (object.in ()); - - object = - this->orb_->resolve_initial_references ("NetworkPriorityMappingManager" - ACE_ENV_ARG_PARAMETER); - - ACE_TRY_CHECK; - - RTCORBA::NetworkPriorityMappingManager_var mapping_manager = - RTCORBA::NetworkPriorityMappingManager::_narrow (object.in ()); - - this->custom_network_priority_mapping_ = - new Custom_Network_Priority_Mapping; - - mapping_manager->mapping (this->custom_network_priority_mapping_); - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "(%P|%t) Caught exception in SenderExec_i \n"); - } - ACE_ENDTRY; - ACE_CHECK; + this->orb_ = + CORBA::ORB_init (argc, + argv, + ""); + + CORBA::Object_var object = + this->orb_->resolve_initial_references ("RTORB"); + + RTCORBA::RTORB_var rt_orb = + RTCORBA::RTORB::_narrow (object.in ()); + + RTCORBA::TCPProtocolProperties_var normal_tcp_protocol_properties = + rt_orb->create_tcp_protocol_properties (ACE_DEFAULT_MAX_SOCKET_BUFSIZ, + ACE_DEFAULT_MAX_SOCKET_BUFSIZ, + 1, + 0, + 1, + 0); + + RTCORBA::TCPProtocolProperties_var diffserv_tcp_protocol_properties = + rt_orb->create_tcp_protocol_properties (ACE_DEFAULT_MAX_SOCKET_BUFSIZ, + ACE_DEFAULT_MAX_SOCKET_BUFSIZ, + 1, + 0, + 1, + 1); + + RTCORBA::ProtocolList protocols; + protocols.length (1); + protocols[0].protocol_type = 0; + protocols[0].transport_protocol_properties = + RTCORBA::ProtocolProperties::_duplicate (normal_tcp_protocol_properties.in ()); + protocols[0].orb_protocol_properties = + RTCORBA::ProtocolProperties::_nil (); + + this->normal_policy_list_.length (1); + this->normal_policy_list_[0] = + rt_orb->create_client_protocol_policy (protocols); + + protocols[0].transport_protocol_properties = + RTCORBA::ProtocolProperties::_duplicate (diffserv_tcp_protocol_properties.in ()); + + this->diffserv_policy_list_.length (1); + this->diffserv_policy_list_[0] = + rt_orb->create_client_protocol_policy (protocols); + + object = + this->orb_->resolve_initial_references ("ORBPolicyManager"); + + this->policy_manager_ = + CORBA::PolicyManager::_narrow (object.in ()); + + object = + this->orb_->resolve_initial_references ("PolicyCurrent"); + + this->policy_current_ = + CORBA::PolicyCurrent::_narrow (object.in ()); + + object = + this->orb_->resolve_initial_references ("NetworkPriorityMappingManager"); + + RTCORBA::NetworkPriorityMappingManager_var mapping_manager = + RTCORBA::NetworkPriorityMappingManager::_narrow (object.in ()); + + this->custom_network_priority_mapping_ = + new Custom_Network_Priority_Mapping; + + mapping_manager->mapping (this->custom_network_priority_mapping_); } void |