From f0a8e8b3b88ad0e2ba7d64e318533f2b2c27c33a Mon Sep 17 00:00:00 2001 From: busch_d Date: Wed, 26 Oct 2005 22:34:17 +0000 Subject: Wed Oct 26 17:22:12 2005 Don Busch This is a footprint reduction fix, eliminating a library dependency. TAO 1.4 introduced a new dependency on the Messaging, Valuetype, PI, and CodecFactory libraries for the CosNaming_Serv and CosEvent_Serv libraries. Turning off CORBA Messaging did not remove this dependency. Thus, any application that uses CosNaming_Serv or CosEvent_Serv, but not CORBA Messaging, depends on those libraries anyway. This change eliminates the CosNaming_Serv and CosEvent_Serv dependencies on Messaging (and thus PI, CodecFactory, and Valuetype) when CORBA Messaging and Interceptors are turned off. It reduces the footprint in that case by about 600K. --- ChangeLog | 20 +++++++++++++++++ TAO/ChangeLog | 25 ++++++++++++++++++++++ TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc | 2 +- TAO/orbsvcs/examples/ORT/ORT.mpc | 2 +- TAO/orbsvcs/orbsvcs/CosEvent.mpc | 2 +- .../CosEvent/CEC_Reactive_ConsumerControl.cpp | 5 +++++ .../CosEvent/CEC_Reactive_Pulling_Strategy.cpp | 3 +++ .../CosEvent/CEC_Reactive_SupplierControl.cpp | 3 +++ TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc | 2 +- TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp | 8 +++++++ TAO/tao/CSD_Framework.mpc | 2 +- bin/MakeProjectCreator/config/event_serv.mpb | 2 +- bin/MakeProjectCreator/config/messaging.mpb | 3 +-- .../config/messaging_optional.mpb | 7 ++++++ bin/MakeProjectCreator/config/naming_serv.mpb | 2 +- 15 files changed, 79 insertions(+), 9 deletions(-) create mode 100644 bin/MakeProjectCreator/config/messaging_optional.mpb diff --git a/ChangeLog b/ChangeLog index a6598ca27e7..14a55560cb3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +Wed Oct 26 17:22:12 2005 Don Busch + + * ace/bin/MakeProjectCreator/config/event_serv.mpb + * ace/bin/MakeProjectCreator/config/messaging.mpb + * ace/bin/MakeProjectCreator/config/messaging_optional.mpb + * ace/bin/MakeProjectCreator/config/naming_serv.mpb + + This is a footprint reduction fix, eliminating a library dependency. + TAO 1.4 introduced a new dependency on the Messaging, Valuetype, + PI, and CodecFactory libraries for the CosNaming_Serv and + CosEvent_Serv libraries. Turning off CORBA Messaging did not remove + this dependency. Thus, any application that uses CosNaming_Serv or + CosEvent_Serv, but not CORBA Messaging, depends on those libraries + anyway. This change eliminates the CosNaming_Serv and CosEvent_Serv + dependencies on Messaging (and thus PI, CodecFactory, and Valuetype) + when CORBA Messaging and Interceptors are turned off. It reduces + the footprint in that case by about 600K. + There is a TAO ChangeLog entry with the same timestamp that + descibes the TAO changes. + Wed Oct 26 12:26:01 2005 Ossama Othman * ace/Codeset_Registry.cpp (locale_to_registry_i): diff --git a/TAO/ChangeLog b/TAO/ChangeLog index e1ebb4befde..1bbc94db1c2 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,28 @@ +Wed Oct 26 17:22:12 2005 Don Busch + + * orbsvcs/CosEvent_Service/CosEvent_Service.mpc + * orbsvcs/examples/ORT/ORT.mpc + * orbsvcs/orbsvcs/CosEvent.mpc + * orbsvcs/orbsvcs/CosNaming_Serv.mpc + * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp + * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp + * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp + * orbsvcs/orbsvcs/Naming/Naming_Server.cpp + * tao/CSD_Framework.mpc + + This is a footprint reduction fix, eliminating a library dependency. + TAO 1.4 introduced a new dependency on the Messaging, Valuetype, + PI, and CodecFactory libraries for the CosNaming_Serv and + CosEvent_Serv libraries. Turning off CORBA Messaging did not remove + this dependency. Thus, any application that uses CosNaming_Serv or + CosEvent_Serv, but not CORBA Messaging, depends on those libraries + anyway. This change eliminates the CosNaming_Serv and CosEvent_Serv + dependencies on Messaging (and thus PI, CodecFactory, and Valuetype) + when CORBA Messaging and Interceptors are turned off. It reduces + the footprint in that case by about 600K. + There is a ACE ChangeLog entry with the same timestamp that + descibes the MPC config file changes. + Wed Oct 26 19:08:12 UTC 2005 Johnny Willemsen * tao/CodecFactory/IOP_Codec_includeA.h: diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc index 2bdb8761528..90263aae047 100644 --- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc +++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project : orbsvcsexe, core, naming, event_serv, svc_utils, iortable, messaging, portableserver { +project : orbsvcsexe, core, naming, event_serv, svc_utils, iortable, messaging_optional, portableserver { exename = CosEvent_Service } diff --git a/TAO/orbsvcs/examples/ORT/ORT.mpc b/TAO/orbsvcs/examples/ORT/ORT.mpc index ebe74844f8d..82fc927aab8 100644 --- a/TAO/orbsvcs/examples/ORT/ORT.mpc +++ b/TAO/orbsvcs/examples/ORT/ORT.mpc @@ -42,7 +42,7 @@ project(*Server) : orbsvcsexe, dynamicinterface, ifr_client, minimum_corba, iori } project(*Client) : orbsvcsexe, event, minimum_corba { - after += *Server + after += *Idl *Server source_files { client.cpp sum_serverC.cpp diff --git a/TAO/orbsvcs/orbsvcs/CosEvent.mpc b/TAO/orbsvcs/orbsvcs/CosEvent.mpc index 3fbee5cf0b8..51c4334ea06 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/CosEvent.mpc @@ -89,7 +89,7 @@ project (CosEvent_Skel) : orbsvcslib, core, minimum_corba, event, portableserver } -project (CosEvent_Serv) : orbsvcslib, core, minimum_corba, event_skel, ec_typed_events_serv, messaging, naming, svc_utils { +project (CosEvent_Serv) : orbsvcslib, core, minimum_corba, event_skel, ec_typed_events_serv, messaging_optional, naming, svc_utils { sharedname = TAO_CosEvent_Serv dynamicflags = TAO_EVENT_SERV_BUILD_DLL tagchecks += CosEvent diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp index 3ac9f33ba07..fba429bf126 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp @@ -18,7 +18,10 @@ #include "orbsvcs/Time_Utilities.h" +#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 #include "tao/Messaging/Messaging.h" +#endif + #include "tao/ORB_Core.h" #include "tao/debug.h" #include "ace/Reactor.h" @@ -43,7 +46,9 @@ TAO_CEC_Reactive_ConsumerControl:: retries_ (retries), adapter_ (this), event_channel_ (ec), +#if defined (TAO_HAS_TYPED_EVENT_CHANNEL) typed_event_channel_ (0), +#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ orb_ (CORBA::ORB::_duplicate (orb)) #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 // Initialise timer_id_ to an invalid timer id, so that in case we don't diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp index bd6bd46f9d7..679e5a2a4bf 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp @@ -8,7 +8,10 @@ #include "orbsvcs/Time_Utilities.h" +#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 #include "tao/Messaging/Messaging.h" +#endif + #include "tao/ORB_Core.h" #include "ace/Reactor.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp index 1c4c713d48e..edf26c332f6 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp @@ -19,7 +19,10 @@ #include "orbsvcs/Time_Utilities.h" +#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 #include "tao/Messaging/Messaging.h" +#endif + #include "tao/ORB_Core.h" #include "ace/Reactor.h" diff --git a/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc b/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc index 02066295e7f..62a2089c52d 100644 --- a/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc +++ b/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(CosNaming_Serv) : orbsvcslib, acememorylib_for_tao, core, naming_skel, messaging, svc_utils, iortable { +project(CosNaming_Serv) : orbsvcslib, acememorylib_for_tao, core, naming_skel, messaging_optional, svc_utils, iortable { sharedname = TAO_CosNaming_Serv dynamicflags = TAO_NAMING_SERV_BUILD_DLL tagchecks += Naming diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp index 8c0b9ee8ee5..16dfc411bcb 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp @@ -13,7 +13,11 @@ #include "tao/ORB_Core.h" #include "tao/IORTable/IORTable.h" + +#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 #include "tao/Messaging/Messaging.h" +#endif + #include "tao/AnyTypeCode/Any.h" #include "ace/Arg_Shifter.h" @@ -648,6 +652,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, ACE_UNUSED_ARG (enable_multicast); #endif /* ACE_HAS_IP_MULTICAST */ +#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 if (use_round_trip_timeout == 1) { TimeBase::TimeT roundTripTimeoutVal = round_trip_timeout; @@ -675,6 +680,9 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, ACE_TRY_CHECK; polList[0] = CORBA::Policy::_nil (); } +#else + ACE_UNUSED_ARG (use_round_trip_timeout); +#endif /* TAO_HAS_CORBA_MESSAGING */ } ACE_CATCHANY { diff --git a/TAO/tao/CSD_Framework.mpc b/TAO/tao/CSD_Framework.mpc index 51aa8cd4736..d04fbd8dae9 100644 --- a/TAO/tao/CSD_Framework.mpc +++ b/TAO/tao/CSD_Framework.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, portableserver, core, pi { +project : taolib, portableserver, core, pi, interceptors { sharedname = TAO_CSD_Framework dynamicflags = TAO_CSD_FW_BUILD_DLL includes += $(TAO_ROOT)/tao diff --git a/bin/MakeProjectCreator/config/event_serv.mpb b/bin/MakeProjectCreator/config/event_serv.mpb index 597dd33abb9..94a97ee7444 100644 --- a/bin/MakeProjectCreator/config/event_serv.mpb +++ b/bin/MakeProjectCreator/config/event_serv.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : orbsvcslib, event_skel, ec_use_typed_events_serv, messaging, naming, svc_utils, minimum_corba { +project : orbsvcslib, event_skel, ec_use_typed_events_serv, messaging_optional, naming, svc_utils, minimum_corba { after += CosEvent_Serv libs += TAO_CosEvent_Serv tagchecks += CosEvent diff --git a/bin/MakeProjectCreator/config/messaging.mpb b/bin/MakeProjectCreator/config/messaging.mpb index 886265898a4..2de4ac8046c 100644 --- a/bin/MakeProjectCreator/config/messaging.mpb +++ b/bin/MakeProjectCreator/config/messaging.mpb @@ -1,7 +1,6 @@ // -*- MPC -*- // $Id$ -project : valuetype, portableserver, pi, corba_messaging { +project : valuetype, portableserver, pi, corba_messaging, messaging_optional { after += Messaging - libs += TAO_Messaging } diff --git a/bin/MakeProjectCreator/config/messaging_optional.mpb b/bin/MakeProjectCreator/config/messaging_optional.mpb new file mode 100644 index 00000000000..16e9d1c8439 --- /dev/null +++ b/bin/MakeProjectCreator/config/messaging_optional.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +feature(corba_messaging) : valuetype, portableserver, pi { + libs += TAO_Messaging +} + diff --git a/bin/MakeProjectCreator/config/naming_serv.mpb b/bin/MakeProjectCreator/config/naming_serv.mpb index 7d94f96732f..1beb907e7dc 100644 --- a/bin/MakeProjectCreator/config/naming_serv.mpb +++ b/bin/MakeProjectCreator/config/naming_serv.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : orbsvcslib, naming_skel, iortable, messaging, svc_utils { +project : orbsvcslib, naming_skel, iortable, messaging_optional, svc_utils { after += CosNaming_Serv libs += TAO_CosNaming_Serv tagchecks += Naming -- cgit v1.2.1