diff options
Diffstat (limited to 'TAO/orbsvcs/performance-tests/RTEvent')
20 files changed, 45 insertions, 33 deletions
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc index 079da1f50f9..7c40937df34 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc @@ -1,8 +1,9 @@ // $Id$ -project: orbsvcsexe, rtcorbaevent, strategies, minimum_corba { +project: orbsvcsexe, rtcorbaevent, strategies { after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs + avoids += minimum_corba Source_Files { driver.cpp diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc index 8071ce1b8d5..37968d5d018 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc @@ -1,18 +1,20 @@ // $Id$ -project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { +project(*server): orbsvcsexe, rtcorbaevent, strategies { after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs + avoids += minimum_corba Source_Files { server.cpp } } -project(*client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { +project(*client): orbsvcsexe, rtcorbaevent, strategies { after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs + avoids += minimum_corba Source_Files { client.cpp diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc index 21b9f66db74..b30da066e4c 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc @@ -1,8 +1,9 @@ // $Id$ -project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { +project(*server): orbsvcsexe, rtcorbaevent, strategies { after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs + avoids += minimum_corba Source_Files { server.cpp @@ -10,10 +11,11 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { } } -project(*client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { +project(*client): orbsvcsexe, rtcorbaevent, strategies { after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs + avoids += minimum_corba Source_Files { TestC.cpp diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc index b0f8e782677..888b449e615 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc @@ -1,8 +1,9 @@ // $Id$ -project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { +project(*server): orbsvcsexe, rtcorbaevent, strategies { after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs + avoids += minimum_corba Source_Files { server.cpp @@ -11,10 +12,11 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { } } -project(*client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { +project(*client): orbsvcsexe, rtcorbaevent, strategies { after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs + avoids += minimum_corba Source_Files { client.cpp diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc index 431a4fbd726..b19cf565d20 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc @@ -1,18 +1,20 @@ // $Id$ -project(*RTEvent_Server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { +project(*RTEvent_Server): orbsvcsexe, rtcorbaevent, strategies { after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs + avoids += minimum_corba Source_Files { server.cpp } } -project(*RTEvent_Client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { +project(*RTEvent_Client): orbsvcsexe, rtcorbaevent, strategies { after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs + avoids += minimum_corba Source_Files { client.cpp diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp index b07d2c9add2..c61cd9640f8 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp @@ -9,8 +9,8 @@ #include "ORB_Task.h" #include "ORB_Task_Activator.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" #include "tao/PortableServer/PortableServer.h" #include "tao/RTPortableServer/RTPortableServer.h" diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc index b337568bab2..abef2e1dff7 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc @@ -1,18 +1,20 @@ // $Id$ -project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { +project(*server): orbsvcsexe, rtcorbaevent, strategies { after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs + avoids += minimum_corba Source_Files { server.cpp } } -project(*client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { +project(*client): orbsvcsexe, rtcorbaevent, strategies { after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs + avoids += minimum_corba Source_Files { client.cpp diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp index 5fc7489897e..63ff884f656 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp @@ -8,7 +8,7 @@ #include "Consumer.h" #include "Implicit_Deactivator.h" -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" #include "ace/OS_NS_unistd.h" ACE_RCSID (TAO_PERF_RTEC, diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h index 9a982381130..fb105da7511 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h @@ -9,8 +9,8 @@ #define TAO_PERF_RTEC_CONSUMER_H #include "rtec_perf_export.h" -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #include "ace/Sample_History.h" diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp index b35d809551c..86f846853d5 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp @@ -11,7 +11,7 @@ #include "Shutdown.h" #include "Auto_Disconnect.h" -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" #include "ace/High_Res_Timer.h" #include "ace/Sample_History.h" diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h index 0c622a996a8..1c160b0370d 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h @@ -10,7 +10,7 @@ #define TAO_PERF_RTEC_EC_DESTROYER_H #include "rtec_perf_export.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp index 2c3d1f8084e..cb7693306f9 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp @@ -8,7 +8,7 @@ #include "Loopback_Consumer.h" #include "Implicit_Deactivator.h" -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" ACE_RCSID (PERF_RTEC, Loopback_Consumer, diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h index b3e05ea1c10..ba25bc40a16 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h @@ -10,8 +10,8 @@ #include "Loopback_Supplier.h" #include "tao/Utils/Servant_Var.h" -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h index 084c2bd1341..75bfd1cb88f 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h @@ -10,8 +10,8 @@ #define TAO_RTEC_LOOPBACK_SUPPLIER_H #include "rtec_perf_export.h" -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp index 74741e0f8be..906dacdfdcd 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp @@ -15,8 +15,8 @@ #include "Auto_Disconnect.h" #include "Loopback.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Gateway_IIOP.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h" ACE_RCSID (TAO_RTEC_Perf, Peer_Base, diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h index 3733441998b..aaed29be88d 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h @@ -11,7 +11,7 @@ #define TAO_RTEC_PERF_PEER_BASE_H #include "Federated_TestS.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp index 408b52b3557..f5516c30508 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp @@ -9,9 +9,9 @@ #include "RTEC_Initializer.h" #include "RTCORBA_Setup.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" -#include "orbsvcs/Event/EC_RTCORBA_Factory.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h" #include "ace/Dynamic_Service.h" diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc index 2f7c48e06c2..35ee463a899 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc @@ -1,5 +1,6 @@ // $Id$ -project(RTEC_Perf): strategies, messaging, orbsvcslib, rtcorbaevent, rtevent, naming, svc_utils, iortable, rtportableserver, rtcorba, minimum_corba { +project(RTEC_Perf): strategies, messaging, orbsvcslib, rtcorbaevent, rtevent, naming, svc_utils, iortable, rtportableserver, rtcorba { + avoids += minimum_corba sharedname = TAO_RTEC_Perf idlflags += -Wb,export_macro=TAO_RTEC_Perf_Export -Wb,export_include=rtec_perf_export.h dynamicflags += TAO_RTEC_PERF_BUILD_DLL diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp index 4e4260a89f9..096d2f09cbd 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp @@ -8,7 +8,7 @@ #include "Send_Task.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #include "ace/Barrier.h" #include "ace/OS_NS_unistd.h" diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h index 6a04b5f7049..cc3878a8be1 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h @@ -10,8 +10,8 @@ #define TAO_PERF_RTEC_SUPPLIER_H #include "rtec_perf_export.h" -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once |