diff options
65 files changed, 1555 insertions, 3183 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 6db31ca09b8..38b0f6744a7 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,94 @@ +Fri Mar 5 15:12:00 1999 Carlos O'Ryan <coryan@cs.wustl.edu> + + * orbsvcs/orbsvcs/Event/EC_Null_Factory.h: + * orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp: + * orbsvcs/orbsvcs/Event/EC_Event_Channel.h: + * orbsvcs/orbsvcs/Event/EC_Event_Channel.i: + * orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp: + * orbsvcs/orbsvcs/Event/EC_Basic_Factory.h: + * orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp: + * orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h: + * orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.i: + * orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp: + * orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h: + * orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.i: + * orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp: + * orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h: + * orbsvcs/orbsvcs/Event/EC_Timeout_Filter.i: + * orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp: + * orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h: + * orbsvcs/orbsvcs/Event/EC_Timeout_Generator.i: + * orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp: + Added support for timeout events, including a simple + Timeout_Generator based on the ORB's reactor. + + * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.i: + * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i: + * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp: + * orbsvcs/orbsvcs/Event/EC_ProxySupplier.i: + * orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp: + Fixed several problems with g++ 2.7.2.X; thanks to David Levine + for reporting them. + + * orbsvcs/tests/Makefile: + Added a bunch of missing directories to the list. + + * orbsvcs/tests/EC_Mcast/EC_Mcast.cpp: + * orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp: + The Event2 service is compiled by default, not need to check for + it. + + * orbsvcs/Event_Service/Event_Service.h: + * orbsvcs/Event_Service/Event_Service.cpp: + Added support for the new EC implementation. + + * tao/append.cpp: + * tao/decode.cpp: + * tao/deep_free.cpp: + * tao/encode.cpp: + * tao/skip.cpp: + The debug messages are only be printed out if TAO_debug_level is + greater than 0. + Also fixed many of them. + + * orbsvcs/Event_Service/Makefile: + * orbsvcs/ImplRepo_Service/Makefile: + * orbsvcs/tests/EC_Mcast/Makefile: + * orbsvcs/tests/EC_Throughput/Makefile: + * orbsvcs/tests/CosEC_Multiple/Makefile: + * orbsvcs/tests/Property/Makefile: + * orbsvcs/tests/Sched/Makefile: + * orbsvcs/tests/Sched_Conf/Makefile: + Updated dependencies. + + * orbsvcs/tests/ImplRepo/Makefile: + Fixed the Makefile so it would compile. + + * orbsvcs/tests/ImplRepo/airplane_client_i.cpp: + Fixed memory leak. + + * orbsvcs/orbsvcs/Event/EC_Busy_Lock.h: + * orbsvcs/orbsvcs/Event/EC_Command.h: + * orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h: + * orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h: + * orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h: + * orbsvcs/orbsvcs/Event/EC_Dispatching.h: + * orbsvcs/orbsvcs/Event/EC_Factory.h: + * orbsvcs/orbsvcs/Event/EC_Filter.h: + * orbsvcs/orbsvcs/Event/EC_Filter_Builder.h: + * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h: + * orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h: + * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h: + * orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.h: + * orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set_T.h: + * orbsvcs/orbsvcs/Event/EC_ProxySupplier.h: + * orbsvcs/orbsvcs/Event/EC_QOS_Info.h: + * orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h: + * orbsvcs/orbsvcs/Event/EC_Type_Filter.h: + * orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp: + * orbsvcs/tests/ImplRepo/IR_Helper.cpp: + Minor cosmetic changes. + Fri Mar 05 12:51:08 1999 David L. Levine <levine@cs.wustl.edu> * rules.tao.GNU: replaced -Wno-used for g++, but just for diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp index 33ad346afb4..f7d80d26207 100644 --- a/TAO/orbsvcs/Event_Service/Event_Service.cpp +++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp @@ -11,6 +11,10 @@ #include "orbsvcs/Event/Module_Factory.h" #include "orbsvcs/Event/Event_Channel.h" +#include "orbsvcs/Event/EC_Null_Factory.h" +#include "orbsvcs/Event/EC_Basic_Factory.h" +#include "orbsvcs/Event/EC_Event_Channel.h" + ACE_RCSID(Event_Service, Event_Service, "$Id$") int main (int argc, char *argv[]) @@ -23,6 +27,7 @@ int main (int argc, char *argv[]) Event_Service::Event_Service (void) : module_factory_ (0), + factory_ (0), sched_impl_ (0), ec_impl_ (0), service_name_ (0), @@ -39,6 +44,8 @@ Event_Service::~Event_Service (void) this->ec_impl_ = 0; delete this->sched_impl_; this->sched_impl_ = 0; + delete this->factory_; + this->factory_ = 0; delete this->module_factory_; this->module_factory_ = 0; } @@ -90,8 +97,8 @@ Event_Service::run (int argc, char* argv[]) schedule_name[0].id = CORBA::string_dup ("ScheduleService"); - if (this->event_service_type_ == ES_OLD_REACTIVE - || this->event_service_type_ == ES_OLD_MT) + if (1) // this->event_service_type_ == ES_OLD_REACTIVE + // || this->event_service_type_ == ES_OLD_MT) { // We must find the scheduler object reference... @@ -111,10 +118,10 @@ Event_Service::run (int argc, char* argv[]) } else { - CORBA::Object_var tmp = + CORBA::Object_var tmp = naming_context->resolve (schedule_name, ACE_TRY_ENV); ACE_TRY_CHECK; - + scheduler = RtecScheduler::Scheduler::_narrow (tmp.in (), ACE_TRY_ENV); ACE_TRY_CHECK; @@ -124,11 +131,35 @@ Event_Service::run (int argc, char* argv[]) switch (this->event_service_type_) { case ES_NULL_FILTERING: + { + ACE_NEW_RETURN (this->factory_, + TAO_EC_Null_Factory (root_poa.in ()), + 1); + TAO_EC_Event_Channel* ec; + ACE_NEW_RETURN (ec, + TAO_EC_Event_Channel (this->factory_), + 1); + this->ec_impl_ = ec; + ec->activate (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + break; + case ES_REACTIVE: - ACE_ERROR_RETURN ((LM_ERROR, - "The new EC is still unsupported\n"), + { + ACE_NEW_RETURN (this->factory_, + TAO_EC_Basic_Factory (root_poa.in ()), 1); + TAO_EC_Event_Channel* ec; + ACE_NEW_RETURN (ec, + TAO_EC_Event_Channel (this->factory_), + 1); + this->ec_impl_ = ec; + ec->activate (ACE_TRY_ENV); + ACE_TRY_CHECK; + } break; + case ES_OLD_REACTIVE: { ACE_NEW_RETURN (this->module_factory_, @@ -147,7 +178,7 @@ Event_Service::run (int argc, char* argv[]) ACE_NEW_RETURN (this->module_factory_, TAO_Default_Module_Factory, 1); - + ACE_NEW_RETURN (this->ec_impl_, ACE_EventChannel (scheduler.in (), 1, @@ -155,7 +186,7 @@ Event_Service::run (int argc, char* argv[]) this->module_factory_), 1); } - + break; } diff --git a/TAO/orbsvcs/Event_Service/Event_Service.h b/TAO/orbsvcs/Event_Service/Event_Service.h index 2de7e1362ea..1d0f8351043 100644 --- a/TAO/orbsvcs/Event_Service/Event_Service.h +++ b/TAO/orbsvcs/Event_Service/Event_Service.h @@ -19,6 +19,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ class TAO_Module_Factory; +class TAO_EC_Factory; class Event_Service : public POA_RtecEventChannelAdmin::EventChannel { @@ -67,6 +68,9 @@ private: TAO_Module_Factory *module_factory_; // The module factory for the EC. + TAO_EC_Factory *factory_; + // The factory for the new EC. + POA_RtecScheduler::Scheduler *sched_impl_; // The Scheduler implementation. diff --git a/TAO/orbsvcs/ImplRepo_Service/Makefile b/TAO/orbsvcs/ImplRepo_Service/Makefile index cf197fdc574..01092942198 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Makefile +++ b/TAO/orbsvcs/ImplRepo_Service/Makefile @@ -109,7 +109,8 @@ realclean: clean $(ACE_ROOT)/ace/Read_Buffer.i \ $(ACE_ROOT)/ace/Process.h \ $(ACE_ROOT)/ace/Process.i \ - $(TAO_ROOT)/tao/IIOP_Profile.h + $(TAO_ROOT)/tao/IIOP_Profile.h \ + $(TAO_ROOT)/tao/IIOP_Profile.i .obj/Repository.o .obj/Repository.so .shobj/Repository.o .shobj/Repository.so: Repository.cpp Repository.h \ $(ACE_ROOT)/ace/Naming_Context.h \ $(ACE_ROOT)/ace/ACE.h \ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp index 872bf6c6b75..b709323b563 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp @@ -10,7 +10,7 @@ #include "EC_SupplierFiltering.h" #include "EC_ObserverStrategy.h" #include "EC_ProxyPushSupplier_Set_T.h" -#include "Timer_Module.h" +#include "EC_Reactive_Timeout_Generator.h" #if ! defined (__ACE_INLINE__) #include "EC_Basic_Factory.i" @@ -37,9 +37,9 @@ TAO_EC_Basic_Factory::destroy_dispatching (TAO_EC_Dispatching *x) } TAO_EC_Filter_Builder* -TAO_EC_Basic_Factory::create_filter_builder (TAO_EC_Event_Channel *) +TAO_EC_Basic_Factory::create_filter_builder (TAO_EC_Event_Channel *ec) { - return new TAO_EC_Basic_Filter_Builder; + return new TAO_EC_Basic_Filter_Builder (ec); } void @@ -100,16 +100,16 @@ TAO_EC_Basic_Factory::destroy_proxy_push_consumer (TAO_EC_ProxyPushConsumer *x) delete x; } -TAO_EC_Timer_Module* -TAO_EC_Basic_Factory::create_timer_module (TAO_EC_Event_Channel *ec) +TAO_EC_Timeout_Generator* +TAO_EC_Basic_Factory::create_timeout_generator (TAO_EC_Event_Channel *ec) { // @@ TODO fixme TAO_ORB_Core* orb_core = TAO_ORB_Core_instance (); - return new TAO_EC_ST_Timer_Module (orb_core->reactor ()); + return new TAO_EC_Reactive_Timeout_Generator (orb_core->reactor ()); } void -TAO_EC_Basic_Factory::destroy_timer_module (TAO_EC_Timer_Module *x) +TAO_EC_Basic_Factory::destroy_timeout_generator (TAO_EC_Timeout_Generator *x) { delete x; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h index 138ab93c7a0..3cd157436d8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h @@ -12,10 +12,6 @@ // = AUTHOR // Carlos O'Ryan (coryan@cs.wustl.edu) // -// = DESCRIPTION -// A factory for a basic event channel: it provides filtering and -// correlation, but only at the consumer level. -// // = CREDITS // Based on previous work by Tim Harrison (harrison@cs.wustl.edu) // and other members of the DOC group. @@ -86,10 +82,10 @@ public: create_proxy_push_consumer (TAO_EC_Event_Channel*); virtual void destroy_proxy_push_consumer (TAO_EC_ProxyPushConsumer*); - virtual TAO_EC_Timer_Module* - create_timer_module (TAO_EC_Event_Channel*); + virtual TAO_EC_Timeout_Generator* + create_timeout_generator (TAO_EC_Event_Channel*); virtual void - destroy_timer_module (TAO_EC_Timer_Module*); + destroy_timeout_generator (TAO_EC_Timeout_Generator*); virtual TAO_EC_ObserverStrategy* create_observer_strategy (TAO_EC_Event_Channel*); virtual void diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp index de935dc5272..ce09012eb3d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp @@ -5,6 +5,7 @@ #include "EC_Type_Filter.h" #include "EC_Conjunction_Filter.h" #include "EC_Disjunction_Filter.h" +#include "EC_Timeout_Filter.h" #if ! defined (__ACE_INLINE__) #include "EC_Basic_Filter_Builder.i" @@ -58,6 +59,15 @@ TAO_EC_Basic_Filter_Builder:: } return new TAO_EC_Disjunction_Filter (children, n); } + else if (e.header.type == ACE_ES_EVENT_INTERVAL_TIMEOUT + || e.header.type == ACE_ES_EVENT_DEADLINE_TIMEOUT) + { + pos++; + TAO_EC_QOS_Info qos_info; + return new TAO_EC_Timeout_Filter (this->event_channel_, + qos_info, + e.header.creation_time); + } return new TAO_EC_Type_Filter (e.header); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h index 5f2d446d7b5..d97170906eb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h @@ -12,9 +12,6 @@ // = AUTHOR // Carlos O'Ryan (coryan@cs.wustl.edu) // -// = DESCRIPTION -// Filter builder to the basic filters. -// // = CREDITS // Based on previous work by Tim Harrison (harrison@cs.wustl.edu) // and other members of the DOC group. @@ -35,6 +32,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ class TAO_EC_Filter; +class TAO_EC_Event_Channel; class TAO_ORBSVCS_Export TAO_EC_Basic_Filter_Builder : public TAO_EC_Filter_Builder { @@ -47,7 +45,7 @@ class TAO_ORBSVCS_Export TAO_EC_Basic_Filter_Builder : public TAO_EC_Filter_Buil // are constructed using this class. // public: - TAO_EC_Basic_Filter_Builder (void); + TAO_EC_Basic_Filter_Builder (TAO_EC_Event_Channel* ec); // constructor. virtual ~TAO_EC_Basic_Filter_Builder (void); @@ -65,6 +63,10 @@ private: CORBA::ULong pos) const; // Count the number of children of the current node, i.e. until a // conjunction or disjunction starts. + +private: + TAO_EC_Event_Channel* event_channel_; + // The event channel. }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.i b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.i index d62386e9259..3ee17166869 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.i @@ -1,6 +1,8 @@ // $Id$ ACE_INLINE -TAO_EC_Basic_Filter_Builder::TAO_EC_Basic_Filter_Builder (void) +TAO_EC_Basic_Filter_Builder:: + TAO_EC_Basic_Filter_Builder (TAO_EC_Event_Channel *ec) + : event_channel_ (ec) { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h index 09cda19b37d..1f36fdb6fc3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h @@ -12,11 +12,6 @@ // = AUTHOR // Carlos O'Ryan (coryan@cs.wustl.edu) // -// = DESCRIPTION -// Implement the RtecEventChannelAdmin::ConsumerAdmin interface. -// This class is an Abstract Factory for the -// TAO_EC_ProxyPushSupplier. -// // = CREDITS // Based on previous work by Tim Harrison (harrison@cs.wustl.edu) // and other members of the DOC group. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Command.h b/TAO/orbsvcs/orbsvcs/Event/EC_Command.h index 9ef25e1d800..c32e4ad3b34 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Command.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Command.h @@ -12,11 +12,6 @@ // = AUTHOR // Carlos O'Ryan (coryan@cs.wustl.edu) // -// = DESCRIPTION -// Implement the Command objects for the delayed operations in the -// manipulation of EC_ProxyPushSupplier and EC_ProxyPushConsumer -// sets. -// // = CREDITS // Based on previous work by Tim Harrison (harrison@cs.wustl.edu) // and other members of the DOC group. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h index 28774dcf387..29b4c11c634 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h @@ -12,10 +12,6 @@ // = AUTHOR // Carlos O'Ryan (coryan@cs.wustl.edu) // -// = DESCRIPTION -// A per-consumer filter that accepts events from a set of -// children. -// // = CREDITS // Based on previous work by Tim Harrison (harrison@cs.wustl.edu) // and other members of the DOC group. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h index bf447bafcc8..7fdf340e443 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h @@ -12,10 +12,6 @@ // = AUTHOR // Carlos O'Ryan (coryan@cs.wustl.edu) // -// = DESCRIPTION -// Define the interface for the RtecEventChannelAdmin::ConsumerAdmin -// implementations. -// // = CREDITS // Based on previous work by Tim Harrison (harrison@cs.wustl.edu) // and other members of the DOC group. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h index ec1a8b02dc3..6a6cbbebfc9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h @@ -12,10 +12,6 @@ // = AUTHOR // Carlos O'Ryan (coryan@cs.wustl.edu) // -// = DESCRIPTION -// A per-consumer filter that accepts events from a set of -// children. -// // = CREDITS // Based on previous work by Tim Harrison (harrison@cs.wustl.edu) // and other members of the DOC group. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h index 0e438df9de0..8b99ed935cb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h @@ -12,14 +12,6 @@ // = AUTHOR // Carlos O'Ryan (coryan@cs.wustl.edu) // -// = DESCRIPTION -// The dispatching strategies. -// The EC may be configured with different dispatching strategies, -// for instance, it can use a pool of threads to dispatch the -// events, or a set of queues with threads at different priorities -// for each queue or can simply push the event to the consumer in -// FIFO order. -// // = CREDITS // Based on previous work by Tim Harrison (harrison@cs.wustl.edu) // and other members of the DOC group. @@ -48,7 +40,12 @@ class TAO_ORBSVCS_Export TAO_EC_Dispatching // Abstract base class for the dispatching strategies. // // = DESCRIPTION - // Defines the dispatching strategy interface. + // The dispatching strategies. + // The EC may be configured with different dispatching strategies, + // for instance, it can use a pool of threads to dispatch the + // events, or a set of queues with threads at different priorities + // for each queue or can simply push the event to the consumer in + // FIFO order. // public: virtual ~TAO_EC_Dispatching (void); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp index 45944cb9bd7..053b2054fc1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp @@ -5,7 +5,7 @@ #include "EC_Dispatching.h" #include "EC_ConsumerAdmin.h" #include "EC_SupplierAdmin.h" -#include "Timer_Module.h" +#include "EC_Timeout_Generator.h" #include "EC_ObserverStrategy.h" #if ! defined (__ACE_INLINE__) @@ -27,8 +27,8 @@ TAO_EC_Event_Channel::TAO_EC_Event_Channel (TAO_EC_Factory* factory) this->factory_->create_consumer_admin (this); this->supplier_admin_ = this->factory_->create_supplier_admin (this); - this->timer_module_ = - this->factory_->create_timer_module (this); + this->timeout_generator_ = + this->factory_->create_timeout_generator (this); this->observer_strategy_ = this->factory_->create_observer_strategy (this); } @@ -43,8 +43,8 @@ TAO_EC_Event_Channel::~TAO_EC_Event_Channel (void) this->consumer_admin_ = 0; this->factory_->destroy_supplier_admin (this->supplier_admin_); this->supplier_admin_ = 0; - this->factory_->destroy_timer_module (this->timer_module_); - this->timer_module_ = 0; + this->factory_->destroy_timeout_generator (this->timeout_generator_); + this->timeout_generator_ = 0; this->factory_->destroy_observer_strategy (this->observer_strategy_); this->observer_strategy_ = 0; } @@ -53,7 +53,7 @@ void TAO_EC_Event_Channel::activate (CORBA::Environment& ACE_TRY_ENV) { this->dispatching_->activate (); - this->timer_module_->activate (); + this->timeout_generator_->activate (); PortableServer::POA_var supplier_poa = this->factory_->supplier_poa (ACE_TRY_ENV); @@ -70,7 +70,7 @@ void TAO_EC_Event_Channel::shutdown (CORBA::Environment& ACE_TRY_ENV) { this->dispatching_->shutdown (); - this->timer_module_->shutdown (); + this->timeout_generator_->shutdown (); PortableServer::POA_var consumer_poa = this->consumer_admin_->_default_POA (ACE_TRY_ENV); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h index 17b715237ee..a68171f1d80 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h @@ -77,7 +77,7 @@ public: // Access the supplier admin implementation, useful for controlling // the activation... - TAO_EC_Timer_Module* timer_module (void) const; + TAO_EC_Timeout_Generator* timeout_generator (void) const; // Access the timer module... // = The factory methods, they delegate on the EC_Factory. @@ -163,8 +163,8 @@ private: TAO_EC_SupplierAdmin *supplier_admin_; // The SupplierAdmin implementation - TAO_EC_Timer_Module *timer_module_; - // The timer module + TAO_EC_Timeout_Generator *timeout_generator_; + // The timeout generator TAO_EC_ObserverStrategy *observer_strategy_; // The observer strategy diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.i b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.i index 2192a5382bd..549a3af4840 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.i @@ -24,10 +24,10 @@ TAO_EC_Event_Channel::supplier_admin (void) const return this->supplier_admin_; } -ACE_INLINE TAO_EC_Timer_Module* -TAO_EC_Event_Channel::timer_module (void) const +ACE_INLINE TAO_EC_Timeout_Generator* +TAO_EC_Event_Channel::timeout_generator (void) const { - return this->timer_module_; + return this->timeout_generator_; } ACE_INLINE TAO_EC_ProxyPushSupplier* diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h index d7b097b6af6..396e43bf54a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h @@ -12,9 +12,6 @@ // = AUTHOR // Carlos O'Ryan (coryan@cs.wustl.edu) // -// = DESCRIPTION -// The abstract factory for all the Event Channel components. -// // = CREDITS // Based on previous work by Tim Harrison (harrison@cs.wustl.edu) // and other members of the DOC group. @@ -46,9 +43,9 @@ class TAO_EC_ConsumerAdmin; class TAO_EC_SupplierAdmin; class TAO_EC_ProxyPushConsumer; class TAO_EC_ProxyPushSupplier; -class TAO_EC_Timer_Module; class TAO_EC_ObserverStrategy; class TAO_EC_ProxyPushSupplier_Set; +class TAO_EC_Timeout_Generator; class TAO_ORBSVCS_Export TAO_EC_Factory { @@ -104,10 +101,10 @@ public: destroy_proxy_push_consumer (TAO_EC_ProxyPushConsumer*) = 0; // Create and destroy a ProxyPushConsumer - virtual TAO_EC_Timer_Module* - create_timer_module (TAO_EC_Event_Channel*) = 0; + virtual TAO_EC_Timeout_Generator* + create_timeout_generator (TAO_EC_Event_Channel*) = 0; virtual void - destroy_timer_module (TAO_EC_Timer_Module*) = 0; + destroy_timeout_generator (TAO_EC_Timeout_Generator*) = 0; // Create and destroy the timer module. virtual TAO_EC_ObserverStrategy* diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h index bc213ed5064..00afafc720c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h @@ -12,19 +12,6 @@ // = AUTHOR // Carlos O'Ryan (coryan@cs.wustl.edu) // -// = DESCRIPTION -// The per-consumer filtering mechanisms. -// The EC needs to filter data passed to the consumers, so it can -// correctly satisfy its subscription requirements. -// This filtering can include correlations, sequences, timeouts, -// etc. each consumer can request different filtering criteria. -// -// Different filtering objects are associated with each consumer, -// the filters are organized in a hierarchical structure, -// corresponding to the subscription "expression" that the events -// must satisfy. -// The hierarchy is constructed using the "Builder" pattern. -// // = CREDITS // Based on previous work by Tim Harrison (harrison@cs.wustl.edu) // and other members of the DOC group. @@ -52,7 +39,17 @@ class TAO_ORBSVCS_Export TAO_EC_Filter // Abstract base class for the filter hierarchy. // // = DESCRIPTION - // Defines the filter interface. + // The per-consumer filtering mechanisms. + // The EC needs to filter data passed to the consumers, so it can + // correctly satisfy its subscription requirements. + // This filtering can include correlations, sequences, timeouts, + // etc. each consumer can request different filtering criteria. + // + // Different filtering objects are associated with each consumer, + // the filters are organized in a hierarchical structure, + // corresponding to the subscription "expression" that the events + // must satisfy. + // The hierarchy is constructed using the "Builder" pattern. // // = MEMORY MANAGMENT // It does *not* assume ownership of its parent. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h index f24cf5d29d4..9e689156e0f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h @@ -12,12 +12,6 @@ // = AUTHOR // Carlos O'Ryan (coryan@cs.wustl.edu) // -// = DESCRIPTION -// The creation of a builder hierarchy is controlled by a -// Filter_Builder. The relationship between TAO_EC_Filter and -// TAO_EC_Filter_Builder follows the "Builder Pattern" (Gamma et -// al.) -// // = CREDITS // Based on previous work by Tim Harrison (harrison@cs.wustl.edu) // and other members of the DOC group. @@ -45,7 +39,11 @@ class TAO_ORBSVCS_Export TAO_EC_Filter_Builder // Abstract base class for the filter builders. // // = DESCRIPTION - // Defines the filter builder interface. + // The creation of a builder hierarchy is controlled by a + // Filter_Builder. The relationship between TAO_EC_Filter and + // TAO_EC_Filter_Builder follows the "Builder Pattern" (Gamma et + // al.) + // // public: virtual ~TAO_EC_Filter_Builder (void); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp index 38deffa196f..08722d3288c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp @@ -10,7 +10,7 @@ #include "EC_SupplierFiltering.h" #include "EC_ObserverStrategy.h" #include "EC_ProxyPushSupplier_Set_T.h" -#include "Timer_Module.h" +#include "EC_Reactive_Timeout_Generator.h" #if ! defined (__ACE_INLINE__) #include "EC_Null_Factory.i" @@ -100,16 +100,16 @@ TAO_EC_Null_Factory::destroy_proxy_push_consumer (TAO_EC_ProxyPushConsumer *x) delete x; } -TAO_EC_Timer_Module* -TAO_EC_Null_Factory::create_timer_module (TAO_EC_Event_Channel *ec) +TAO_EC_Timeout_Generator* +TAO_EC_Null_Factory::create_timeout_generator (TAO_EC_Event_Channel *ec) { // @@ TODO fixme TAO_ORB_Core* orb_core = TAO_ORB_Core_instance (); - return new TAO_EC_ST_Timer_Module (orb_core->reactor ()); + return new TAO_EC_Reactive_Timeout_Generator (orb_core->reactor ()); } void -TAO_EC_Null_Factory::destroy_timer_module (TAO_EC_Timer_Module *x) +TAO_EC_Null_Factory::destroy_timeout_generator (TAO_EC_Timeout_Generator *x) { delete x; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h index f3bb7167798..a78fccace92 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h @@ -12,10 +12,6 @@ // = AUTHOR // Carlos O'Ryan (coryan@cs.wustl.edu) // -// = DESCRIPTION -// A factory for a simple event channel: no filtering or any -// real-time features. -// // = CREDITS // Based on previous work by Tim Harrison (harrison@cs.wustl.edu) // and other members of the DOC group. @@ -85,18 +81,18 @@ public: create_proxy_push_consumer (TAO_EC_Event_Channel*); virtual void destroy_proxy_push_consumer (TAO_EC_ProxyPushConsumer*); - virtual TAO_EC_Timer_Module* - create_timer_module (TAO_EC_Event_Channel*); + virtual TAO_EC_Timeout_Generator* + create_timeout_generator (TAO_EC_Event_Channel*); virtual void - destroy_timer_module (TAO_EC_Timer_Module*); + destroy_timeout_generator (TAO_EC_Timeout_Generator*); virtual TAO_EC_ObserverStrategy* create_observer_strategy (TAO_EC_Event_Channel*); virtual void destroy_observer_strategy (TAO_EC_ObserverStrategy*); virtual TAO_EC_ProxyPushSupplier_Set* - create_proxy_push_supplier_set (TAO_EC_Event_Channel*) = 0; + create_proxy_push_supplier_set (TAO_EC_Event_Channel*); virtual void - destroy_proxy_push_supplier_set (TAO_EC_ProxyPushSupplier_Set*) = 0; + destroy_proxy_push_supplier_set (TAO_EC_ProxyPushSupplier_Set*); virtual PortableServer::POA_ptr consumer_poa (CORBA::Environment& env); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h index 67e403ec5fc..d013e88cef4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h @@ -12,10 +12,6 @@ // = AUTHOR // Carlos O'Ryan (coryan@cs.wustl.edu) // -// = DESCRIPTION -// Define the TAO_EC_ObserverStrategy interface and some simple -// implementations. -// // = CREDITS // Based on previous work by Tim Harrison (harrison@cs.wustl.edu) // and other members of the DOC group. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.i b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.i index 56f87c21936..07836b8e4d1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.i @@ -8,18 +8,6 @@ TAO_EC_Null_ObserverStrategy::TAO_EC_Null_ObserverStrategy (void) // **************************************************************** ACE_INLINE -TAO_EC_Basic_ObserverStrategy:: - TAO_EC_Basic_ObserverStrategy (TAO_EC_Event_Channel* ec, - ACE_Lock* lock) - : event_channel_ (ec), - lock_ (lock), - handle_generator_ (1) -{ -} - -// **************************************************************** - -ACE_INLINE TAO_EC_Basic_ObserverStrategy::Observer_Entry::Observer_Entry (void) : handle (0) { @@ -45,3 +33,15 @@ TAO_EC_Basic_ObserverStrategy::Header_Compare:: return lhs.type < rhs.type; return lhs.source < rhs.source; } + +// **************************************************************** + +ACE_INLINE +TAO_EC_Basic_ObserverStrategy:: + TAO_EC_Basic_ObserverStrategy (TAO_EC_Event_Channel* ec, + ACE_Lock* lock) + : event_channel_ (ec), + lock_ (lock), + handle_generator_ (1) +{ +} diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h index d808ff32c8c..5dd989ab998 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h @@ -12,10 +12,6 @@ // = AUTHOR // Carlos O'Ryan (coryan@cs.wustl.edu) // -// = DESCRIPTION -// Another implementation for the TAO_EC_SupplierFiltering strategy, -// this one keeps a list of consumer (proxies) for each supplier. -// // = CREDITS // Based on previous work by Tim Harrison (harrison@cs.wustl.edu) // and other members of the DOC group. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp index 97e9c83ecbc..9c29b480614 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp @@ -33,7 +33,7 @@ TAO_EC_ProxyPushConsumer::set_default_POA (PortableServer::POA_ptr poa) PortableServer::POA_ptr TAO_EC_ProxyPushConsumer::_default_POA (CORBA::Environment&) { - return PortableServer::POA::_duplicate (this->default_POA_); + return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h index 0e79535c0b8..812cb48c706 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h @@ -12,12 +12,6 @@ // = AUTHOR // Carlos O'Ryan (coryan@cs.wustl.edu) // -// = DESCRIPTION -// Implement the RtecEventChannelAdmin::ProxyPushConsumer interface, -// remember that this class is used to communicate with a -// PushSupplier, so, in effect, this is the ambassador for a -// supplier inside the event channel. -// // = CREDITS // Based on previous work by Tim Harrison (harrison@cs.wustl.edu) // and other members of the DOC group. @@ -48,8 +42,10 @@ class TAO_ORBSVCS_Export TAO_EC_ProxyPushConsumer : public POA_RtecEventChannelA // ProxyPushConsumer // // = DESCRIPTION - // Implements the ProxyPushConsumer interface, i.e. the object - // used to communicate with a particular supplier. + // Implement the RtecEventChannelAdmin::ProxyPushConsumer interface, + // remember that this class is used to communicate with a + // PushSupplier, so, in effect, this is the ambassador for a + // supplier inside the event channel. // // = MEMORY MANAGMENT // It makes a copy of the SupplierQOS and the supplier object diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i index bd596291b5b..c692963193e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i @@ -9,7 +9,7 @@ TAO_EC_ProxyPushConsumer::is_connected (void) const ACE_INLINE RtecEventComm::PushSupplier_ptr TAO_EC_ProxyPushConsumer::supplier (void) const { - return RtecEventComm::PushSupplier::_duplicate (this->supplier_); + return RtecEventComm::PushSupplier::_duplicate (this->supplier_.in ()); } ACE_INLINE const RtecEventChannelAdmin::SupplierQOS& diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.h index 43b34c5538c..80da5120e96 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.h @@ -12,10 +12,6 @@ // = AUTHOR // Carlos O'Ryan (coryan@cs.wustl.edu) // -// = DESCRIPTION -// Defines the interface for a collection of ProxyPushSuppliers that -// can handle the concurrency requirements of the Event Channel. -// // = CREDITS // Based on previous work by Tim Harrison (harrison@cs.wustl.edu) // and other members of the DOC group. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set_T.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set_T.h index 76917ca9a52..aefe35ac2c7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set_T.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set_T.h @@ -12,9 +12,6 @@ // = AUTHOR // Carlos O'Ryan (coryan@cs.wustl.edu) // -// = DESCRIPTION -// Parametric classes related to EC_ProxyPushSupplier_Set -// // = CREDITS // Based on previous work by Tim Harrison (harrison@cs.wustl.edu) // and other members of the DOC group. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp index b4b18230da5..4db043fcdff 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp @@ -60,7 +60,7 @@ TAO_EC_ProxyPushSupplier::set_default_POA (PortableServer::POA_ptr poa) PortableServer::POA_ptr TAO_EC_ProxyPushSupplier::_default_POA_i () { - return PortableServer::POA::_duplicate (this->default_POA_); + return PortableServer::POA::_duplicate (this->default_POA_.in ()); } PortableServer::POA_ptr @@ -199,7 +199,7 @@ TAO_EC_ProxyPushSupplier::push (const RtecEventComm::EventSet& event, // Do not take a lock, this is a call back from our child filter, so // we are holding the lock already (in the filter() method). this->event_channel_->dispatching ()->push (this, - this->consumer_, + this->consumer_.in (), event, qos_info, ACE_TRY_ENV); @@ -214,7 +214,7 @@ TAO_EC_ProxyPushSupplier::push_nocopy (RtecEventComm::EventSet& event, // Do not take a lock, this is a call back from our child filter, so // we are holding the lock already (in the filter() method). this->event_channel_->dispatching ()->push_nocopy (this, - this->consumer_, + this->consumer_.in (), event, qos_info, ACE_TRY_ENV); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h index 9869a9f4294..f889cfb8214 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h @@ -12,12 +12,6 @@ // = AUTHOR // Carlos O'Ryan (coryan@cs.wustl.edu) // -// = DESCRIPTION -// Implement the RtecEventChannelAdmin::ProxyPushSupplier interface, -// remember that this class is used to communicate with a -// PushConsumer, so, in effect, this is the ambassador for a -// consumer inside the event channel. -// // = CREDITS // Based on previous work by Tim Harrison (harrison@cs.wustl.edu) // and other members of the DOC group. @@ -47,8 +41,10 @@ class TAO_ORBSVCS_Export TAO_EC_ProxyPushSupplier : public POA_RtecEventChannelA // ProxyPushSupplier // // = DESCRIPTION - // Implements the ProxyPushSupplier interface, i.e. the object - // used to communicate with a particular consumer. + // Implement the RtecEventChannelAdmin::ProxyPushSupplier interface, + // remember that this class is used to communicate with a + // PushConsumer, so, in effect, this is the ambassador for a + // consumer inside the event channel. // // = MEMORY MANAGMENT // It does not assume ownership of the TAO_EC_Dispatching object. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.i b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.i index bc572a336d2..c72e7ca8d45 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.i +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.i @@ -27,7 +27,7 @@ TAO_EC_ProxyPushSupplier::consumer (void) const { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); - return this->consumer_; + return this->consumer_.in (); } ACE_INLINE const RtecEventChannelAdmin::ConsumerQOS& diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h index dfdda75f0b3..6a59096ddcb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h @@ -12,10 +12,6 @@ // = AUTHOR // Carlos O'Ryan (coryan@cs.wustl.edu) // -// = DESCRIPTION -// Filters compute QOS information for real-time dispatching, this -// class encapsulates that information. -// // = CREDITS // Based on previous work by Tim Harrison (harrison@cs.wustl.edu) // and other members of the DOC group. @@ -41,6 +37,8 @@ class TAO_ORBSVCS_Export TAO_EC_QOS_Info // filters. // // = DESCRIPTION + // Filters compute QOS information for real-time dispatching, this + // class encapsulates that information. // This first implementation is just a place-holder. // public: diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp new file mode 100644 index 00000000000..7e0fff38b55 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp @@ -0,0 +1,58 @@ +// $Id$ + +#include "EC_Reactive_Timeout_Generator.h" +#include "tao/corba.h" + +#if ! defined (__ACE_INLINE__) +#include "EC_Reactive_Timeout_Generator.i" +#endif /* __ACE_INLINE__ */ + +ACE_RCSID(Event, EC_Reactive_Timeout_Generator, "$Id$") + +TAO_EC_Reactive_Timeout_Generator:: + TAO_EC_Reactive_Timeout_Generator (ACE_Reactor *reactor) + : reactor_ (reactor) +{ + if (this->reactor_ == 0) + { + this->reactor_ = TAO_ORB_Core_instance ()->reactor (); + } +} + +TAO_EC_Reactive_Timeout_Generator::~TAO_EC_Reactive_Timeout_Generator (void) +{ +} + +void +TAO_EC_Reactive_Timeout_Generator::activate (void) +{ +} + +void +TAO_EC_Reactive_Timeout_Generator::shutdown (void) +{ + this->reactor_->cancel_timer (&this->event_handler_); +} + +int +TAO_EC_Reactive_Timeout_Generator::schedule_timer ( + TAO_EC_Timeout_Filter* filter, + const ACE_Time_Value& delta, + const ACE_Time_Value& interval) +{ + return this->reactor_->schedule_timer (&this->event_handler_, + ACE_static_cast(void*,filter), + delta, + interval); +} + +int +TAO_EC_Reactive_Timeout_Generator::cancel_timer ( + const TAO_EC_QOS_Info&, + int id) +{ + const void *vp; + + return this->reactor_->cancel_timer (id, &vp); +} + diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h new file mode 100644 index 00000000000..d53a054b6ac --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h @@ -0,0 +1,74 @@ +/* -*- C++ -*- */ +// $Id$ +// +// ============================================================================ +// +// = LIBRARY +// ORBSVCS Real-time Event Channel +// +// = FILENAME +// EC_Reactive_Timeout_Generator +// +// = AUTHOR +// Carlos O'Ryan (coryan@cs.wustl.edu) +// +// = DESCRIPTION +// A new implementation of the Real Time Event Services. +// Based on previous work by Tim Harrison (harrison@cs.wustl.edu) +// and other members of the DOC group. +// More details can be found in: +// http://www.cs.wustl.edu/~schmidt/oopsla.ps.gz +// http://www.cs.wustl.edu/~schmidt/JSAC-98.ps.gz +// +// +// ============================================================================ + +#ifndef TAO_EC_REACTIVE_TIMEOUT_GENERATOR_H +#define TAO_EC_REACTIVE_TIMEOUT_GENERATOR_H + +#include "EC_Timeout_Generator.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +class TAO_ORBSVCS_Export TAO_EC_Reactive_Timeout_Generator : public TAO_EC_Timeout_Generator +{ + // = TITLE + // A simple implementation of the Timeout_Generator based on the + // Reactor. + // + // = DESCRIPTION + // Implements the Timeout_Generator using an ACE_Reactor. Usually + // the same reactor that is used by the ORB where the EC runs. + // +public: + TAO_EC_Reactive_Timeout_Generator (ACE_Reactor *reactor = 0); + // Constructor. + // If <reactor> is 0 then we use the reactor in the ORB singleton. + + virtual ~TAO_EC_Reactive_Timeout_Generator (void); + // destructor + + // = The TAO_EC_Timeout_Generator methods. + virtual void activate (void); + virtual void shutdown (void); + virtual int schedule_timer (TAO_EC_Timeout_Filter* filter, + const ACE_Time_Value& delta, + const ACE_Time_Value& interval); + virtual int cancel_timer (const TAO_EC_QOS_Info& info, + int id); + +private: + ACE_Reactor *reactor_; + // The reactor + + TAO_EC_Timeout_Adapter event_handler_; + // An adapter to receive the timeout events. +}; + +#if defined (__ACE_INLINE__) +#include "EC_Reactive_Timeout_Generator.i" +#endif /* __ACE_INLINE__ */ + +#endif /* TAO_EC_REACTIVE_TIMEOUT_GENERATOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.i b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.i new file mode 100644 index 00000000000..cfa1da318d3 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.i @@ -0,0 +1 @@ +// $Id$ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h index a17a3881cd7..7394c2326e6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h @@ -12,11 +12,6 @@ // = AUTHOR // Carlos O'Ryan (coryan@cs.wustl.edu) // -// = DESCRIPTION -// Implement the RtecEventChannelAdmin::SupplierAdmin interface. -// This class is an Abstract Factory for the -// TAO_EC_ProxyPushConsumer. -// // = CREDITS // Based on previous work by Tim Harrison (harrison@cs.wustl.edu) // and other members of the DOC group. @@ -47,13 +42,15 @@ class TAO_ORBSVCS_Export TAO_EC_SupplierAdmin : public POA_RtecEventChannelAdmin // ProxyPushSupplier // // = DESCRIPTION - // Implements the SupplierAdmin interface, i.e. the factory for - // ProxyPushConsumer objects. + // Implement the RtecEventChannelAdmin::SupplierAdmin interface. + // This class is an Abstract Factory for the + // TAO_EC_ProxyPushConsumer. // // = MEMORY MANAGMENT // It does not assume ownership of the TAO_EC_Event_Channel object // // = LOCKING + // @@ TODO // No provisions for locking, access must be serialized // externally. // @@ -105,6 +102,7 @@ private: // Store the default POA. ConsumerSet all_consumers_; + // The set of consumers... }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp new file mode 100644 index 00000000000..fa66acfe545 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp @@ -0,0 +1,93 @@ +// $Id$ + +#include "EC_Timeout_Filter.h" +#include "EC_Timeout_Generator.h" +#include "EC_Event_Channel.h" +#include "orbsvcs/Time_Utilities.h" + +#if ! defined (__ACE_INLINE__) +#include "EC_Timeout_Filter.i" +#endif /* __ACE_INLINE__ */ + +ACE_RCSID(Event, EC_Timeout_Filter, "$Id$") + +TAO_EC_Timeout_Filter::TAO_EC_Timeout_Filter ( + TAO_EC_Event_Channel *event_channel, + const TAO_EC_QOS_Info& qos_info, + RtecEventComm::Time period) + : event_channel_ (event_channel), + qos_info_ (qos_info) +{ + ACE_Time_Value tv_delta; + ORBSVCS_Time::TimeT_to_Time_Value (tv_delta, period); + + ACE_Time_Value tv_interval; + ORBSVCS_Time::TimeT_to_Time_Value (tv_interval, period); + + TAO_EC_Timeout_Generator *tg = + this->event_channel_->timeout_generator (); + this->id_ = + tg->schedule_timer (this, + tv_delta, + tv_interval); +} + +TAO_EC_Timeout_Filter::~TAO_EC_Timeout_Filter (void) +{ + this->event_channel_->timeout_generator ()->cancel_timer (this->qos_info_, + this->id_); +} + +int +TAO_EC_Timeout_Filter::filter (const RtecEventComm::EventSet& event, + TAO_EC_QOS_Info& qos_info, + CORBA::Environment& ACE_TRY_ENV) +{ + this->push (event, qos_info, ACE_TRY_ENV); + return 1; +} + +int +TAO_EC_Timeout_Filter::filter_nocopy (RtecEventComm::EventSet& event, + TAO_EC_QOS_Info& qos_info, + CORBA::Environment& ACE_TRY_ENV) +{ + this->push_nocopy (event, qos_info, ACE_TRY_ENV); + return 1; +} + +void +TAO_EC_Timeout_Filter::push (const RtecEventComm::EventSet& event, + TAO_EC_QOS_Info& qos_info, + CORBA::Environment& ACE_TRY_ENV) +{ + if (this->parent () != 0) + this->parent ()->push (event, qos_info, ACE_TRY_ENV); +} + +void +TAO_EC_Timeout_Filter::push_nocopy (RtecEventComm::EventSet& event, + TAO_EC_QOS_Info& qos_info, + CORBA::Environment& ACE_TRY_ENV) +{ + if (this->parent () != 0) + this->parent ()->push_nocopy (event, qos_info, ACE_TRY_ENV); +} + +void +TAO_EC_Timeout_Filter::clear (void) +{ +} + +CORBA::ULong +TAO_EC_Timeout_Filter::max_event_size (void) const +{ + return 1; +} + +int +TAO_EC_Timeout_Filter::can_match ( + const RtecEventComm::EventHeader& header) const +{ + return 0; +} diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h new file mode 100644 index 00000000000..bbdd690d490 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h @@ -0,0 +1,99 @@ +/* -*- C++ -*- */ +// $Id$ +// +// ============================================================================ +// +// = LIBRARY +// ORBSVCS Real-time Event Channel +// +// = FILENAME +// EC_Timeout_Filter +// +// = AUTHOR +// Carlos O'Ryan (coryan@cs.wustl.edu) +// +// = CREDITS +// Based on previous work by Tim Harrison (harrison@cs.wustl.edu) +// and other members of the DOC group. +// More details can be found in: +// http://www.cs.wustl.edu/~schmidt/oopsla.ps.gz +// http://www.cs.wustl.edu/~schmidt/JSAC-98.ps.gz +// +// +// ============================================================================ + +#ifndef TAO_EC_TIMEOUT_FILTER_H +#define TAO_EC_TIMEOUT_FILTER_H + +#include "EC_Filter.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "EC_QOS_Info.h" + +class TAO_EC_Event_Channel; + +class TAO_ORBSVCS_Export TAO_EC_Timeout_Filter : public TAO_EC_Filter +{ + // = TITLE + // A filter based on event type/source + // + // = DESCRIPTION + // This filter only accept events with a predefined type/source, + // both the source and the type can be wildcards. + // +public: + TAO_EC_Timeout_Filter (TAO_EC_Event_Channel *event_channel, + const TAO_EC_QOS_Info& qos_info, + RtecEventComm::Time period); + // Constructor. + + virtual ~TAO_EC_Timeout_Filter (void); + // Destructor. + + const TAO_EC_QOS_Info& qos_info (void) const; + // Return the QOS_Info for this Timeout filter. + + // = The TAO_EC_Filter methods, please check the documentation in + // TAO_EC_Filter. + virtual int filter (const RtecEventComm::EventSet& event, + TAO_EC_QOS_Info& qos_info, + CORBA::Environment& env); + virtual int filter_nocopy (RtecEventComm::EventSet& event, + TAO_EC_QOS_Info& qos_info, + CORBA::Environment& env); + virtual void push (const RtecEventComm::EventSet& event, + TAO_EC_QOS_Info& qos_info, + CORBA::Environment& env); + virtual void push_nocopy (RtecEventComm::EventSet& event, + TAO_EC_QOS_Info& qos_info, + CORBA::Environment& env); + virtual void clear (void); + virtual CORBA::ULong max_event_size (void) const; + virtual int can_match (const RtecEventComm::EventHeader& header) const; + +private: + ACE_UNIMPLEMENTED_FUNC (TAO_EC_Timeout_Filter + (const TAO_EC_Timeout_Filter&)) + ACE_UNIMPLEMENTED_FUNC (TAO_EC_Timeout_Filter& operator= + (const TAO_EC_Timeout_Filter&)) + +private: + TAO_EC_Event_Channel* event_channel_; + // The event channel. + + TAO_EC_QOS_Info qos_info_; + // Events "generated" by this filter use this QOS_Info. + + int id_; + // The ID of the timeout in the Timeout_Generator, for + // cancellation. +}; + +#if defined (__ACE_INLINE__) +#include "EC_Timeout_Filter.i" +#endif /* __ACE_INLINE__ */ + +#endif /* TAO_EC_TIMEOUT_FILTER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.i new file mode 100644 index 00000000000..5f65bedfd24 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.i @@ -0,0 +1,7 @@ +// $Id$ + +ACE_INLINE const TAO_EC_QOS_Info& +TAO_EC_Timeout_Filter::qos_info (void) const +{ + return this->qos_info_; +} diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp new file mode 100644 index 00000000000..23797025c9f --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp @@ -0,0 +1,49 @@ +// $Id$ + +#include "EC_Timeout_Generator.h" +#include "EC_Timeout_Filter.h" +#include "orbsvcs/Event_Service_Constants.h" + +#if ! defined (__ACE_INLINE__) +#include "EC_Timeout_Generator.i" +#endif /* __ACE_INLINE__ */ + +ACE_RCSID(Event, EC_Timeout_Generator, "$Id$") + +TAO_EC_Timeout_Generator::~TAO_EC_Timeout_Generator (void) +{ +} + +// **************************************************************** + +int +TAO_EC_Timeout_Adapter::handle_timeout (const ACE_Time_Value &, + const void *vp) +{ + TAO_EC_Timeout_Filter *filter = + ACE_static_cast(TAO_EC_Timeout_Filter*, ACE_const_cast(void*,vp)); + + if (filter == 0) + return 0; + + ACE_TRY_NEW_ENV + { + RtecEventComm::Event e; + e.header.type = ACE_ES_EVENT_TIMEOUT; + e.header.source = 0; + + RtecEventComm::EventSet single_event (1, 1, &e, 0); + + filter->filter (single_event, + filter->qos_info (), + ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + return -1; + } + ACE_ENDTRY; + + return 0; +} diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h new file mode 100644 index 00000000000..06c9aad2ee3 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h @@ -0,0 +1,101 @@ +/* -*- C++ -*- */ +// $Id$ +// +// ============================================================================ +// +// = LIBRARY +// ORBSVCS Real-time Event Channel +// +// = FILENAME +// EC_Timeout_Generator +// +// = AUTHOR +// Carlos O'Ryan (coryan@cs.wustl.edu) +// +// = DESCRIPTION +// A new implementation of the Real Time Event Services. +// Based on previous work by Tim Harrison (harrison@cs.wustl.edu) +// and other members of the DOC group. +// More details can be found in: +// http://www.cs.wustl.edu/~schmidt/oopsla.ps.gz +// http://www.cs.wustl.edu/~schmidt/JSAC-98.ps.gz +// +// +// ============================================================================ + +#ifndef TAO_EC_TIMEOUT_GENERATOR_H +#define TAO_EC_TIMEOUT_GENERATOR_H + +#include "orbsvcs/orbsvcs_export.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "ace/Event_Handler.h" + +class TAO_EC_QOS_Info; +class TAO_EC_Timeout_Filter; + +class TAO_ORBSVCS_Export TAO_EC_Timeout_Generator +{ + // = TITLE + // Define the interface for the generators of timeout events. + // + // = DESCRIPTION + // The Event Channel can use several strategies to dispatch + // timers, for instance, it can use the ORB reactor or a pool of + // reactors running at different priorities or a pool of + // Thread_Timer_Queue_Adapters running at different priorities + // also. + // This class is the abstract base class to abstract this + // strategies. + // +public: + virtual ~TAO_EC_Timeout_Generator (void); + // destructor + + virtual void activate (void) = 0; + // Activate any internal threads. + + virtual void shutdown (void) = 0; + // Deactivate any internal threads, clients can destroy the object + // after calling this method. + + virtual int schedule_timer (TAO_EC_Timeout_Filter* filter, + const ACE_Time_Value& delta, + const ACE_Time_Value& interval) = 0; + // Add a timer at the given priority, returns the timer ID. + + virtual int cancel_timer (const TAO_EC_QOS_Info& info, + int id) = 0; + // Cancel a timer at the given priority. +}; + +// **************************************************************** + +class TAO_ORBSVCS_Export TAO_EC_Timeout_Adapter : public ACE_Event_Handler +{ + // = TITLE + // Adapt the EC_Filter interface as an Event_Handler. + // + // = DESCRIPTION + // ACE timer queues (including the reactor) use Event_Handlers to + // dispatch events, but we want to receive them in EC_Filters, + // this class is and adaptor for that purpose. + // +public: + TAO_EC_Timeout_Adapter (void); + // Default construction. + +private: + virtual int handle_timeout (const ACE_Time_Value &tv, + const void *act); + // Casts <act> to EC_Filter and dispatches an event to it. +}; + +#if defined (__ACE_INLINE__) +#include "EC_Timeout_Generator.i" +#endif /* __ACE_INLINE__ */ + +#endif /* TAO_EC_TIMEOUT_GENERATOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.i b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.i new file mode 100644 index 00000000000..e5024c3fb1d --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.i @@ -0,0 +1,6 @@ +// $Id$ + +ACE_INLINE +TAO_EC_Timeout_Adapter::TAO_EC_Timeout_Adapter (void) +{ +} diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h index 3f8c3e5f603..81c7835a916 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h @@ -12,10 +12,6 @@ // = AUTHOR // Carlos O'Ryan (coryan@cs.wustl.edu) // -// = DESCRIPTION -// A per-consumer filter that only accept events whose type/source -// match. -// // = CREDITS // Based on previous work by Tim Harrison (harrison@cs.wustl.edu) // and other members of the DOC group. @@ -44,8 +40,6 @@ class TAO_ORBSVCS_Export TAO_EC_Type_Filter : public TAO_EC_Filter // This filter only accept events with a predefined type/source, // both the source and the type can be wildcards. // - // = MEMORY MANAGMENT - // public: TAO_EC_Type_Filter (const RtecEventComm::EventHeader& header); // Constructor. diff --git a/TAO/orbsvcs/orbsvcs/Makefile b/TAO/orbsvcs/orbsvcs/Makefile index a6e3661bd87..f712420ec38 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile +++ b/TAO/orbsvcs/orbsvcs/Makefile @@ -168,6 +168,9 @@ ifneq (,$(findstring Event2,$(TAO_ORBSVCS))) Event/EC_ObserverStrategy \ Event/EC_ProxyPushSupplier_Set \ Event/EC_Per_Supplier_Filter \ + Event/EC_Timeout_Filter \ + Event/EC_Timeout_Generator \ + Event/EC_Reactive_Timeout_Generator \ endif # Event2 diff --git a/TAO/orbsvcs/tests/CosEC_Multiple/Makefile b/TAO/orbsvcs/tests/CosEC_Multiple/Makefile index 9d1db6a65e8..2662e2eada2 100644 --- a/TAO/orbsvcs/tests/CosEC_Multiple/Makefile +++ b/TAO/orbsvcs/tests/CosEC_Multiple/Makefile @@ -66,10 +66,10 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS)) .obj/CosEC_Multiple.o .obj/CosEC_Multiple.so .shobj/CosEC_Multiple.o .shobj/CosEC_Multiple.so: CosEC_Multiple.cpp CosEC_Multiple.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ $(TAO_ROOT)/tao/corba.h \ - $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -85,306 +85,109 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS)) $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Malloc_T.i \ $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Object_Manager.h \ $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.i \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ $(ACE_ROOT)/ace/Message_Block_T.i \ $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.i \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.i \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/Connector.i \ - $(ACE_ROOT)/ace/Connector.cpp \ - $(ACE_ROOT)/ace/Acceptor.h \ - $(ACE_ROOT)/ace/Acceptor.i \ - $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/Align.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ - $(TAO_ROOT)/tao/Sequence.h \ - $(TAO_ROOT)/tao/Sequence.i \ - $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.i \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/try_macros.h \ $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Any.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ $(TAO_ROOT)/tao/Request.i \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOP.h \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/singletons.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(TAO_ROOT)/tao/CDR.i \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/POA.h \ - $(TAO_ROOT)/tao/POAC.h \ - $(TAO_ROOT)/tao/POAC.i \ - $(TAO_ROOT)/tao/Servant_Base.h \ - $(TAO_ROOT)/tao/Servant_Base.i \ - $(TAO_ROOT)/tao/POAS.h \ - $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/DynAnyC.h \ - $(TAO_ROOT)/tao/DynAnyC.i \ - $(TAO_ROOT)/tao/POAS.i \ - $(TAO_ROOT)/tao/Active_Object_Map.h \ - $(TAO_ROOT)/tao/Active_Object_Map.i \ - $(TAO_ROOT)/tao/POA.i \ - $(TAO_ROOT)/tao/poa_macros.h \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Connect.h \ - $(TAO_ROOT)/tao/Connect.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ - $(TAO_ROOT)/tao/ORB_Core.i \ - $(ACE_ROOT)/ace/Dynamic_Service.h \ - $(ACE_ROOT)/ace/Dynamic_Service.cpp \ - $(TAO_ROOT)/tao/Operation_Table.h \ - $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ - $(TAO_ROOT)/tao/IIOP_Object.h \ - $(TAO_ROOT)/tao/IIOP_Object.i \ - $(TAO_ROOT)/tao/IIOP_ORB.h \ - $(TAO_ROOT)/tao/IIOP_ORB.i \ - $(TAO_ROOT)/tao/IIOP_Interpreter.h \ - $(TAO_ROOT)/tao/GIOP.h \ - $(TAO_ROOT)/tao/GIOP.i \ - $(TAO_ROOT)/tao/Invocation.h \ - $(TAO_ROOT)/tao/Invocation.i \ - $(TAO_ROOT)/tao/Server_Request.h \ - $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ - $(TAO_ROOT)/tao/DynAny_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ - $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ - $(ACE_ROOT)/ace/SOCK_Dgram.h \ - $(ACE_ROOT)/ace/SOCK_Dgram.i \ - $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/CosNaming_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i -.obj/CosECConsumer.o .obj/CosECConsumer.so .shobj/CosECConsumer.o .shobj/CosECConsumer.so: CosECConsumer.cpp CosECConsumer.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/tao/corba.h \ - $(TAO_ROOT)/tao/orbconf.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ @@ -393,30 +196,6 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS)) $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ @@ -428,109 +207,6 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS)) $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.i \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.i \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.i \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/Connector.i \ - $(ACE_ROOT)/ace/Connector.cpp \ - $(ACE_ROOT)/ace/Acceptor.h \ - $(ACE_ROOT)/ace/Acceptor.i \ - $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/Align.h \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ - $(TAO_ROOT)/tao/ORB.h \ - $(TAO_ROOT)/tao/Sequence.h \ - $(TAO_ROOT)/tao/Sequence.i \ - $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.i \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/Union.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/try_macros.h \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/NVList.h \ - $(TAO_ROOT)/tao/NVList.i \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Request.i \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/varout.h \ - $(TAO_ROOT)/tao/varout.i \ - $(TAO_ROOT)/tao/varout.cpp \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Marshal.h \ - $(TAO_ROOT)/tao/Marshal.i \ - $(TAO_ROOT)/tao/singletons.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/POAC.i \ $(TAO_ROOT)/tao/Servant_Base.h \ @@ -544,159 +220,21 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS)) $(TAO_ROOT)/tao/Active_Object_Map.i \ $(TAO_ROOT)/tao/POA.i \ $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Connect.h \ - $(TAO_ROOT)/tao/Connect.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ - $(TAO_ROOT)/tao/ORB_Core.i \ - $(ACE_ROOT)/ace/Dynamic_Service.h \ - $(ACE_ROOT)/ace/Dynamic_Service.cpp \ - $(TAO_ROOT)/tao/Operation_Table.h \ - $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ - $(TAO_ROOT)/tao/IIOP_Object.h \ - $(TAO_ROOT)/tao/IIOP_Object.i \ - $(TAO_ROOT)/tao/IIOP_ORB.h \ - $(TAO_ROOT)/tao/IIOP_ORB.i \ - $(TAO_ROOT)/tao/IIOP_Interpreter.h \ - $(TAO_ROOT)/tao/GIOP.h \ - $(TAO_ROOT)/tao/GIOP.i \ - $(TAO_ROOT)/tao/Invocation.h \ - $(TAO_ROOT)/tao/Invocation.i \ - $(TAO_ROOT)/tao/Server_Request.h \ - $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ - $(TAO_ROOT)/tao/DynAny_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i -.obj/CosECSupplier.o .obj/CosECSupplier.so .shobj/CosECSupplier.o .shobj/CosECSupplier.so: CosECSupplier.cpp CosECSupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/tao/corba.h \ - $(TAO_ROOT)/tao/orbconf.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.i \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Strategies.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ @@ -709,18 +247,13 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS)) $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ $(ACE_ROOT)/ace/Message_Queue_T.i \ $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Message_Queue.i \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ + $(TAO_ROOT)/tao/IIOP_Connector.h \ $(ACE_ROOT)/ace/Connector.h \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ @@ -740,103 +273,92 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS)) $(ACE_ROOT)/ace/Svc_Handler.i \ $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Dynamic.i \ $(ACE_ROOT)/ace/Connector.i \ $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(TAO_ROOT)/tao/Connect.h \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/Align.h \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ - $(TAO_ROOT)/tao/ORB.h \ - $(TAO_ROOT)/tao/Sequence.h \ - $(TAO_ROOT)/tao/Sequence.i \ - $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.i \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/Union.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/try_macros.h \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/NVList.h \ - $(TAO_ROOT)/tao/NVList.i \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Request.i \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/varout.h \ - $(TAO_ROOT)/tao/varout.i \ - $(TAO_ROOT)/tao/varout.cpp \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Marshal.h \ - $(TAO_ROOT)/tao/Marshal.i \ - $(TAO_ROOT)/tao/singletons.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/POA.h \ - $(TAO_ROOT)/tao/POAC.h \ - $(TAO_ROOT)/tao/POAC.i \ - $(TAO_ROOT)/tao/Servant_Base.h \ - $(TAO_ROOT)/tao/Servant_Base.i \ - $(TAO_ROOT)/tao/POAS.h \ - $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/DynAnyC.h \ - $(TAO_ROOT)/tao/DynAnyC.i \ - $(TAO_ROOT)/tao/POAS.i \ - $(TAO_ROOT)/tao/Active_Object_Map.h \ - $(TAO_ROOT)/tao/Active_Object_Map.i \ - $(TAO_ROOT)/tao/POA.i \ - $(TAO_ROOT)/tao/poa_macros.h \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Connect.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ $(TAO_ROOT)/tao/Connect.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/IIOP_Acceptor.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ - $(TAO_ROOT)/tao/debug.h \ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ - $(TAO_ROOT)/tao/IIOP_Object.h \ - $(TAO_ROOT)/tao/IIOP_Object.i \ - $(TAO_ROOT)/tao/IIOP_ORB.h \ - $(TAO_ROOT)/tao/IIOP_ORB.i \ - $(TAO_ROOT)/tao/IIOP_Interpreter.h \ - $(TAO_ROOT)/tao/GIOP.h \ - $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Invocation.h \ $(TAO_ROOT)/tao/Invocation.i \ - $(TAO_ROOT)/tao/Server_Request.h \ - $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ + $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/CosNaming_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i +.obj/CosECConsumer.o .obj/CosECConsumer.so .shobj/CosECConsumer.o .shobj/CosECConsumer.so: CosECConsumer.cpp CosECConsumer.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ + CosEC_Multiple.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/CosNaming_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h +.obj/CosECSupplier.o .obj/CosECSupplier.so .shobj/CosECSupplier.o .shobj/CosECSupplier.so: CosECSupplier.cpp CosECSupplier.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ @@ -850,6 +372,22 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS)) $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ + CosEC_Multiple.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/CosNaming_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp index 482856f1cc3..00ba11800dd 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp @@ -12,8 +12,10 @@ #include "orbsvcs/RtecEventChannelAdminC.h" #include "orbsvcs/Sched/Config_Scheduler.h" #include "orbsvcs/Runtime_Scheduler.h" -#include "orbsvcs/Event/Event_Channel.h" -#include "orbsvcs/Event/Module_Factory.h" + +#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/Event/EC_Basic_Factory.h" + #include "EC_Mcast.h" #if !defined (__ACE_INLINE__) @@ -120,30 +122,6 @@ ECM_Driver::run (int argc, char* argv[]) } } -#if 0 - int min_priority = - ACE_Sched_Params::priority_min (ACE_SCHED_FIFO); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. - - if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, - min_priority, - ACE_SCOPE_PROCESS)) != 0) - { - if (ACE_OS::last_error () == EPERM) - ACE_DEBUG ((LM_DEBUG, - "%s: user is not superuser, " - "so remain in time-sharing class\n", argv[0])); - else - ACE_ERROR ((LM_ERROR, - "%s: ACE_OS::sched_params failed\n", argv[0])); - } - - if (ACE_OS::thr_setprio (min_priority) == -1) - { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) main thr_setprio failed\n")); - } -#endif /* 0 */ - ACE_Config_Scheduler scheduler_impl; RtecScheduler::Scheduler_var scheduler = scheduler_impl._this (TAO_TRY_ENV); @@ -158,12 +136,9 @@ ECM_Driver::run (int argc, char* argv[]) if (ACE_Scheduler_Factory::server (scheduler.in ()) == -1) return -1; - // Create the EventService implementation, but don't start its - // internal threads. - TAO_Reactive_Module_Factory module_factory; - ACE_EventChannel ec_impl (0, - ACE_DEFAULT_EVENT_CHANNEL_TYPE, - &module_factory); + TAO_EC_Basic_Factory ec_factory (root_poa.in ()); + + TAO_EC_Event_Channel ec_impl (&ec_factory); // Register Event_Service with the Naming Service. RtecEventChannelAdmin::EventChannel_var ec = @@ -178,34 +153,33 @@ ECM_Driver::run (int argc, char* argv[]) poa_manager->activate (TAO_TRY_ENV); TAO_CHECK_ENV; - RtecEventChannelAdmin::EventChannel_var local_ec = - ec_impl._this (TAO_TRY_ENV); + ec_impl.activate (TAO_TRY_ENV); TAO_CHECK_ENV; ACE_DEBUG ((LM_DEBUG, "EC_Mcast: local EC objref ready\n")); - this->open_federations (local_ec.in (), + this->open_federations (ec.in (), scheduler.in (), TAO_TRY_ENV); TAO_CHECK_ENV; ACE_DEBUG ((LM_DEBUG, "EC_Mcast: open_federations done\n")); - this->open_senders (local_ec.in (), + this->open_senders (ec.in (), scheduler.in (), TAO_TRY_ENV); TAO_CHECK_ENV; ACE_DEBUG ((LM_DEBUG, "EC_Mcast: open_senders done\n")); - this->open_receivers (local_ec.in (), + this->open_receivers (ec.in (), scheduler.in (), TAO_TRY_ENV); TAO_CHECK_ENV; ACE_DEBUG ((LM_DEBUG, "EC_Mcast: open_receivers done\n")); - this->activate_federations (local_ec.in (), + this->activate_federations (ec.in (), scheduler.in (), TAO_TRY_ENV); TAO_CHECK_ENV; @@ -214,9 +188,6 @@ ECM_Driver::run (int argc, char* argv[]) ACE_DEBUG ((LM_DEBUG, "EC_Mcast: activate the EC\n")); - // Create the EC internal threads - ec_impl.activate (); - ACE_DEBUG ((LM_DEBUG, "EC_Mcast: running the test\n")); if (this->orb_->run () == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1); @@ -232,7 +203,9 @@ ECM_Driver::run (int argc, char* argv[]) TAO_CHECK_ENV; ACE_DEBUG ((LM_DEBUG, "EC_Mcast: shutdown the EC\n")); - ec_impl.shutdown (); + + ec_impl.shutdown (TAO_TRY_ENV); + TAO_CHECK_ENV; ACE_DEBUG ((LM_DEBUG, "EC_Mcast: shutdown grace period\n")); diff --git a/TAO/orbsvcs/tests/EC_Mcast/Makefile b/TAO/orbsvcs/tests/EC_Mcast/Makefile index d6c65ac260c..20f30c3dbf9 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/Makefile +++ b/TAO/orbsvcs/tests/EC_Mcast/Makefile @@ -135,48 +135,22 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Config_Scheduler.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Runtime_Scheduler.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Runtime_Scheduler.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Channel.h \ - $(TAO_ROOT)/tao/Timeprobe.h \ - $(ACE_ROOT)/ace/Timeprobe.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Local_ESTypes.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Local_ESTypes.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/ReactorTask.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Fast_Reactor.h \ - $(ACE_ROOT)/ace/Select_Reactor.h \ - $(ACE_ROOT)/ace/Select_Reactor_T.h \ - $(ACE_ROOT)/ace/Select_Reactor_Base.h \ - $(ACE_ROOT)/ace/Token.h \ - $(ACE_ROOT)/ace/Token.i \ - $(ACE_ROOT)/ace/Pipe.h \ - $(ACE_ROOT)/ace/Pipe.i \ - $(ACE_ROOT)/ace/Select_Reactor_Base.i \ - $(ACE_ROOT)/ace/Select_Reactor_T.cpp \ - $(ACE_ROOT)/ace/Timer_Heap.h \ - $(ACE_ROOT)/ace/Timer_Heap_T.h \ - $(ACE_ROOT)/ace/Timer_Heap_T.cpp \ - $(ACE_ROOT)/ace/Select_Reactor_T.i \ - $(ACE_ROOT)/ace/Select_Reactor.i \ - $(ACE_ROOT)/ace/Timer_List.h \ - $(ACE_ROOT)/ace/Timer_List_T.h \ - $(ACE_ROOT)/ace/Timer_List_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Manip.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Manip.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Channel.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Module_Factory.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Basic_Factory.i \ EC_Mcast.h \ $(ACE_ROOT)/ace/High_Res_Timer.h \ $(ACE_ROOT)/ace/High_Res_Timer.i \ diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp index 8423b26bc26..a0aa22447ab 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp @@ -321,7 +321,7 @@ ECT_Supplier_Driver::parse_args (int argc, char *argv []) "-n <burst size> " "-b <event payload size> " "-T <burst pause (usecs)> " - "-h <eventa,eventb> " + "-h <type_start,type_count> " "-p <pid file name> " "\n", argv[0])); diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp index f250f230f3f..7c76c40aca1 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp @@ -227,7 +227,6 @@ ECT_Throughput::run (int argc, char* argv[]) } else { -#if defined (TAO_ORBSVCS_HAS_Event2) ec_factory = auto_ptr<TAO_EC_Factory>(new TAO_EC_Basic_Factory (root_poa.in ())); @@ -239,12 +238,6 @@ ECT_Throughput::run (int argc, char* argv[]) ec_impl = auto_ptr<POA_RtecEventChannelAdmin::EventChannel> (ec); - -#else - ACE_ERROR_RETURN ((LM_ERROR, - "The new event channel is not supported " - "please recompile\n"), 1); -#endif /* TAO_ORBSVCS_HAS_Event2 */ } RtecEventChannelAdmin::EventChannel_var channel = diff --git a/TAO/orbsvcs/tests/EC_Throughput/Makefile b/TAO/orbsvcs/tests/EC_Throughput/Makefile index d4c7d73651a..ec31619affe 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/Makefile +++ b/TAO/orbsvcs/tests/EC_Throughput/Makefile @@ -9,9 +9,7 @@ TAO_ROOT = $(ACE_ROOT)/TAO endif CPPFLAGS += -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_ROOT) \ - $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc)) - + -I$(TAO_ROOT) ECT_Supplier_OBJS=$(addsuffix .o,ECT_Supplier ECT_Driver ECT_Supplier_Driver) ECT_Consumer_OBJS=$(addsuffix .o,ECT_Consumer ECT_Driver ECT_Consumer_Driver) diff --git a/TAO/orbsvcs/tests/ImplRepo/IR_Helper.cpp b/TAO/orbsvcs/tests/ImplRepo/IR_Helper.cpp index 1ae906b9c10..3e134a16821 100644 --- a/TAO/orbsvcs/tests/ImplRepo/IR_Helper.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/IR_Helper.cpp @@ -29,8 +29,8 @@ private: int debug_; }; -IR_Helper::IR_Helper (char *server_name, - PortableServer::POA_ptr poa, +IR_Helper::IR_Helper (char *server_name, + PortableServer::POA_ptr poa, CORBA::ORB_ptr orb, int debug) : name_ (ACE::strnew (server_name)), @@ -42,7 +42,7 @@ IR_Helper::IR_Helper (char *server_name, orb_ (orb), debug_ (debug) { - + TAO_TRY { this->read_ir_ior (TAO_TRY_ENV); @@ -58,7 +58,7 @@ IR_Helper::IR_Helper (char *server_name, "invalid implrepo key <%s>\n", this->ir_key_)); - this->implrepo_ = + this->implrepo_ = Implementation_Repository::_narrow (implrepo_object.in(), TAO_TRY_ENV); TAO_CHECK_ENV; @@ -71,7 +71,7 @@ IR_Helper::IR_Helper (char *server_name, TAO_TRY_ENV); TAO_CHECK_ENV; - this->ping_ptr_ = + this->ping_ptr_ = this->poa_->id_to_reference (ping_id.in (), TAO_TRY_ENV); TAO_CHECK_ENV; @@ -93,18 +93,18 @@ IR_Helper::~IR_Helper () } int -IR_Helper::register_server (const char *comm_line, - const char *environment, - const char *working_dir, +IR_Helper::register_server (const char *comm_line, + const char *environment, + const char *working_dir, CORBA_Environment &TAO_IN_ENV) { - TAO_TRY + TAO_TRY { CORBA::Object_var implrepo_object = this->orb_->string_to_object (this->ir_key_, TAO_TRY_ENV); TAO_CHECK_ENV; - Implementation_Repository *ImplRepo = + Implementation_Repository *ImplRepo = Implementation_Repository::_narrow (implrepo_object.in(), TAO_TRY_ENV); TAO_CHECK_ENV; @@ -135,7 +135,7 @@ int IR_Helper::read_ir_ior (CORBA_Environment &TAO_IN_ENV) { ACE_UNUSED_ARG (TAO_IN_ENV); - + // Open the file for reading. // @@ Hard-coded name is bad. Need to fix. ACE_HANDLE f_handle_ = ACE_OS::open ("implrepo.ior", 0); @@ -167,10 +167,10 @@ IR_Helper::notify_startup (CORBA_Environment &TAO_IN_ENV) my_ir_addr.port_ = my_addr.get_port_number (); my_ir_addr.host_ = CORBA::string_dup (my_addr.get_host_name ()); - TAO_TRY + TAO_TRY { delete this->ir_addr_; - this->ir_addr_ = this->implrepo_->server_is_running (this->name_, + this->ir_addr_ = this->implrepo_->server_is_running (this->name_, my_ir_addr, this->ping_ptr_, TAO_TRY_ENV); @@ -185,7 +185,7 @@ IR_Helper::notify_startup (CORBA_Environment &TAO_IN_ENV) // Notify the IR that the server has been shut down. -void +void IR_Helper::notify_shutdown (CORBA_Environment &TAO_IN_ENV) { TAO_TRY @@ -203,20 +203,20 @@ IR_Helper::notify_shutdown (CORBA_Environment &TAO_IN_ENV) void IR_Helper::change_object (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV) { - if ( obj - && obj->_stubobj () + if ( obj + && obj->_stubobj () && obj->_stubobj ()->profile_in_use () - && this->implrepo_ - && this->implrepo_->_stubobj () + && this->implrepo_ + && this->implrepo_->_stubobj () && this->implrepo_->_stubobj ()->profile_in_use () ) { TAO_IIOP_Profile *implrepo_pfile = - ACE_dynamic_cast (TAO_IIOP_Profile *, + ACE_dynamic_cast (TAO_IIOP_Profile *, this->implrepo_->_stubobj ()->profile_in_use ()); TAO_IIOP_Profile *iiop_pfile = - ACE_dynamic_cast (TAO_IIOP_Profile *, + ACE_dynamic_cast (TAO_IIOP_Profile *, obj->_stubobj ()->profile_in_use ()); - + // @@ Only same host for now iiop_pfile->port (implrepo_pfile->port ()); } diff --git a/TAO/orbsvcs/tests/ImplRepo/Makefile b/TAO/orbsvcs/tests/ImplRepo/Makefile index 240dd1fd861..10cc9a17429 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Makefile +++ b/TAO/orbsvcs/tests/ImplRepo/Makefile @@ -15,7 +15,9 @@ endif # ! TAO_ROOT # Make sure the directory we depend on is up-to-date. DIRS = ../../ImplRepo_Service -LDLIBS = -lTAO +LDLIBS = -lorbsvcs -lTAO +CPPFLAGS += -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_ROOT) IDL_SRC = AirplaneS.cpp AirplaneC.cpp PROG_SRCS = Repository.cpp \ @@ -25,39 +27,9 @@ PROG_SRCS = Repository.cpp \ airplane_client_i.cpp \ airplane_server_i.cpp \ airplane_i.cpp \ - IR_Helper.cpp \ - client.cpp \ - client_impl.cpp \ - server.cpp \ - server_impl.cpp \ - simple_object_impl.cpp + IR_Helper.cpp -LSRC = $(IDL_SRC) $(PROG_SRCS) - -IMPLREPO_SERVICE_FILES = PingC.cpp \ - PingS.cpp \ - ImplRepoC.cpp \ - ImplRepoS.cpp - -IMPLREPO_SERVICE_OBJS = $(addprefix ../../ImplRepo_Service/$(VDIR), $(patsubst %.cpp,%.o,$(IMPLREPO_SERVICE_FILES))) - -#IMPLREPO_SERVICE_OBJS = ../../ImplRepo_Service/$(VDIR)/PingC.o \ -# ../../ImplRepo_Service/$(VDIR)/PingS.o \ -# ../../ImplRepo_Service/$(VDIR)/ImplRepoC.o \ -# ../../ImplRepo_Service/$(VDIR)/ImplRepoS.o - - - -IMPLREPO_CLIENT_OBJS = Simple_ObjectC.o \ - Simple_ObjectS.o \ - client.o \ - client_impl.o - -IMPLREPO_SERVER_OBJS = Simple_ObjectC.o \ - Simple_ObjectS.o \ - server.o \ - server_impl.o \ - simple_object_impl.o +SRC=$(IDL_SRC) $(PROG_SRCS) AIRPLANE_CLIENT_OBJS = AirplaneC.o \ AirplaneS.o \ @@ -99,21 +71,12 @@ include $(TAO_ROOT)/taoconfig.mk # Local targets #---------------------------------------------------------------------------- -LDFLAGS += -L$(TAO_ROOT)/tao - -.PRECIOUS: Simple_ObjectC.cpp Simple_ObjectS.cpp Simple_ObjectC.h Simple_ObjectS.h -.SECONDARY: $(IMPLREPO_SERVICE_OBJS) -#$(IDL_SRC): cubit.idl -# $(TAO_ROOT)/TAO_IDL/tao_idl cubit.idl - -server: $(addprefix $(VDIR),$(IMPLREPO_SERVER_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(IMPLREPO_SERVICE_OBJS) $(POSTLINK) +IDL_EXT=C.h C.i C.cpp S.h S.i S.cpp S_T.h S_T.i S_T.cpp -client: $(addprefix $(VDIR),$(IMPLREPO_CLIENT_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) +.PRECIOUS: $(foreach ext, $(IDL_EXT), Airplane$(ext)) airplane_server: $(addprefix $(VDIR),$(AIRPLANE_SERVER_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(IMPLREPO_SERVICE_OBJS) $(POSTLINK) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) airplane_client: $(addprefix $(VDIR),$(AIRPLANE_CLIENT_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) @@ -122,501 +85,22 @@ Repository_Test: $(addprefix $(VDIR),$(REPOSITORY_TEST_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) realclean: clean - -/bin/rm -rf Simple_ObjectC* Simple_ObjectS* + -/bin/rm -rf $(foreach ext, $(IDL_EXT), Airplane$(ext)) # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/Simple_ObjectC.o .obj/Simple_ObjectC.so .shobj/Simple_ObjectC.o .shobj/Simple_ObjectC.so: Simple_ObjectC.cpp Simple_ObjectC.h \ - $(TAO_ROOT)/tao/corba.h \ - $(TAO_ROOT)/tao/orbconf.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-linux-lxpthreads.h \ - $(ACE_ROOT)/ace/config-linux-common.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.i \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.i \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/Connector.i \ - $(ACE_ROOT)/ace/Connector.cpp \ - $(ACE_ROOT)/ace/Acceptor.h \ - $(ACE_ROOT)/ace/Acceptor.i \ - $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/Align.h \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ - $(TAO_ROOT)/tao/ORB.h \ - $(TAO_ROOT)/tao/Sequence.h \ - $(TAO_ROOT)/tao/Sequence.i \ - $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.i \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/Union.h \ - $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/try_macros.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/NVList.h \ - $(TAO_ROOT)/tao/NVList.i \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Request.i \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/varout.h \ - $(TAO_ROOT)/tao/varout.i \ - $(TAO_ROOT)/tao/varout.cpp \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Marshal.h \ - $(TAO_ROOT)/tao/Marshal.i \ - $(TAO_ROOT)/tao/singletons.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/POA.h \ - $(TAO_ROOT)/tao/POAC.h \ - $(TAO_ROOT)/tao/POAC.i \ - $(TAO_ROOT)/tao/Servant_Base.h \ - $(TAO_ROOT)/tao/POAS.h \ - $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/DynAnyC.h \ - $(TAO_ROOT)/tao/DynAnyC.i \ - $(TAO_ROOT)/tao/POAS.i \ - $(TAO_ROOT)/tao/Active_Object_Map.h \ - $(TAO_ROOT)/tao/Active_Object_Map.i \ - $(TAO_ROOT)/tao/POA.i \ - $(TAO_ROOT)/tao/poa_macros.h \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Connect.h \ - $(TAO_ROOT)/tao/Connect.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ - $(TAO_ROOT)/tao/ORB_Core.i \ - $(ACE_ROOT)/ace/Dynamic_Service.h \ - $(ACE_ROOT)/ace/Dynamic_Service.cpp \ - $(TAO_ROOT)/tao/Operation_Table.h \ - $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ - $(TAO_ROOT)/tao/IIOP_Object.h \ - $(TAO_ROOT)/tao/IIOP_Object.i \ - $(TAO_ROOT)/tao/IIOP_ORB.h \ - $(TAO_ROOT)/tao/IIOP_ORB.i \ - $(TAO_ROOT)/tao/IIOP_Interpreter.h \ - $(TAO_ROOT)/tao/GIOP.h \ - $(TAO_ROOT)/tao/GIOP.i \ - $(TAO_ROOT)/tao/Invocation.h \ - $(TAO_ROOT)/tao/Invocation.i \ - $(TAO_ROOT)/tao/Server_Request.h \ - $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ - $(TAO_ROOT)/tao/DynAny_i.h Simple_ObjectC.i \ - Simple_ObjectS.h Simple_ObjectS_T.h Simple_ObjectS_T.i \ - Simple_ObjectS_T.cpp Simple_ObjectS.i -.obj/Simple_ObjectS.o .obj/Simple_ObjectS.so .shobj/Simple_ObjectS.o .shobj/Simple_ObjectS.so: Simple_ObjectS.cpp Simple_ObjectS.h Simple_ObjectC.h \ - $(TAO_ROOT)/tao/corba.h \ - $(TAO_ROOT)/tao/orbconf.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-linux-lxpthreads.h \ - $(ACE_ROOT)/ace/config-linux-common.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.i \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.i \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/Connector.i \ - $(ACE_ROOT)/ace/Connector.cpp \ - $(ACE_ROOT)/ace/Acceptor.h \ - $(ACE_ROOT)/ace/Acceptor.i \ - $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/Align.h \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ - $(TAO_ROOT)/tao/ORB.h \ - $(TAO_ROOT)/tao/Sequence.h \ - $(TAO_ROOT)/tao/Sequence.i \ - $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.i \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/Union.h \ - $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/try_macros.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/NVList.h \ - $(TAO_ROOT)/tao/NVList.i \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Request.i \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/varout.h \ - $(TAO_ROOT)/tao/varout.i \ - $(TAO_ROOT)/tao/varout.cpp \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Marshal.h \ - $(TAO_ROOT)/tao/Marshal.i \ - $(TAO_ROOT)/tao/singletons.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/POA.h \ - $(TAO_ROOT)/tao/POAC.h \ - $(TAO_ROOT)/tao/POAC.i \ - $(TAO_ROOT)/tao/Servant_Base.h \ - $(TAO_ROOT)/tao/POAS.h \ - $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/DynAnyC.h \ - $(TAO_ROOT)/tao/DynAnyC.i \ - $(TAO_ROOT)/tao/POAS.i \ - $(TAO_ROOT)/tao/Active_Object_Map.h \ - $(TAO_ROOT)/tao/Active_Object_Map.i \ - $(TAO_ROOT)/tao/POA.i \ - $(TAO_ROOT)/tao/poa_macros.h \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Connect.h \ - $(TAO_ROOT)/tao/Connect.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ - $(TAO_ROOT)/tao/ORB_Core.i \ - $(ACE_ROOT)/ace/Dynamic_Service.h \ - $(ACE_ROOT)/ace/Dynamic_Service.cpp \ - $(TAO_ROOT)/tao/Operation_Table.h \ - $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ - $(TAO_ROOT)/tao/IIOP_Object.h \ - $(TAO_ROOT)/tao/IIOP_Object.i \ - $(TAO_ROOT)/tao/IIOP_ORB.h \ - $(TAO_ROOT)/tao/IIOP_ORB.i \ - $(TAO_ROOT)/tao/IIOP_Interpreter.h \ - $(TAO_ROOT)/tao/GIOP.h \ - $(TAO_ROOT)/tao/GIOP.i \ - $(TAO_ROOT)/tao/Invocation.h \ - $(TAO_ROOT)/tao/Invocation.i \ - $(TAO_ROOT)/tao/Server_Request.h \ - $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ - $(TAO_ROOT)/tao/DynAny_i.h Simple_ObjectC.i \ - Simple_ObjectS_T.h Simple_ObjectS_T.i Simple_ObjectS_T.cpp \ - Simple_ObjectS.i +.obj/AirplaneS.o .obj/AirplaneS.so .shobj/AirplaneS.o .shobj/AirplaneS.so: AirplaneS.cpp AirplaneS.h AirplaneC.h AirplaneC.i \ + AirplaneS_T.h AirplaneS_T.i AirplaneS_T.cpp AirplaneS.i +.obj/AirplaneC.o .obj/AirplaneC.so .shobj/AirplaneC.o .shobj/AirplaneC.so: AirplaneC.cpp AirplaneC.h AirplaneC.i AirplaneS.h \ + AirplaneS_T.h AirplaneS_T.i AirplaneS_T.cpp AirplaneS.i .obj/Repository.o .obj/Repository.so .shobj/Repository.o .shobj/Repository.so: Repository.cpp Repository.h \ $(ACE_ROOT)/ace/Naming_Context.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-linux-lxpthreads.h \ - $(ACE_ROOT)/ace/config-linux-common.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -627,10 +111,10 @@ realclean: clean $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -712,8 +196,7 @@ realclean: clean $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-linux-lxpthreads.h \ - $(ACE_ROOT)/ace/config-linux-common.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -724,10 +207,10 @@ realclean: clean $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -802,14 +285,18 @@ realclean: clean $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Name_Request_Reply.h \ $(ACE_ROOT)/ace/Name_Space.h -.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp client_impl.h Simple_ObjectC.h \ - $(TAO_ROOT)/tao/corba.h \ - $(TAO_ROOT)/tao/orbconf.h \ +.obj/airplane_client.o .obj/airplane_client.so .shobj/airplane_client.o .shobj/airplane_client.so: airplane_client.cpp airplane_client_i.h AirplaneC.h \ + AirplaneC.i +.obj/airplane_server.o .obj/airplane_server.so .shobj/airplane_server.o .shobj/airplane_server.so: airplane_server.cpp airplane_server_i.h \ + $(TAO_ROOT)/tao/TAO.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-linux-lxpthreads.h \ - $(ACE_ROOT)/ace/config-linux-common.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -818,479 +305,100 @@ realclean: clean $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Malloc_T.i \ $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.i \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.i \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/Connector.i \ - $(ACE_ROOT)/ace/Connector.cpp \ - $(ACE_ROOT)/ace/Acceptor.h \ - $(ACE_ROOT)/ace/Acceptor.i \ - $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/Align.h \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ - $(TAO_ROOT)/tao/ORB.h \ - $(TAO_ROOT)/tao/Sequence.h \ - $(TAO_ROOT)/tao/Sequence.i \ - $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.i \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/Union.h \ - $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/try_macros.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/NVList.h \ - $(TAO_ROOT)/tao/NVList.i \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Request.i \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/varout.h \ - $(TAO_ROOT)/tao/varout.i \ - $(TAO_ROOT)/tao/varout.cpp \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Marshal.h \ - $(TAO_ROOT)/tao/Marshal.i \ - $(TAO_ROOT)/tao/singletons.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/POA.h \ - $(TAO_ROOT)/tao/POAC.h \ - $(TAO_ROOT)/tao/POAC.i \ - $(TAO_ROOT)/tao/Servant_Base.h \ - $(TAO_ROOT)/tao/POAS.h \ - $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/DynAnyC.h \ - $(TAO_ROOT)/tao/DynAnyC.i \ - $(TAO_ROOT)/tao/POAS.i \ - $(TAO_ROOT)/tao/Active_Object_Map.h \ - $(TAO_ROOT)/tao/Active_Object_Map.i \ - $(TAO_ROOT)/tao/POA.i \ - $(TAO_ROOT)/tao/poa_macros.h \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Connect.h \ - $(TAO_ROOT)/tao/Connect.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ - $(TAO_ROOT)/tao/ORB_Core.i \ - $(ACE_ROOT)/ace/Dynamic_Service.h \ - $(ACE_ROOT)/ace/Dynamic_Service.cpp \ - $(TAO_ROOT)/tao/Operation_Table.h \ - $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ - $(TAO_ROOT)/tao/IIOP_Object.h \ - $(TAO_ROOT)/tao/IIOP_Object.i \ - $(TAO_ROOT)/tao/IIOP_ORB.h \ - $(TAO_ROOT)/tao/IIOP_ORB.i \ - $(TAO_ROOT)/tao/IIOP_Interpreter.h \ - $(TAO_ROOT)/tao/GIOP.h \ - $(TAO_ROOT)/tao/GIOP.i \ - $(TAO_ROOT)/tao/Invocation.h \ - $(TAO_ROOT)/tao/Invocation.i \ - $(TAO_ROOT)/tao/Server_Request.h \ - $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ - $(TAO_ROOT)/tao/DynAny_i.h Simple_ObjectC.i -.obj/client_impl.o .obj/client_impl.so .shobj/client_impl.o .shobj/client_impl.so: client_impl.cpp client_impl.h Simple_ObjectC.h \ - $(TAO_ROOT)/tao/corba.h \ - $(TAO_ROOT)/tao/orbconf.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-linux-lxpthreads.h \ - $(ACE_ROOT)/ace/config-linux-common.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Object_Manager.h \ $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ $(ACE_ROOT)/ace/Message_Block_T.i \ $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.i \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.i \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/Connector.i \ - $(ACE_ROOT)/ace/Connector.cpp \ - $(ACE_ROOT)/ace/Acceptor.h \ - $(ACE_ROOT)/ace/Acceptor.i \ - $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/Align.h \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ - $(TAO_ROOT)/tao/ORB.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/POAC.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Managed_Types.i \ $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/Union.h \ - $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/try_macros.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/NVList.h \ - $(TAO_ROOT)/tao/NVList.i \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Request.i \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/varout.h \ - $(TAO_ROOT)/tao/varout.i \ - $(TAO_ROOT)/tao/varout.cpp \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Marshal.h \ - $(TAO_ROOT)/tao/Marshal.i \ - $(TAO_ROOT)/tao/singletons.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/POA.h \ - $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/POAC.i \ - $(TAO_ROOT)/tao/Servant_Base.h \ - $(TAO_ROOT)/tao/POAS.h \ - $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/DynAnyC.h \ - $(TAO_ROOT)/tao/DynAnyC.i \ - $(TAO_ROOT)/tao/POAS.i \ - $(TAO_ROOT)/tao/Active_Object_Map.h \ - $(TAO_ROOT)/tao/Active_Object_Map.i \ - $(TAO_ROOT)/tao/POA.i \ - $(TAO_ROOT)/tao/poa_macros.h \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Connect.h \ - $(TAO_ROOT)/tao/Connect.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ - $(TAO_ROOT)/tao/ORB_Core.i \ - $(ACE_ROOT)/ace/Dynamic_Service.h \ - $(ACE_ROOT)/ace/Dynamic_Service.cpp \ - $(TAO_ROOT)/tao/Operation_Table.h \ - $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ - $(TAO_ROOT)/tao/IIOP_Object.h \ - $(TAO_ROOT)/tao/IIOP_Object.i \ - $(TAO_ROOT)/tao/IIOP_ORB.h \ - $(TAO_ROOT)/tao/IIOP_ORB.i \ - $(TAO_ROOT)/tao/IIOP_Interpreter.h \ - $(TAO_ROOT)/tao/GIOP.h \ - $(TAO_ROOT)/tao/GIOP.i \ - $(TAO_ROOT)/tao/Invocation.h \ - $(TAO_ROOT)/tao/Invocation.i \ - $(TAO_ROOT)/tao/Server_Request.h \ - $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ - $(TAO_ROOT)/tao/DynAny_i.h Simple_ObjectC.i \ + airplane_i.h AirplaneS.h AirplaneC.h AirplaneC.i AirplaneS_T.h \ + AirplaneS_T.i AirplaneS_T.cpp AirplaneS.i IR_Helper.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.i +.obj/airplane_client_i.o .obj/airplane_client_i.so .shobj/airplane_client_i.o .shobj/airplane_client_i.so: airplane_client_i.cpp airplane_client_i.h \ + AirplaneC.h AirplaneC.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i \ $(ACE_ROOT)/ace/Read_Buffer.h \ $(ACE_ROOT)/ace/Read_Buffer.i -.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp server_impl.h simple_object_impl.h \ - Simple_ObjectS.h Simple_ObjectC.h \ - $(TAO_ROOT)/tao/corba.h \ - $(TAO_ROOT)/tao/orbconf.h \ +.obj/airplane_server_i.o .obj/airplane_server_i.so .shobj/airplane_server_i.o .shobj/airplane_server_i.so: airplane_server_i.cpp airplane_server_i.h \ + $(TAO_ROOT)/tao/TAO.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-linux-lxpthreads.h \ - $(ACE_ROOT)/ace/config-linux-common.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -1299,493 +407,102 @@ realclean: clean $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Malloc_T.i \ $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.i \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.i \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/Connector.i \ - $(ACE_ROOT)/ace/Connector.cpp \ - $(ACE_ROOT)/ace/Acceptor.h \ - $(ACE_ROOT)/ace/Acceptor.i \ - $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/Align.h \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ - $(TAO_ROOT)/tao/ORB.h \ - $(TAO_ROOT)/tao/Sequence.h \ - $(TAO_ROOT)/tao/Sequence.i \ - $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.i \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/Union.h \ - $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/try_macros.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/NVList.h \ - $(TAO_ROOT)/tao/NVList.i \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Request.i \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/varout.h \ - $(TAO_ROOT)/tao/varout.i \ - $(TAO_ROOT)/tao/varout.cpp \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Marshal.h \ - $(TAO_ROOT)/tao/Marshal.i \ - $(TAO_ROOT)/tao/singletons.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/POA.h \ - $(TAO_ROOT)/tao/POAC.h \ - $(TAO_ROOT)/tao/POAC.i \ - $(TAO_ROOT)/tao/Servant_Base.h \ - $(TAO_ROOT)/tao/POAS.h \ - $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/DynAnyC.h \ - $(TAO_ROOT)/tao/DynAnyC.i \ - $(TAO_ROOT)/tao/POAS.i \ - $(TAO_ROOT)/tao/Active_Object_Map.h \ - $(TAO_ROOT)/tao/Active_Object_Map.i \ - $(TAO_ROOT)/tao/POA.i \ - $(TAO_ROOT)/tao/poa_macros.h \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Connect.h \ - $(TAO_ROOT)/tao/Connect.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ - $(TAO_ROOT)/tao/ORB_Core.i \ - $(ACE_ROOT)/ace/Dynamic_Service.h \ - $(ACE_ROOT)/ace/Dynamic_Service.cpp \ - $(TAO_ROOT)/tao/Operation_Table.h \ - $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ - $(TAO_ROOT)/tao/IIOP_Object.h \ - $(TAO_ROOT)/tao/IIOP_Object.i \ - $(TAO_ROOT)/tao/IIOP_ORB.h \ - $(TAO_ROOT)/tao/IIOP_ORB.i \ - $(TAO_ROOT)/tao/IIOP_Interpreter.h \ - $(TAO_ROOT)/tao/GIOP.h \ - $(TAO_ROOT)/tao/GIOP.i \ - $(TAO_ROOT)/tao/Invocation.h \ - $(TAO_ROOT)/tao/Invocation.i \ - $(TAO_ROOT)/tao/Server_Request.h \ - $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ - $(TAO_ROOT)/tao/DynAny_i.h Simple_ObjectC.i \ - Simple_ObjectS_T.h Simple_ObjectS_T.i Simple_ObjectS_T.cpp \ - Simple_ObjectS.i ../../ImplRepo_Service/PingS.h \ - ../../ImplRepo_Service/PingC.h ../../ImplRepo_Service/PingC.i \ - ../../ImplRepo_Service/PingS_T.h ../../ImplRepo_Service/PingS_T.i \ - ../../ImplRepo_Service/PingS_T.cpp ../../ImplRepo_Service/PingS.i \ - $(TAO_ROOT)/tao/TAO.h -.obj/server_impl.o .obj/server_impl.so .shobj/server_impl.o .shobj/server_impl.so: server_impl.cpp server_impl.h simple_object_impl.h \ - Simple_ObjectS.h Simple_ObjectC.h \ - $(TAO_ROOT)/tao/corba.h \ - $(TAO_ROOT)/tao/orbconf.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-linux-lxpthreads.h \ - $(ACE_ROOT)/ace/config-linux-common.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Object_Manager.h \ $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ $(ACE_ROOT)/ace/Message_Block_T.i \ $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.i \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.i \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/Connector.i \ - $(ACE_ROOT)/ace/Connector.cpp \ - $(ACE_ROOT)/ace/Acceptor.h \ - $(ACE_ROOT)/ace/Acceptor.i \ - $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/Align.h \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ - $(TAO_ROOT)/tao/ORB.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/POAC.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Managed_Types.i \ $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/Union.h \ - $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/try_macros.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/NVList.h \ - $(TAO_ROOT)/tao/NVList.i \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Request.i \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/varout.h \ - $(TAO_ROOT)/tao/varout.i \ - $(TAO_ROOT)/tao/varout.cpp \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Marshal.h \ - $(TAO_ROOT)/tao/Marshal.i \ - $(TAO_ROOT)/tao/singletons.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/POA.h \ - $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/POAC.i \ - $(TAO_ROOT)/tao/Servant_Base.h \ - $(TAO_ROOT)/tao/POAS.h \ - $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/DynAnyC.h \ - $(TAO_ROOT)/tao/DynAnyC.i \ - $(TAO_ROOT)/tao/POAS.i \ - $(TAO_ROOT)/tao/Active_Object_Map.h \ - $(TAO_ROOT)/tao/Active_Object_Map.i \ - $(TAO_ROOT)/tao/POA.i \ - $(TAO_ROOT)/tao/poa_macros.h \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Connect.h \ - $(TAO_ROOT)/tao/Connect.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ - $(TAO_ROOT)/tao/ORB_Core.i \ - $(ACE_ROOT)/ace/Dynamic_Service.h \ - $(ACE_ROOT)/ace/Dynamic_Service.cpp \ - $(TAO_ROOT)/tao/Operation_Table.h \ - $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ - $(TAO_ROOT)/tao/IIOP_Object.h \ - $(TAO_ROOT)/tao/IIOP_Object.i \ - $(TAO_ROOT)/tao/IIOP_ORB.h \ - $(TAO_ROOT)/tao/IIOP_ORB.i \ - $(TAO_ROOT)/tao/IIOP_Interpreter.h \ - $(TAO_ROOT)/tao/GIOP.h \ - $(TAO_ROOT)/tao/GIOP.i \ - $(TAO_ROOT)/tao/Invocation.h \ - $(TAO_ROOT)/tao/Invocation.i \ - $(TAO_ROOT)/tao/Server_Request.h \ - $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ - $(TAO_ROOT)/tao/DynAny_i.h Simple_ObjectC.i \ - Simple_ObjectS_T.h Simple_ObjectS_T.i Simple_ObjectS_T.cpp \ - Simple_ObjectS.i ../../ImplRepo_Service/PingS.h \ - ../../ImplRepo_Service/PingC.h ../../ImplRepo_Service/PingC.i \ - ../../ImplRepo_Service/PingS_T.h ../../ImplRepo_Service/PingS_T.i \ - ../../ImplRepo_Service/PingS_T.cpp ../../ImplRepo_Service/PingS.i \ - $(TAO_ROOT)/tao/TAO.h \ - ../../ImplRepo_Service/ImplRepoC.h ../../ImplRepo_Service/ImplRepoC.i \ + airplane_i.h AirplaneS.h AirplaneC.h AirplaneC.i AirplaneS_T.h \ + AirplaneS_T.i AirplaneS_T.cpp AirplaneS.i IR_Helper.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i \ $(ACE_ROOT)/ace/Read_Buffer.h \ $(ACE_ROOT)/ace/Read_Buffer.i -.obj/simple_object_impl.o .obj/simple_object_impl.so .shobj/simple_object_impl.o .shobj/simple_object_impl.so: simple_object_impl.cpp simple_object_impl.h \ - Simple_ObjectS.h Simple_ObjectC.h \ - $(TAO_ROOT)/tao/corba.h \ - $(TAO_ROOT)/tao/orbconf.h \ +.obj/airplane_i.o .obj/airplane_i.so .shobj/airplane_i.o .shobj/airplane_i.so: airplane_i.cpp \ + \ + airplane_i.h AirplaneS.h AirplaneC.h AirplaneC.i AirplaneS_T.h \ + AirplaneS_T.i AirplaneS_T.cpp AirplaneS.i +.obj/IR_Helper.o .obj/IR_Helper.so .shobj/IR_Helper.o .shobj/IR_Helper.so: IR_Helper.cpp IR_Helper.h \ + $(TAO_ROOT)/tao/TAO.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-linux-lxpthreads.h \ - $(ACE_ROOT)/ace/config-linux-common.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -1794,233 +511,92 @@ realclean: clean $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Malloc_T.i \ $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Object_Manager.h \ $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ $(ACE_ROOT)/ace/Message_Block_T.i \ $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.i \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.i \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/Connector.i \ - $(ACE_ROOT)/ace/Connector.cpp \ - $(ACE_ROOT)/ace/Acceptor.h \ - $(ACE_ROOT)/ace/Acceptor.i \ - $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/Align.h \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ - $(TAO_ROOT)/tao/ORB.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/POAC.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Managed_Types.i \ $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/Union.h \ - $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/try_macros.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/NVList.h \ - $(TAO_ROOT)/tao/NVList.i \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Request.i \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/varout.h \ - $(TAO_ROOT)/tao/varout.i \ - $(TAO_ROOT)/tao/varout.cpp \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Marshal.h \ - $(TAO_ROOT)/tao/Marshal.i \ - $(TAO_ROOT)/tao/singletons.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/POA.h \ - $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/POAC.i \ - $(TAO_ROOT)/tao/Servant_Base.h \ - $(TAO_ROOT)/tao/POAS.h \ - $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/DynAnyC.h \ - $(TAO_ROOT)/tao/DynAnyC.i \ - $(TAO_ROOT)/tao/POAS.i \ - $(TAO_ROOT)/tao/Active_Object_Map.h \ - $(TAO_ROOT)/tao/Active_Object_Map.i \ - $(TAO_ROOT)/tao/POA.i \ - $(TAO_ROOT)/tao/poa_macros.h \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Connect.h \ - $(TAO_ROOT)/tao/Connect.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ - $(TAO_ROOT)/tao/ORB_Core.i \ - $(ACE_ROOT)/ace/Dynamic_Service.h \ - $(ACE_ROOT)/ace/Dynamic_Service.cpp \ - $(TAO_ROOT)/tao/Operation_Table.h \ - $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ - $(TAO_ROOT)/tao/IIOP_Object.h \ - $(TAO_ROOT)/tao/IIOP_Object.i \ - $(TAO_ROOT)/tao/IIOP_ORB.h \ - $(TAO_ROOT)/tao/IIOP_ORB.i \ - $(TAO_ROOT)/tao/IIOP_Interpreter.h \ - $(TAO_ROOT)/tao/GIOP.h \ - $(TAO_ROOT)/tao/GIOP.i \ - $(TAO_ROOT)/tao/Invocation.h \ - $(TAO_ROOT)/tao/Invocation.i \ - $(TAO_ROOT)/tao/Server_Request.h \ - $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ - $(TAO_ROOT)/tao/DynAny_i.h Simple_ObjectC.i \ - Simple_ObjectS_T.h Simple_ObjectS_T.i Simple_ObjectS_T.cpp \ - Simple_ObjectS.i ../../ImplRepo_Service/PingS.h \ - ../../ImplRepo_Service/PingC.h ../../ImplRepo_Service/PingC.i \ - ../../ImplRepo_Service/PingS_T.h ../../ImplRepo_Service/PingS_T.i \ - ../../ImplRepo_Service/PingS_T.cpp ../../ImplRepo_Service/PingS.i + $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(ACE_ROOT)/ace/Read_Buffer.h \ + $(ACE_ROOT)/ace/Read_Buffer.i \ + $(TAO_ROOT)/tao/IIOP_Profile.h \ + $(TAO_ROOT)/tao/IIOP_Profile.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/PingS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/PingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/PingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/PingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/PingS.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp index 21e63c52b10..d7d52fd319b 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp @@ -88,12 +88,13 @@ Airplane_Client_i::get_planes (size_t count) { for (size_t i = 0; i < count; i++) { - TAO_TRY + TAO_TRY { - char *response = this->server_->get_plane (TAO_TRY_ENV); + CORBA::String_var response = + this->server_->get_plane (TAO_TRY_ENV); TAO_CHECK_ENV; - ACE_DEBUG ((LM_DEBUG, "Plane %d is %s\n", i, response)); + ACE_DEBUG ((LM_DEBUG, "Plane %d is %s\n", i, response.in ())); } TAO_CATCHANY { diff --git a/TAO/orbsvcs/tests/Makefile b/TAO/orbsvcs/tests/Makefile index 4108f7de43f..c4247d21f1b 100644 --- a/TAO/orbsvcs/tests/Makefile +++ b/TAO/orbsvcs/tests/Makefile @@ -17,13 +17,13 @@ DIRS = Simple_Naming \ EC_Custom_Marshal \ EC_Basic \ Concurrency \ - Trading - -ifdef av -## Add the implementation files -DIRS += AVStreams\ - CosPropertyService -endif + Trading \ + Property \ + CosEC_Basic \ + CosEC_Multiple \ + ImplRepo \ + Sched_Conf \ + Time #---------------------------------------------------------------------------- # Include macros and targets diff --git a/TAO/orbsvcs/tests/Property/Makefile b/TAO/orbsvcs/tests/Property/Makefile index b757539febb..25695197a82 100644 --- a/TAO/orbsvcs/tests/Property/Makefile +++ b/TAO/orbsvcs/tests/Property/Makefile @@ -52,8 +52,10 @@ realclean: clean .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp server.h \ $(TAO_ROOT)/tao/TAO.h \ - $(TAO_ROOT)/tao/corba.h \ - $(TAO_ROOT)/tao/orbconf.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ @@ -66,212 +68,77 @@ realclean: clean $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Malloc_T.i \ $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Object_Manager.h \ $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.i \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.i \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Connector.i \ - $(ACE_ROOT)/ace/Connector.cpp \ - $(ACE_ROOT)/ace/Acceptor.h \ - $(ACE_ROOT)/ace/Acceptor.i \ - $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/Align.h \ - $(TAO_ROOT)/tao/ORB.h \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/POAC.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Managed_Types.i \ $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/Union.h \ - $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/Exception.h \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/NVList.h \ - $(TAO_ROOT)/tao/NVList.i \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Request.i \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Marshal.h \ - $(TAO_ROOT)/tao/Marshal.i \ - $(TAO_ROOT)/tao/CDR.h \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/POA.h \ - $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/POAC.i \ - $(TAO_ROOT)/tao/Servant_Base.h \ - $(TAO_ROOT)/tao/POAS.h \ - $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/POAS.i \ - $(TAO_ROOT)/tao/Active_Object_Map.h \ - $(TAO_ROOT)/tao/POA.i \ - $(TAO_ROOT)/tao/poa_macros.h \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Connect.h \ - $(TAO_ROOT)/tao/Connect.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ - $(TAO_ROOT)/tao/ORB_Core.i \ - $(ACE_ROOT)/ace/Dynamic_Service.h \ - $(ACE_ROOT)/ace/Dynamic_Service.cpp \ - $(TAO_ROOT)/tao/Operation_Table.h \ - $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ - $(TAO_ROOT)/tao/IIOP_Object.h \ - $(TAO_ROOT)/tao/IIOP_Object.i \ - $(TAO_ROOT)/tao/IIOP_ORB.h \ - $(TAO_ROOT)/tao/IIOP_ORB.i \ - $(TAO_ROOT)/tao/IIOP_Interpreter.h \ - $(TAO_ROOT)/tao/GIOP.h \ - $(TAO_ROOT)/tao/GIOP.i \ - $(TAO_ROOT)/tao/Invocation.h \ - $(TAO_ROOT)/tao/Invocation.i \ - $(TAO_ROOT)/tao/Server_Request.h \ - $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/singletons.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ @@ -313,6 +180,9 @@ realclean: clean $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -335,9 +205,10 @@ realclean: clean $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers.cpp \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -362,6 +233,9 @@ realclean: clean $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ $(ACE_ROOT)/ace/Message_Queue_T.i \ @@ -369,8 +243,6 @@ realclean: clean $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ @@ -385,7 +257,15 @@ realclean: clean $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ @@ -407,117 +287,31 @@ realclean: clean $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i \ $(TAO_ROOT)/tao/TAO.h \ - $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/try_macros.h \ $(TAO_ROOT)/tao/orbconf.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.i \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Connector.i \ - $(ACE_ROOT)/ace/Connector.cpp \ - $(ACE_ROOT)/ace/Acceptor.h \ - $(ACE_ROOT)/ace/Acceptor.i \ - $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/Align.h \ - $(TAO_ROOT)/tao/ORB.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/POAC.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Managed_Types.i \ $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/Union.h \ - $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/Exception.h \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/NVList.h \ - $(TAO_ROOT)/tao/NVList.i \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Request.i \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Marshal.h \ - $(TAO_ROOT)/tao/Marshal.i \ - $(TAO_ROOT)/tao/CDR.h \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/POA.h \ - $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/POAC.i \ - $(TAO_ROOT)/tao/Servant_Base.h \ - $(TAO_ROOT)/tao/POAS.h \ - $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/POAS.i \ - $(TAO_ROOT)/tao/Active_Object_Map.h \ - $(TAO_ROOT)/tao/POA.i \ - $(TAO_ROOT)/tao/poa_macros.h \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Connect.h \ - $(TAO_ROOT)/tao/Connect.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ - $(TAO_ROOT)/tao/ORB_Core.i \ - $(ACE_ROOT)/ace/Dynamic_Service.h \ - $(ACE_ROOT)/ace/Dynamic_Service.cpp \ - $(TAO_ROOT)/tao/Operation_Table.h \ - $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ - $(TAO_ROOT)/tao/IIOP_Object.h \ - $(TAO_ROOT)/tao/IIOP_Object.i \ - $(TAO_ROOT)/tao/IIOP_ORB.h \ - $(TAO_ROOT)/tao/IIOP_ORB.i \ - $(TAO_ROOT)/tao/IIOP_Interpreter.h \ - $(TAO_ROOT)/tao/GIOP.h \ - $(TAO_ROOT)/tao/GIOP.i \ - $(TAO_ROOT)/tao/Invocation.h \ - $(TAO_ROOT)/tao/Invocation.i \ - $(TAO_ROOT)/tao/Server_Request.h \ - $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/singletons.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ diff --git a/TAO/orbsvcs/tests/Sched/Makefile b/TAO/orbsvcs/tests/Sched/Makefile index a9e885ffbe8..290b2b81a18 100644 --- a/TAO/orbsvcs/tests/Sched/Makefile +++ b/TAO/orbsvcs/tests/Sched/Makefile @@ -49,10 +49,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -67,8 +68,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -80,7 +82,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers.cpp \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Object_Manager.h \ $(ACE_ROOT)/ace/Object_Manager.i \ @@ -95,8 +99,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ @@ -110,152 +112,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/SchedEntry.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ - $(TAO_ROOT)/tao/corba.h \ - $(TAO_ROOT)/tao/orbconf.h \ - $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.i \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.i \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Connector.i \ - $(ACE_ROOT)/ace/Connector.cpp \ - $(ACE_ROOT)/ace/Acceptor.h \ - $(ACE_ROOT)/ace/Acceptor.i \ - $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/Align.h \ - $(TAO_ROOT)/tao/ORB.h \ - $(TAO_ROOT)/tao/Sequence.h \ - $(TAO_ROOT)/tao/Sequence.i \ - $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.i \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/Union.h \ - $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/Exception.h \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/NVList.h \ - $(TAO_ROOT)/tao/NVList.i \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Request.i \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Marshal.h \ - $(TAO_ROOT)/tao/Marshal.i \ - $(TAO_ROOT)/tao/CDR.h \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/POA.h \ - $(TAO_ROOT)/tao/POAC.h \ - $(TAO_ROOT)/tao/POAC.i \ - $(TAO_ROOT)/tao/Servant_Base.h \ - $(TAO_ROOT)/tao/POAS.h \ - $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/POAS.i \ - $(TAO_ROOT)/tao/Active_Object_Map.h \ - $(TAO_ROOT)/tao/POA.i \ - $(TAO_ROOT)/tao/poa_macros.h \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Connect.h \ - $(TAO_ROOT)/tao/Connect.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ - $(TAO_ROOT)/tao/ORB_Core.i \ - $(ACE_ROOT)/ace/Dynamic_Service.h \ - $(ACE_ROOT)/ace/Dynamic_Service.cpp \ - $(TAO_ROOT)/tao/Operation_Table.h \ - $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ - $(TAO_ROOT)/tao/IIOP_Object.h \ - $(TAO_ROOT)/tao/IIOP_Object.i \ - $(TAO_ROOT)/tao/IIOP_ORB.h \ - $(TAO_ROOT)/tao/IIOP_ORB.i \ - $(TAO_ROOT)/tao/IIOP_Interpreter.h \ - $(TAO_ROOT)/tao/GIOP.h \ - $(TAO_ROOT)/tao/GIOP.i \ - $(TAO_ROOT)/tao/Invocation.h \ - $(TAO_ROOT)/tao/Invocation.i \ - $(TAO_ROOT)/tao/Server_Request.h \ - $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/singletons.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \ diff --git a/TAO/orbsvcs/tests/Sched_Conf/Makefile b/TAO/orbsvcs/tests/Sched_Conf/Makefile index 6d4b901f88b..4c49ed15966 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Makefile +++ b/TAO/orbsvcs/tests/Sched_Conf/Makefile @@ -56,70 +56,125 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG) $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Sched_Params.i \ $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i \ $(TAO_ROOT)/tao/corba.h \ - $(TAO_ROOT)/tao/orbconf.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Malloc_T.i \ $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Object_Manager.h \ $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Request.i \ + $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOP.h \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Server_Request.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ + $(TAO_ROOT)/tao/Marshal.h \ + $(TAO_ROOT)/tao/Marshal.i \ + $(TAO_ROOT)/tao/singletons.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/POA.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ @@ -131,34 +186,53 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG) $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Strategies.h \ + $(TAO_ROOT)/tao/POAC.h \ + $(TAO_ROOT)/tao/POAC.i \ + $(TAO_ROOT)/tao/Servant_Base.h \ + $(TAO_ROOT)/tao/Servant_Base.i \ + $(TAO_ROOT)/tao/POAS.h \ + $(TAO_ROOT)/tao/POA_CORBA.h \ + $(TAO_ROOT)/tao/DynAnyC.h \ + $(TAO_ROOT)/tao/DynAnyC.i \ + $(TAO_ROOT)/tao/POAS.i \ + $(TAO_ROOT)/tao/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Active_Object_Map.i \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/params.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ $(ACE_ROOT)/ace/Message_Queue_T.i \ $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Message_Queue.i \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ + $(TAO_ROOT)/tao/IIOP_Connector.h \ $(ACE_ROOT)/ace/Connector.h \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ @@ -175,93 +249,42 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG) $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.i \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Svc_Handler.i \ $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ $(ACE_ROOT)/ace/Connector.i \ $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(TAO_ROOT)/tao/Connect.h \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/Align.h \ - $(TAO_ROOT)/tao/ORB.h \ - $(TAO_ROOT)/tao/Sequence.h \ - $(TAO_ROOT)/tao/Sequence.i \ - $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.i \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/Union.h \ - $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/Exception.h \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/NVList.h \ - $(TAO_ROOT)/tao/NVList.i \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Request.i \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Marshal.h \ - $(TAO_ROOT)/tao/Marshal.i \ - $(TAO_ROOT)/tao/CDR.h \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/POA.h \ - $(TAO_ROOT)/tao/POAC.h \ - $(TAO_ROOT)/tao/POAC.i \ - $(TAO_ROOT)/tao/Servant_Base.h \ - $(TAO_ROOT)/tao/POAS.h \ - $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/POAS.i \ - $(TAO_ROOT)/tao/Active_Object_Map.h \ - $(TAO_ROOT)/tao/POA.i \ - $(TAO_ROOT)/tao/poa_macros.h \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Connect.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ $(TAO_ROOT)/tao/Connect.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/IIOP_Acceptor.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ - $(TAO_ROOT)/tao/debug.h \ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ - $(TAO_ROOT)/tao/IIOP_Object.h \ - $(TAO_ROOT)/tao/IIOP_Object.i \ - $(TAO_ROOT)/tao/IIOP_ORB.h \ - $(TAO_ROOT)/tao/IIOP_ORB.i \ - $(TAO_ROOT)/tao/IIOP_Interpreter.h \ - $(TAO_ROOT)/tao/GIOP.h \ - $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Invocation.h \ $(TAO_ROOT)/tao/Invocation.i \ - $(TAO_ROOT)/tao/Server_Request.h \ - $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/singletons.h \ + $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ + $(TAO_ROOT)/tao/DynAny_i.h \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ @@ -270,6 +293,19 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG) $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i + $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/CosNaming_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp index b86abd454e9..0eca9668080 100644 --- a/TAO/tao/append.cpp +++ b/TAO/tao/append.cpp @@ -24,6 +24,7 @@ #include "tao/Environment.h" #include "tao/Any.h" #include "tao/GIOP.h" +#include "tao/debug.h" ACE_RCSID(tao, append, "$Id$") @@ -86,9 +87,10 @@ TAO_Marshal_Primitive::append (CORBA::TypeCode_ptr tc, return CORBA::TypeCode::TRAVERSE_CONTINUE; else { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_Primitive::append detected error\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Primitive::encode detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -122,10 +124,11 @@ TAO_Marshal_Any::append (CORBA::TypeCode_ptr, } if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE) { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_Any::append detected error\n")); CORBA::release (elem_tc); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Any::append detected error")); } return retval; } @@ -195,9 +198,11 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr, } else // bad kind_ value to be decoded { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_TypeCode: " + "Bad kind_ value in CDR stream\n")); env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_TypeCode: Bad kind_ value in CDR stream")); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -207,9 +212,10 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr, return CORBA::TypeCode::TRAVERSE_CONTINUE; else { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_TypeCode::append detected error\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_TypeCode::append detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -285,8 +291,9 @@ TAO_Marshal_ObjRef::append (CORBA::TypeCode_ptr, return CORBA::TypeCode::TRAVERSE_CONTINUE; else { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_ObjRef::append detected error\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); - ACE_DEBUG ((LM_DEBUG, "marshaling decode_objref detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -329,9 +336,10 @@ TAO_Marshal_Struct::append (CORBA::TypeCode_ptr tc, return CORBA::TypeCode::TRAVERSE_CONTINUE; else { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_Struct::encode detected error\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); - ACE_DEBUG ((LM_DEBUG, - "marshaling encode_struct detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -549,9 +557,10 @@ TAO_Marshal_String::append (CORBA::TypeCode_ptr, return CORBA::TypeCode::TRAVERSE_CONTINUE; else { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_TypeCode::append detected error")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_TypeCode::append detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -599,9 +608,10 @@ TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr tc, } // no exception computing content type } // error exit + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "marshaling TAO_Marshal_Sequence::append detected error\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO)); - ACE_DEBUG ((LM_DEBUG, - "marshaling TAO_Marshal_Sequence::append detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } @@ -641,10 +651,12 @@ TAO_Marshal_Array::append (CORBA::TypeCode_ptr tc, return CORBA::TypeCode::TRAVERSE_CONTINUE; } // no exception computing content type } // no exception computing bounds + // error exit + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_Sequence::append detected error")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO)); - ACE_DEBUG ((LM_DEBUG, - "marshaling TAO_Marshal_Sequence::append detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } @@ -675,9 +687,10 @@ TAO_Marshal_Alias::append (CORBA::TypeCode_ptr tc, return CORBA::TypeCode::TRAVERSE_CONTINUE; else { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_Alias::append detected error\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Alias::append detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -728,9 +741,10 @@ TAO_Marshal_Except::append (CORBA::TypeCode_ptr tc, return CORBA::TypeCode::TRAVERSE_CONTINUE; else { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_Except::append detected error\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Except detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -758,9 +772,10 @@ TAO_Marshal_WString::append (CORBA::TypeCode_ptr, return CORBA::TypeCode::TRAVERSE_CONTINUE; else { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_WString::append detected error\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_TypeCode::append detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } } diff --git a/TAO/tao/decode.cpp b/TAO/tao/decode.cpp index 213693ac23f..9a3a9118738 100644 --- a/TAO/tao/decode.cpp +++ b/TAO/tao/decode.cpp @@ -115,8 +115,9 @@ TAO_Marshal_Primitive::decode (CORBA::TypeCode_ptr tc, return CORBA::TypeCode::TRAVERSE_CONTINUE; else { - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Primitive::decode detected error")); + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_Primitive::decode detected error\n")); TAO_THROW_ENV_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); } @@ -222,9 +223,10 @@ TAO_Marshal_Any::decode (CORBA::TypeCode_ptr, if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE) { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_Any::decode detected error\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Any::decode detected error")); } return retval; } @@ -521,8 +523,10 @@ TAO_Marshal_TypeCode::decode (CORBA::TypeCode_ptr, else // bad kind_ value to be decoded { env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_TypeCode: Bad kind_ value in CDR stream")); + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_TypeCode:decode: " + "Bad kind_ value in CDR stream\n")); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -531,9 +535,10 @@ TAO_Marshal_TypeCode::decode (CORBA::TypeCode_ptr, return CORBA::TypeCode::TRAVERSE_CONTINUE; else { + if (TAO_debug_level) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_TypeCode::decode detected error\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_TypeCode::decode detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -574,9 +579,10 @@ TAO_Marshal_Principal::decode (CORBA::TypeCode_ptr, return CORBA::TypeCode::TRAVERSE_CONTINUE; else { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_Principal::decode detected error\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Principal::decode detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -633,26 +639,26 @@ TAO_Marshal_ObjRef::decode (CORBA::TypeCode_ptr, // @@ For now we just take IIOP_Profiles, FRED // We keep decoding until we find a valid IIOP profile. CORBA::ULong tag; - + // get the profile ID tag if ( (continue_decoding = stream->read_ulong (tag)) == 0) { ACE_DEBUG ((LM_DEBUG, "cannot read profile tag\n")); continue; } - + if (tag != TAO_IOP_TAG_INTERNET_IOP ) // || objdata != 0) { continue_decoding = stream->skip_string (); ACE_DEBUG ((LM_DEBUG, "unknown tag %d skipping\n", tag)); continue; } - + // OK, we've got an IIOP profile. It's going to be // encapsulated ProfileData. Create a new decoding stream and // context for it, and tell the "parent" stream that this data // isn't part of it any more. - + CORBA::ULong encap_len; // ProfileData is encoded as a sequence of octet. So first get // the length of the sequence. @@ -661,15 +667,15 @@ TAO_Marshal_ObjRef::decode (CORBA::TypeCode_ptr, ACE_DEBUG ((LM_DEBUG, "cannot read encap length\n")); continue; } - + // Create the decoding stream from the encapsulation in the // buffer, and skip the encapsulation. TAO_InputCDR str (*stream, encap_len); - + continue_decoding = str.good_bit () && stream->skip_bytes(encap_len); - + if (!continue_decoding) { ACE_DEBUG ((LM_DEBUG, @@ -677,11 +683,11 @@ TAO_Marshal_ObjRef::decode (CORBA::TypeCode_ptr, "len = %d\n", encap_len)); continue; } - + // get the default IIOP Profile and fill in the blanks // with str. TAO_IIOP_Profile *pfile = new TAO_IIOP_Profile; - + // return code will be -1 if an error occurs // otherwise 0 for stop (can't read this profile type or version) // and 1 for continue. @@ -710,7 +716,8 @@ TAO_Marshal_ObjRef::decode (CORBA::TypeCode_ptr, { env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); ACE_DEBUG ((LM_DEBUG, "no IIOP v%d.%d (or earlier) profile in IOR!\n", - TAO_IIOP_Profile::DEF_IIOP_MAJOR, TAO_IIOP_Profile::DEF_IIOP_MINOR)); + TAO_IIOP_Profile::DEF_IIOP_MAJOR, + TAO_IIOP_Profile::DEF_IIOP_MINOR)); // get rid of the original MProfile! delete mp; @@ -750,8 +757,9 @@ TAO_Marshal_ObjRef::decode (CORBA::TypeCode_ptr, return CORBA::TypeCode::TRAVERSE_CONTINUE; else { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, "marshaling decode_objref detected error\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); - ACE_DEBUG ((LM_DEBUG, "marshaling decode_objref detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -917,9 +925,10 @@ TAO_Marshal_Struct::decode (CORBA::TypeCode_ptr tc, return CORBA::TypeCode::TRAVERSE_CONTINUE; else { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_Struct::decode detected error\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); - ACE_DEBUG ((LM_DEBUG, - "marshaling encode_struct detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -1153,9 +1162,10 @@ TAO_Marshal_String::decode (CORBA::TypeCode_ptr, return CORBA::TypeCode::TRAVERSE_CONTINUE; else { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_String::decode detected error\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_TypeCode::decode detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -1522,10 +1532,12 @@ TAO_Marshal_Array::decode (CORBA::TypeCode_ptr tc, } // no exception computing size } // no exception computing content type } // no exception computing bounds + // error exit + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_Sequence::decode detected error\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO)); - ACE_DEBUG ((LM_DEBUG, - "marshaling TAO_Marshal_Sequence::decode detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } @@ -1619,9 +1631,10 @@ TAO_Marshal_Alias::decode (CORBA::TypeCode_ptr tc, return CORBA::TypeCode::TRAVERSE_CONTINUE; else { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_Alias::decode detected error\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Alias::decode detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -1748,9 +1761,10 @@ TAO_Marshal_Except::decode (CORBA::TypeCode_ptr tc, return CORBA::TypeCode::TRAVERSE_CONTINUE; else { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_Except::decode detected error\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Except detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -1794,9 +1808,10 @@ TAO_Marshal_WString::decode (CORBA::TypeCode_ptr, return CORBA::TypeCode::TRAVERSE_CONTINUE; else { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_WString::decode detected error\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_TypeCode::decode detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } } diff --git a/TAO/tao/deep_free.cpp b/TAO/tao/deep_free.cpp index 2263bdfc319..b858f102c09 100644 --- a/TAO/tao/deep_free.cpp +++ b/TAO/tao/deep_free.cpp @@ -33,6 +33,7 @@ #include "tao/Object.h" #include "tao/Any.h" #include "tao/Sequence.h" +#include "tao/debug.h" ACE_RCSID(tao, deep_free, "$Id$") @@ -121,16 +122,13 @@ TAO_Marshal_Primitive::deep_free (CORBA::TypeCode_ptr tc, if (!tc) { - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Primitive::deep_free detected error")); + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_Primitive::deep_free detected error\n")); TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); } my_kind = tc->kind (env); - - // @@EXC@@ Don't know how to print the following debug info. - // Anyhow, currently, tc->kind won't throw any exception. - // ACE_DEBUG ((LM_DEBUG,"TAO_Marshal_Primitive::deep_free detected error")); TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP); switch (my_kind) @@ -153,8 +151,9 @@ TAO_Marshal_Primitive::deep_free (CORBA::TypeCode_ptr tc, case CORBA::tk_boolean: break; default: - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Primitive::deep_free detected error")); + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_Primitive::deep_free detected error\n")); TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); } return CORBA::TypeCode::TRAVERSE_CONTINUE; @@ -169,8 +168,9 @@ TAO_Marshal_Struct::deep_free (CORBA::TypeCode_ptr tc, { if (!tc) { - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Struct::deep_free detected error")); + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_Struct::deep_free detected error\n")); TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); } @@ -180,10 +180,6 @@ TAO_Marshal_Struct::deep_free (CORBA::TypeCode_ptr tc, // compute the number of fields in the struct int member_count = tc->member_count (env); - - // @@EXC@@ Don't know how to print out this error message using - // the TAO_CHECK... macro. Is it necessary? - // ACE_DEBUG((LM_DEBUG,"TAO_Marshal_Struct::deep_free detected error")); TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP); for (int i = 0; i < member_count && retval == @@ -192,17 +188,11 @@ TAO_Marshal_Struct::deep_free (CORBA::TypeCode_ptr tc, // get the typecode for the ith field param = tc->member_type (i, env); - // @@EXC@@ Don't know how to print out this error message using - // the TAO_CHECK... macro. Is it necessary? - // ACE_DEBUG ((LM_DEBUG,"TAO_Marshal_Struct::deep_free detected error")); TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP); // get the size of the field size = param->size (env); - // @@EXC@@ Don't know how to print out this error message using - // the TAO_CHECK... macro. Is it necessary? - // ACE_DEBUG ((LM_DEBUG,"TAO_Marshal_Struct::deep_free detected error")); TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP); switch (param->kind_) @@ -277,8 +267,9 @@ TAO_Marshal_Struct::deep_free (CORBA::TypeCode_ptr tc, if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE) { - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Struct::deep_free detected error")); + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_Struct::deep_free detected error\n")); TAO_THROW_ENV_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); } return CORBA::TypeCode::TRAVERSE_CONTINUE; @@ -454,8 +445,9 @@ TAO_Marshal_Array::deep_free (CORBA::TypeCode_ptr tc, if (!tc) { - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Struct::deep_free detected error")); + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_Struct::deep_free detected error\n")); TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); } @@ -599,8 +591,9 @@ TAO_Marshal_Array::deep_free (CORBA::TypeCode_ptr tc, return CORBA::TypeCode::TRAVERSE_CONTINUE; else { - ACE_DEBUG ((LM_DEBUG, - "marshaling TAO_Marshal_Sequence::deep_free detected error")); + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_Sequence::deep_free detected error\n")); // error exit TAO_THROW_ENV_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), env, CORBA::TypeCode::TRAVERSE_STOP); } @@ -620,8 +613,9 @@ TAO_Marshal_Alias::deep_free (CORBA::TypeCode_ptr tc, if (!tc) { - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Struct::deep_free detected error")); + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_Alias::deep_free detected error\n")); TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); } @@ -700,8 +694,9 @@ TAO_Marshal_Alias::deep_free (CORBA::TypeCode_ptr tc, else { // We should never reach here. - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Alias::decode detected error")); + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_Alias::decode detected error\n")); TAO_THROW_ENV_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); } ACE_NOTREACHED (return CORBA::TypeCode::TRAVERSE_STOP); @@ -725,8 +720,9 @@ TAO_Marshal_Except::deep_free (CORBA::TypeCode_ptr tc, if (!tc) { - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Struct::deep_free detected error")); + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_Except::deep_free detected error\n")); TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); } // XXX: Exceptions are currently leaked because of bugs lurking diff --git a/TAO/tao/encode.cpp b/TAO/tao/encode.cpp index f878a6b070b..0c214c4d853 100644 --- a/TAO/tao/encode.cpp +++ b/TAO/tao/encode.cpp @@ -95,9 +95,10 @@ TAO_Marshal_Primitive::encode (CORBA::TypeCode_ptr tc, return CORBA::TypeCode::TRAVERSE_CONTINUE; else { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_Primitive::encode detected error\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Primitive::encode detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -144,9 +145,10 @@ TAO_Marshal_Any::encode (CORBA::TypeCode_ptr, return CORBA::TypeCode::TRAVERSE_CONTINUE; else { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_Any::encode detected error\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Any::encode detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -184,8 +186,9 @@ TAO_Marshal_TypeCode::encode (CORBA::TypeCode_ptr, // Indirected typecodes can't occur at "top level" like // this, only nested inside others! case ~0u: - ACE_DEBUG ((LM_DEBUG, - "indirected typecode at top level!")); + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "indirected typecode at top level!\n")); continue_encoding = 0; break; @@ -212,9 +215,10 @@ TAO_Marshal_TypeCode::encode (CORBA::TypeCode_ptr, return CORBA::TypeCode::TRAVERSE_CONTINUE; else { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_TypeCode::encode detected error\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_TypeCode::encode detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -246,9 +250,10 @@ TAO_Marshal_Principal::encode (CORBA::TypeCode_ptr, return CORBA::TypeCode::TRAVERSE_CONTINUE; else { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_Principal::encode detected error\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Principal::encode detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -469,9 +474,10 @@ TAO_Marshal_Struct::encode (CORBA::TypeCode_ptr tc, return CORBA::TypeCode::TRAVERSE_CONTINUE; else { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_Struct::encode detected error\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); - ACE_DEBUG ((LM_DEBUG, - "marshaling encode_struct detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -601,10 +607,13 @@ TAO_Marshal_Union::encode (CORBA::TypeCode_ptr tc, discrim_matched = 1; } break; + default: env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); - ACE_DEBUG ((LM_DEBUG, - "Union::encode - Bad discriminant type")); + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "Union::encode - " + "Bad discriminant type\n")); return CORBA::TypeCode::TRAVERSE_STOP; }// end of switch @@ -629,8 +638,11 @@ TAO_Marshal_Union::encode (CORBA::TypeCode_ptr tc, else // error getting member type { env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); - ACE_DEBUG ((LM_DEBUG, - "Union::encode - error getting member type:%d",i)); + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "Union::encode - error " + "getting member type:%d\n", + i)); return CORBA::TypeCode::TRAVERSE_STOP; } @@ -639,7 +651,8 @@ TAO_Marshal_Union::encode (CORBA::TypeCode_ptr tc, { env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); ACE_DEBUG ((LM_DEBUG, - "Union::encode - error member label : %d", i)); + "Union::encode - error " + "member label : %d\n", i)); return CORBA::TypeCode::TRAVERSE_STOP; } } // end of while @@ -652,48 +665,59 @@ TAO_Marshal_Union::encode (CORBA::TypeCode_ptr tc, else { env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO)); - ACE_DEBUG ((LM_DEBUG, - "Union::encode - failed. No match and no default case")); + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "Union::encode - failed. " + "No match and no default case\n")); return CORBA::TypeCode::TRAVERSE_STOP; } } else // error getting member count { env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO)); - ACE_DEBUG ((LM_DEBUG, - "Union::encode - error getting member count")); + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "Union::encode - error getting " + "member count\n")); return CORBA::TypeCode::TRAVERSE_STOP; } } else // error getting default index { env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); - ACE_DEBUG ((LM_DEBUG, - "Union::encode - error getting default used")); + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "Union::encode - error getting " + "default used\n")); return CORBA::TypeCode::TRAVERSE_STOP; } } else // error getting discrim_pad_size { env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); - ACE_DEBUG ((LM_DEBUG, - "Union::encode - error getting discrim padded size")); + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "Union::encode - error getting " + "discrim padded size\n")); return CORBA::TypeCode::TRAVERSE_STOP; } } else // error encoding discriminant { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "Union::encode - error encoding discriminant\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); - ACE_DEBUG ((LM_DEBUG, - "Union::encode - error encoding discriminant")); return CORBA::TypeCode::TRAVERSE_STOP; } } else // error getting the discriminant { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "Union::encode - error getting " + "the discriminant typecode\n")); env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); - ACE_DEBUG ((LM_DEBUG, - "Union::encode - error getting the discriminant typecode")); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -1080,10 +1104,12 @@ TAO_Marshal_Array::encode (CORBA::TypeCode_ptr tc, } // no exception computing size } // no exception computing content type } // no exception computing bounds + // error exit + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_Sequence::encode detected error\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO)); - ACE_DEBUG ((LM_DEBUG, - "marshaling TAO_Marshal_Sequence::encode detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } @@ -1164,9 +1190,10 @@ TAO_Marshal_Alias::encode (CORBA::TypeCode_ptr tc, return CORBA::TypeCode::TRAVERSE_CONTINUE; else { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_Alias::encode detected error\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Alias::encode detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -1285,9 +1312,10 @@ TAO_Marshal_Except::encode (CORBA::TypeCode_ptr tc, return CORBA::TypeCode::TRAVERSE_CONTINUE; else { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_Except::encode detected error\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Except detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } } diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp index 0b46dda1867..d8ed540621c 100644 --- a/TAO/tao/skip.cpp +++ b/TAO/tao/skip.cpp @@ -24,6 +24,7 @@ #include "tao/GIOP.h" #include "tao/Any.h" #include "tao/Environment.h" +#include "tao/debug.h" ACE_RCSID(tao, skip, "$Id$") @@ -81,9 +82,10 @@ TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr tc, return CORBA::TypeCode::TRAVERSE_CONTINUE; else { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_Primitive::skip detected error\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Primitive::skip detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -195,9 +197,11 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr, } else // bad kind_ value to be decoded { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_TypeCode::skip: " + "Bad kind_ value in CDR stream")); env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_TypeCode: Bad kind_ value in CDR stream")); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -206,9 +210,10 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr, return CORBA::TypeCode::TRAVERSE_CONTINUE; else { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_TypeCode::skip detected error\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_TypeCode::skip detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -238,9 +243,10 @@ TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr, return CORBA::TypeCode::TRAVERSE_CONTINUE; else { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_Principal::skip detected error\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Principal::skip detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -323,9 +329,10 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr, if (!str.skip_string () || !str.skip_ushort ()) { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "error decoding IIOP host/port")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); - ACE_DEBUG ((LM_DEBUG, - "error decoding IIOP host/port")); return CORBA::TypeCode::TRAVERSE_STOP; } @@ -343,8 +350,10 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr, return CORBA::TypeCode::TRAVERSE_CONTINUE; else { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_ObjRef::skip detected error\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); - ACE_DEBUG ((LM_DEBUG, "marshaling decode_objref detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -383,9 +392,10 @@ TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr tc, return CORBA::TypeCode::TRAVERSE_CONTINUE; else { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_Struct::skip detected error\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); - ACE_DEBUG ((LM_DEBUG, - "marshaling encode_struct detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -595,9 +605,10 @@ TAO_Marshal_String::skip (CORBA::TypeCode_ptr, return CORBA::TypeCode::TRAVERSE_CONTINUE; else { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_TypeCode::skip detected error")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_TypeCode::skip detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -644,9 +655,10 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr tc, return CORBA::TypeCode::TRAVERSE_CONTINUE; } // error exit + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_Sequence::skip detected error\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO)); - ACE_DEBUG ((LM_DEBUG, - "marshaling TAO_Marshal_Sequence::skip detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } @@ -682,9 +694,10 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr tc, } // no exception computing content type } // no exception computing bounds // error exit + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_Sequence::skip detected error\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO)); - ACE_DEBUG ((LM_DEBUG, - "marshaling TAO_Marshal_Sequence::skip detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } @@ -716,9 +729,10 @@ TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr tc, return CORBA::TypeCode::TRAVERSE_CONTINUE; else { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_Alias::skip detected error\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Alias::skip detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -768,9 +782,10 @@ TAO_Marshal_Except::skip (CORBA::TypeCode_ptr tc, return CORBA::TypeCode::TRAVERSE_CONTINUE; else { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_Except::skip detected error\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Except detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -805,9 +820,10 @@ TAO_Marshal_WString::skip (CORBA::TypeCode_ptr, return CORBA::TypeCode::TRAVERSE_CONTINUE; else { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Marshal_WString::skip detected error\n")); env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); - ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_TypeCode::skip detected error")); return CORBA::TypeCode::TRAVERSE_STOP; } } |