diff options
| author | pradeep <pradeep@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-07-19 02:40:27 +0000 |
|---|---|---|
| committer | pradeep <pradeep@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-07-19 02:40:27 +0000 |
| commit | 189c6412d9da2ab90c52e6d8d7633627088afad5 (patch) | |
| tree | c7bdbc14102a8ac61f972faffe180d2dacd56b5d | |
| parent | a874eb8f22b1b9837431ac011049d45705c5a3a3 (diff) | |
| download | ATCD-189c6412d9da2ab90c52e6d8d7633627088afad5.tar.gz | |
Tue Jul 18 21:39:39 2000 Pradeep Gore <pradeep@cs.wustl.edu>
75 files changed, 10777 insertions, 2573 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosNotification b/TAO/orbsvcs/orbsvcs/Makefile.CosNotification index d197b8adb1f..4d969b6ca3b 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.CosNotification +++ b/TAO/orbsvcs/orbsvcs/Makefile.CosNotification @@ -45,11 +45,8 @@ IDL_FILES+= \ CosTradingRepos CPP_SRCS += \ - Notify/Notify_Types \ Notify/Notify_EventChannelFactory_i \ - Notify/Notify_Resource_Manager \ Notify/Notify_EventChannel_i \ - Notify/Notify_Event_Manager \ Notify/Notify_ConsumerAdmin_i \ Notify/Notify_SupplierAdmin_i \ Notify/Notify_ProxyPushSupplier_i \ @@ -66,6 +63,24 @@ CPP_SRCS += \ Notify/Notify_Constraint_Visitors CPP_SRCS += \ + Notify/Notify_Event \ + Notify/Notify_Collection \ + Notify/Notify_Event_Map \ + Notify/Notify_Event_Manager \ + Notify/Notify_Event_Processor \ + Notify/Notify_Worker_Task \ + Notify/Notify_Source_Filter_Eval_Command \ + Notify/Notify_Lookup_Command \ + Notify/Notify_Listener_Filter_Eval_Command \ + Notify/Notify_Event_Dispatch_Command \ + Notify/Notify_Update_Dispatch_Command \ + Notify/Notify_Factory \ + Notify/Notify_Default_CO_Factory \ + Notify/Notify_Default_POA_Factory \ + Notify/Notify_Default_Collection_Factory \ + Notify/Notify_Default_EMO_Factory + +CPP_SRCS += \ Trader/Interpreter \ Trader/Constraint_Visitors \ Trader/Constraint_Nodes \ @@ -107,11 +122,17 @@ realclean: clean # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/Notify_Types.o .obj/Notify_Types.so .shobj/Notify_Types.o .shobj/Notify_Types.so: Notify/Notify_Types.cpp Notify/Notify_Types.h \ +.obj/Notify_EventChannelFactory_i.o .obj/Notify_EventChannelFactory_i.so .shobj/Notify_EventChannelFactory_i.o .shobj/Notify_EventChannelFactory_i.so: \ + Notify/Notify_EventChannelFactory_i.cpp \ + $(TAO_ROOT)/tao/Servant_Base.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/tao/corba.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/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -135,10 +156,6 @@ realclean: clean $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(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/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ @@ -198,11 +215,39 @@ realclean: clean $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/PortableServerC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(TAO_ROOT)/tao/Exception.i \ + $(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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/PortableServerC.i \ + $(TAO_ROOT)/tao/Servant_Base.i \ + Notify/Notify_EventChannelFactory_i.h Notify/Notify_ID_Pool_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/ORB.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/IOR_LookupTable.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -230,39 +275,19 @@ realclean: clean $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.i \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/IORManipulation.h \ $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/LocalObject.i \ $(TAO_ROOT)/tao/IORC.h \ $(TAO_ROOT)/tao/IORC.i \ $(TAO_ROOT)/tao/Interceptor.h \ $(TAO_ROOT)/tao/InterceptorC.h \ $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/InterceptorC.i \ $(TAO_ROOT)/tao/Interceptor.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.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 \ @@ -304,13 +329,9 @@ realclean: clean $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ $(ACE_ROOT)/ace/Map_T.cpp \ - $(TAO_ROOT)/tao/PortableServerC.h \ - $(TAO_ROOT)/tao/PortableServerC.i \ $(TAO_ROOT)/tao/Key_Adapters.i \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/poa_macros.h \ - $(TAO_ROOT)/tao/Servant_Base.h \ - $(TAO_ROOT)/tao/Servant_Base.i \ $(TAO_ROOT)/tao/Active_Object_Map.h \ $(TAO_ROOT)/tao/Active_Object_Map.i \ $(TAO_ROOT)/tao/RTCORBAC.h \ @@ -411,23 +432,62 @@ realclean: clean $(TAO_ROOT)/tao/MessagingS_T.i \ $(TAO_ROOT)/tao/MessagingS_T.cpp \ $(TAO_ROOT)/tao/MessagingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + $(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/CosNotifyCommC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ + $(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/CosNotifyChannelAdminC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ + Notify/Notify_ID_Pool_T.i Notify/Notify_ID_Pool_T.cpp \ + Notify/notify_export.h Notify/Notify_EventChannel_i.h \ + Notify/Notify_QoSAdmin_i.h Notify/Notify_Collection.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + Notify/Notify_Channel_Objects_Factory.h Notify/Notify_POA_Factory.h \ + Notify/Notify_Factory.h Notify/Notify_FilterFactory_i.h \ + Notify/Notify_Event.h -.obj/Notify_Resource_Manager.o .obj/Notify_Resource_Manager.so .shobj/Notify_Resource_Manager.o .shobj/Notify_Resource_Manager.so: Notify/Notify_Resource_Manager.cpp \ - Notify/Notify_Resource_Manager.h \ +.obj/Notify_EventChannel_i.o .obj/Notify_EventChannel_i.so .shobj/Notify_EventChannel_i.o .shobj/Notify_EventChannel_i.so: Notify/Notify_EventChannel_i.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ + $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/tao/POA.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -451,17 +511,18 @@ realclean: clean $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ + $(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/ACE.i \ - $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.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_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -476,24 +537,6 @@ realclean: clean $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ - $(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/Based_Pointer_T.h \ - $(ACE_ROOT)/ace/Based_Pointer_T.i \ - $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ - $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ - $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Object_Manager.h \ @@ -509,61 +552,60 @@ realclean: clean $(ACE_ROOT)/ace/Malloc_T.i \ $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ + $(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/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Signal.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 \ - $(TAO_ROOT)/tao/Object_Adapter.h \ - $(TAO_ROOT)/tao/Key_Adapters.h \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Stream.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/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(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/varbase.h \ $(TAO_ROOT)/tao/corbafwd.i \ - $(ACE_ROOT)/ace/Map.h \ - $(ACE_ROOT)/ace/Map_T.h \ - $(ACE_ROOT)/ace/Pair.h \ - $(ACE_ROOT)/ace/Pair_T.h \ - $(ACE_ROOT)/ace/Pair_T.i \ - $(ACE_ROOT)/ace/Pair_T.cpp \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Active_Map_Manager.h \ - $(ACE_ROOT)/ace/Active_Map_Manager.i \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp \ - $(TAO_ROOT)/tao/PortableServerC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/Encodable.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/IOR_LookupTable.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_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 \ + $(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 \ + $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ $(TAO_ROOT)/tao/Managed_Types.i \ @@ -571,53 +613,32 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/CDR.h \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ - $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/PortableServerC.i \ - $(TAO_ROOT)/tao/Key_Adapters.i \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/poa_macros.h \ - $(TAO_ROOT)/tao/Servant_Base.h \ - $(TAO_ROOT)/tao/Servant_Base.i \ - $(TAO_ROOT)/tao/Active_Object_Map.h \ - $(TAO_ROOT)/tao/Active_Object_Map.i \ - $(TAO_ROOT)/tao/RTCORBAC.h \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/Object_Adapter.i \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/POAManager.h \ - $(TAO_ROOT)/tao/POAManager.i \ - $(TAO_ROOT)/tao/POA.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/tao/corba.h \ - $(TAO_ROOT)/tao/ORB.h \ - $(TAO_ROOT)/tao/IOR_LookupTable.h \ - $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/IORManipulation.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/LocalObject.i \ $(TAO_ROOT)/tao/IORC.h \ $(TAO_ROOT)/tao/IORC.i \ $(TAO_ROOT)/tao/Interceptor.h \ $(TAO_ROOT)/tao/InterceptorC.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/InterceptorC.i \ $(TAO_ROOT)/tao/Interceptor.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.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 \ @@ -630,12 +651,50 @@ realclean: clean $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ $(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/Server_Request.i \ + $(TAO_ROOT)/tao/POA.h \ + $(TAO_ROOT)/tao/Object_Adapter.h \ + $(TAO_ROOT)/tao/Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ + $(ACE_ROOT)/ace/Map_T.h \ + $(ACE_ROOT)/ace/Pair.h \ + $(ACE_ROOT)/ace/Pair_T.h \ + $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Pair_T.cpp \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Active_Map_Manager.h \ + $(ACE_ROOT)/ace/Active_Map_Manager.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Map_T.i \ + $(ACE_ROOT)/ace/Map_T.cpp \ + $(TAO_ROOT)/tao/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServerC.i \ + $(TAO_ROOT)/tao/Key_Adapters.i \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/Servant_Base.h \ + $(TAO_ROOT)/tao/Servant_Base.i \ + $(TAO_ROOT)/tao/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Active_Object_Map.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/Object_Adapter.i \ + $(TAO_ROOT)/tao/POAManager.h \ + $(TAO_ROOT)/tao/POAManager.i \ + $(TAO_ROOT)/tao/POA.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ @@ -728,7 +787,15 @@ realclean: clean $(TAO_ROOT)/tao/MessagingS_T.i \ $(TAO_ROOT)/tao/MessagingS_T.cpp \ $(TAO_ROOT)/tao/MessagingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + Notify/Notify_EventChannel_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ @@ -738,7 +805,6 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ @@ -770,30 +836,39 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ Notify/Notify_ID_Pool_T.h Notify/Notify_ID_Pool_T.i \ - Notify/Notify_ID_Pool_T.cpp Notify/notify_export.h \ - Notify/Notify_EventChannelFactory_i.h Notify/Notify_EventChannel_i.h \ - Notify/Notify_QoSAdmin_i.h Notify/Notify_Event_Manager.h \ - Notify/Notify_Listeners.h Notify/Notify_Types.h \ - Notify/Notify_FilterFactory_i.h Notify/Notify_ConsumerAdmin_i.h \ - Notify/Notify_FilterAdmin_i.h Notify/Notify_SupplierAdmin_i.h \ - Notify/Notify_StructuredProxyPushSupplier_i.h \ - Notify/Notify_ProxySupplier_T.h Notify/Notify_Proxy_T.h \ - Notify/Notify_Proxy_T.cpp Notify/Notify_ProxySupplier_T.cpp \ - Notify/Notify_SequenceProxyPushSupplier_i.h \ - Notify/Notify_ProxyPushSupplier_i.h \ - Notify/Notify_StructuredProxyPushConsumer_i.h \ - Notify/Notify_ProxyConsumer_T.h Notify/Notify_ProxyConsumer_T.cpp \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - Notify/Notify_SequenceProxyPushConsumer_i.h \ - Notify/Notify_ProxyPushConsumer_i.h + Notify/Notify_ID_Pool_T.cpp Notify/Notify_QoSAdmin_i.h \ + Notify/notify_export.h Notify/Notify_Collection.h \ + Notify/Notify_EventChannelFactory_i.h Notify/Notify_SupplierAdmin_i.h \ + Notify/Notify_FilterAdmin_i.h Notify/Notify_Event.h \ + Notify/Notify_ConsumerAdmin_i.h Notify/Notify_Listeners.h \ + Notify/Notify_Event_Manager.h Notify/Notify_Event_Manager.i \ + Notify/Notify_Event_Map.h Notify/Notify_Event_Map.i \ + Notify/Notify_Event_Processor.h \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Stream.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/Stream.i \ + $(ACE_ROOT)/ace/Stream.cpp \ + Notify/Notify_Channel_Objects_Factory.h Notify/Notify_POA_Factory.h \ + Notify/Notify_Factory.h Notify/Notify_Event_Manager_Objects_Factory.h \ + Notify/Notify_Collection_Factory.h -.obj/Notify_EventChannel_i.o .obj/Notify_EventChannel_i.so .shobj/Notify_EventChannel_i.o .shobj/Notify_EventChannel_i.so: Notify/Notify_EventChannel_i.cpp \ - Notify/Notify_EventChannel_i.h \ +.obj/Notify_ConsumerAdmin_i.o .obj/Notify_ConsumerAdmin_i.so .shobj/Notify_ConsumerAdmin_i.o .shobj/Notify_ConsumerAdmin_i.so: Notify/Notify_ConsumerAdmin_i.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ + $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -817,15 +892,18 @@ realclean: clean $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Functor.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/ACE.i \ - $(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/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -840,25 +918,6 @@ realclean: clean $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ - $(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/Malloc_Base.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/Based_Pointer_T.h \ - $(ACE_ROOT)/ace/Based_Pointer_T.i \ - $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ - $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ - $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Object_Manager.h \ @@ -874,34 +933,22 @@ realclean: clean $(ACE_ROOT)/ace/Malloc_T.i \ $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ + $(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/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Signal.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 \ - $(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 \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/tao/corba.h \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Stream.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/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/try_macros.h \ $(TAO_ROOT)/tao/orbconf.h \ @@ -914,6 +961,31 @@ realclean: clean $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/IOR_LookupTable.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_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 \ + $(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 \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ @@ -1096,7 +1168,15 @@ realclean: clean $(TAO_ROOT)/tao/MessagingS_T.i \ $(TAO_ROOT)/tao/MessagingS_T.cpp \ $(TAO_ROOT)/tao/MessagingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + Notify/Notify_ConsumerAdmin_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ @@ -1106,7 +1186,6 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ @@ -1139,18 +1218,43 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ Notify/Notify_ID_Pool_T.h Notify/Notify_ID_Pool_T.i \ Notify/Notify_ID_Pool_T.cpp Notify/Notify_QoSAdmin_i.h \ - Notify/notify_export.h Notify/Notify_Event_Manager.h \ - Notify/Notify_Listeners.h Notify/Notify_Types.h \ - Notify/Notify_Resource_Manager.h \ - Notify/Notify_EventChannelFactory_i.h Notify/Notify_SupplierAdmin_i.h \ - Notify/Notify_FilterAdmin_i.h Notify/Notify_ConsumerAdmin_i.h + Notify/notify_export.h Notify/Notify_FilterAdmin_i.h \ + Notify/Notify_Event.h Notify/Notify_Listeners.h \ + Notify/Notify_Collection.h Notify/Notify_ProxyPushSupplier_i.h \ + Notify/Notify_ProxySupplier_T.h Notify/Notify_Proxy_T.h \ + Notify/Notify_Proxy_T.cpp Notify/Notify_Event_Manager.h \ + Notify/Notify_Event_Manager.i Notify/Notify_Event_Map.h \ + Notify/Notify_Event_Map.i Notify/Notify_Event_Processor.h \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Stream.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/Stream.i \ + $(ACE_ROOT)/ace/Stream.cpp \ + Notify/Notify_ProxySupplier_T.cpp Notify/Notify_Factory.h \ + Notify/Notify_Channel_Objects_Factory.h \ + Notify/Notify_StructuredProxyPushSupplier_i.h \ + Notify/Notify_SequenceProxyPushSupplier_i.h \ + Notify/Notify_EventChannel_i.h Notify/Notify_POA_Factory.h \ + Notify/Notify_Event_Manager_Objects_Factory.h \ + Notify/Notify_Collection_Factory.h \ + Notify/Notify_Listener_Filter_Eval_Command.h Notify/Notify_Command.h \ + Notify/Notify_Worker_Task.h Notify/Notify_Event_Dispatch_Command.h -.obj/Notify_Event_Manager.o .obj/Notify_Event_Manager.so .shobj/Notify_Event_Manager.o .shobj/Notify_Event_Manager.so: Notify/Notify_Event_Manager.cpp \ - Notify/Notify_Event_Manager.h \ +.obj/Notify_SupplierAdmin_i.o .obj/Notify_SupplierAdmin_i.so .shobj/Notify_SupplierAdmin_i.o .shobj/Notify_SupplierAdmin_i.so: Notify/Notify_SupplierAdmin_i.cpp \ + $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -1174,13 +1278,20 @@ realclean: clean $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Auto_Ptr.i \ + $(ACE_ROOT)/ace/Auto_Ptr.cpp \ + Notify/Notify_SupplierAdmin_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + $(TAO_ROOT)/tao/corba.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/ACE.i \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(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/Based_Pointer_T.h \ $(ACE_ROOT)/ace/Based_Pointer_T.i \ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ @@ -1216,16 +1327,15 @@ realclean: clean $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ $(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/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ - Notify/Notify_Listeners.h Notify/Notify_Types.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/tao/corba.h \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Stream.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 \ @@ -1451,18 +1561,7 @@ realclean: clean $(TAO_ROOT)/tao/MessagingS_T.i \ $(TAO_ROOT)/tao/MessagingS_T.cpp \ $(TAO_ROOT)/tao/MessagingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - Notify/Notify_EventChannel_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ @@ -1470,14 +1569,20 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ $(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/CosNotifyCommC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ @@ -1497,16 +1602,49 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ Notify/Notify_ID_Pool_T.h Notify/Notify_ID_Pool_T.i \ Notify/Notify_ID_Pool_T.cpp Notify/Notify_QoSAdmin_i.h \ - Notify/notify_export.h + Notify/notify_export.h Notify/Notify_FilterAdmin_i.h \ + Notify/Notify_Event.h Notify/Notify_ProxyPushConsumer_i.h \ + Notify/Notify_ProxyConsumer_T.h Notify/Notify_Proxy_T.h \ + Notify/Notify_Listeners.h Notify/Notify_Proxy_T.cpp \ + Notify/Notify_Event_Manager.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + Notify/Notify_Collection.h Notify/Notify_Event_Manager.i \ + Notify/Notify_Event_Map.h Notify/Notify_Event_Map.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ + Notify/Notify_Event_Processor.h \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Stream.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/Stream.i \ + $(ACE_ROOT)/ace/Stream.cpp \ + Notify/Notify_ProxyConsumer_T.cpp Notify/Notify_Factory.h \ + Notify/Notify_Channel_Objects_Factory.h \ + Notify/Notify_StructuredProxyPushConsumer_i.h \ + Notify/Notify_SequenceProxyPushConsumer_i.h \ + Notify/Notify_EventChannel_i.h Notify/Notify_POA_Factory.h -.obj/Notify_ConsumerAdmin_i.o .obj/Notify_ConsumerAdmin_i.so .shobj/Notify_ConsumerAdmin_i.o .shobj/Notify_ConsumerAdmin_i.so: Notify/Notify_ConsumerAdmin_i.cpp \ - Notify/Notify_ConsumerAdmin_i.h \ +.obj/Notify_ProxyPushSupplier_i.o .obj/Notify_ProxyPushSupplier_i.so .shobj/Notify_ProxyPushSupplier_i.o .shobj/Notify_ProxyPushSupplier_i.so: Notify/Notify_ProxyPushSupplier_i.cpp \ + Notify/Notify_ProxyPushSupplier_i.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/tao/corba.h \ + Notify/Notify_ProxySupplier_T.h Notify/Notify_Proxy_T.h \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -1530,13 +1668,13 @@ realclean: clean $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(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/ACE.i \ - $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Based_Pointer_T.h \ $(ACE_ROOT)/ace/Based_Pointer_T.i \ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ @@ -1572,15 +1710,17 @@ realclean: clean $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ $(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/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Stream.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 \ @@ -1806,7 +1946,6 @@ realclean: clean $(TAO_ROOT)/tao/MessagingS_T.i \ $(TAO_ROOT)/tao/MessagingS_T.cpp \ $(TAO_ROOT)/tao/MessagingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ @@ -1816,7 +1955,6 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ @@ -1847,21 +1985,48 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - Notify/Notify_ID_Pool_T.h Notify/Notify_ID_Pool_T.i \ - Notify/Notify_ID_Pool_T.cpp Notify/Notify_QoSAdmin_i.h \ - Notify/notify_export.h Notify/Notify_FilterAdmin_i.h \ - Notify/Notify_Types.h Notify/Notify_Listeners.h \ - Notify/Notify_ProxyPushSupplier_i.h Notify/Notify_ProxySupplier_T.h \ - Notify/Notify_Proxy_T.h Notify/Notify_Proxy_T.cpp \ - Notify/Notify_Event_Manager.h Notify/Notify_ProxySupplier_T.cpp \ - Notify/Notify_StructuredProxyPushSupplier_i.h \ - Notify/Notify_SequenceProxyPushSupplier_i.h \ - Notify/Notify_EventChannel_i.h Notify/Notify_Resource_Manager.h + Notify/Notify_QoSAdmin_i.h Notify/notify_export.h \ + Notify/Notify_FilterAdmin_i.h Notify/Notify_ID_Pool_T.h \ + Notify/Notify_ID_Pool_T.i Notify/Notify_ID_Pool_T.cpp \ + Notify/Notify_Event.h Notify/Notify_Listeners.h \ + Notify/Notify_Proxy_T.cpp Notify/Notify_Event_Manager.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + Notify/Notify_Collection.h Notify/Notify_Event_Manager.i \ + Notify/Notify_Event_Map.h Notify/Notify_Event_Map.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ + Notify/Notify_Event_Processor.h \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Stream.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/Stream.i \ + $(ACE_ROOT)/ace/Stream.cpp \ + Notify/Notify_ProxySupplier_T.cpp Notify/Notify_ConsumerAdmin_i.h \ + Notify/Notify_Factory.h Notify/Notify_Channel_Objects_Factory.h -.obj/Notify_SupplierAdmin_i.o .obj/Notify_SupplierAdmin_i.so .shobj/Notify_SupplierAdmin_i.o .shobj/Notify_SupplierAdmin_i.so: Notify/Notify_SupplierAdmin_i.cpp \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ +.obj/Notify_StructuredProxyPushSupplier_i.o .obj/Notify_StructuredProxyPushSupplier_i.so .shobj/Notify_StructuredProxyPushSupplier_i.o .shobj/Notify_StructuredProxyPushSupplier_i.so: \ + Notify/Notify_StructuredProxyPushSupplier_i.cpp \ + Notify/Notify_StructuredProxyPushSupplier_i.h \ $(ACE_ROOT)/ace/pre.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -1885,13 +2050,6 @@ realclean: clean $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - Notify/Notify_SupplierAdmin_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -2168,7 +2326,6 @@ realclean: clean $(TAO_ROOT)/tao/MessagingS_T.i \ $(TAO_ROOT)/tao/MessagingS_T.cpp \ $(TAO_ROOT)/tao/MessagingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ @@ -2178,7 +2335,6 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ @@ -2209,24 +2365,48 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - Notify/Notify_ID_Pool_T.h Notify/Notify_ID_Pool_T.i \ - Notify/Notify_ID_Pool_T.cpp Notify/Notify_QoSAdmin_i.h \ - Notify/notify_export.h Notify/Notify_FilterAdmin_i.h \ - Notify/Notify_Types.h Notify/Notify_ProxyPushConsumer_i.h \ - Notify/Notify_ProxyConsumer_T.h Notify/Notify_Proxy_T.h \ - Notify/Notify_Listeners.h Notify/Notify_Proxy_T.cpp \ - Notify/Notify_Event_Manager.h Notify/Notify_ProxyConsumer_T.cpp \ - Notify/Notify_StructuredProxyPushConsumer_i.h \ - Notify/Notify_SequenceProxyPushConsumer_i.h \ - Notify/Notify_EventChannel_i.h Notify/Notify_Resource_Manager.h + Notify/Notify_ProxySupplier_T.h Notify/Notify_Proxy_T.h \ + Notify/Notify_QoSAdmin_i.h Notify/notify_export.h \ + Notify/Notify_FilterAdmin_i.h Notify/Notify_ID_Pool_T.h \ + Notify/Notify_ID_Pool_T.i Notify/Notify_ID_Pool_T.cpp \ + Notify/Notify_Event.h Notify/Notify_Listeners.h \ + Notify/Notify_Proxy_T.cpp Notify/Notify_Event_Manager.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + Notify/Notify_Collection.h Notify/Notify_Event_Manager.i \ + Notify/Notify_Event_Map.h Notify/Notify_Event_Map.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ + Notify/Notify_Event_Processor.h \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Stream.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/Stream.i \ + $(ACE_ROOT)/ace/Stream.cpp \ + Notify/Notify_ProxySupplier_T.cpp Notify/Notify_ConsumerAdmin_i.h \ + Notify/Notify_Factory.h Notify/Notify_Channel_Objects_Factory.h -.obj/Notify_ProxyPushSupplier_i.o .obj/Notify_ProxyPushSupplier_i.so .shobj/Notify_ProxyPushSupplier_i.o .shobj/Notify_ProxyPushSupplier_i.so: Notify/Notify_ProxyPushSupplier_i.cpp \ - Notify/Notify_ProxyPushSupplier_i.h \ +.obj/Notify_SequenceProxyPushSupplier_i.o .obj/Notify_SequenceProxyPushSupplier_i.so .shobj/Notify_SequenceProxyPushSupplier_i.o .shobj/Notify_SequenceProxyPushSupplier_i.so: \ + Notify/Notify_SequenceProxyPushSupplier_i.cpp \ + Notify/Notify_SequenceProxyPushSupplier_i.h \ $(ACE_ROOT)/ace/pre.h \ Notify/Notify_ProxySupplier_T.h Notify/Notify_Proxy_T.h \ $(ACE_ROOT)/ace/Containers_T.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -2528,7 +2708,6 @@ realclean: clean $(TAO_ROOT)/tao/MessagingS_T.i \ $(TAO_ROOT)/tao/MessagingS_T.cpp \ $(TAO_ROOT)/tao/MessagingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ @@ -2538,7 +2717,6 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ @@ -2572,18 +2750,43 @@ realclean: clean Notify/Notify_QoSAdmin_i.h Notify/notify_export.h \ Notify/Notify_FilterAdmin_i.h Notify/Notify_ID_Pool_T.h \ Notify/Notify_ID_Pool_T.i Notify/Notify_ID_Pool_T.cpp \ - Notify/Notify_Types.h Notify/Notify_Listeners.h \ + Notify/Notify_Event.h Notify/Notify_Listeners.h \ Notify/Notify_Proxy_T.cpp Notify/Notify_Event_Manager.h \ - Notify/Notify_ProxySupplier_T.cpp Notify/Notify_ConsumerAdmin_i.h + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + Notify/Notify_Collection.h Notify/Notify_Event_Manager.i \ + Notify/Notify_Event_Map.h Notify/Notify_Event_Map.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ + Notify/Notify_Event_Processor.h \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Stream.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/Stream.i \ + $(ACE_ROOT)/ace/Stream.cpp \ + Notify/Notify_ProxySupplier_T.cpp Notify/Notify_ConsumerAdmin_i.h \ + Notify/Notify_Factory.h Notify/Notify_Channel_Objects_Factory.h -.obj/Notify_StructuredProxyPushSupplier_i.o .obj/Notify_StructuredProxyPushSupplier_i.so .shobj/Notify_StructuredProxyPushSupplier_i.o .shobj/Notify_StructuredProxyPushSupplier_i.so: \ - Notify/Notify_StructuredProxyPushSupplier_i.cpp \ - Notify/Notify_StructuredProxyPushSupplier_i.h \ +.obj/Notify_ProxyPushConsumer_i.o .obj/Notify_ProxyPushConsumer_i.so .shobj/Notify_ProxyPushConsumer_i.o .shobj/Notify_ProxyPushConsumer_i.so: Notify/Notify_ProxyPushConsumer_i.cpp \ + Notify/Notify_ProxyPushConsumer_i.h \ $(ACE_ROOT)/ace/pre.h \ - Notify/Notify_ProxySupplier_T.h Notify/Notify_Proxy_T.h \ + Notify/Notify_ProxyConsumer_T.h Notify/Notify_Proxy_T.h \ $(ACE_ROOT)/ace/Containers_T.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -2885,7 +3088,6 @@ realclean: clean $(TAO_ROOT)/tao/MessagingS_T.i \ $(TAO_ROOT)/tao/MessagingS_T.cpp \ $(TAO_ROOT)/tao/MessagingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ @@ -2895,7 +3097,6 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ @@ -2929,18 +3130,45 @@ realclean: clean Notify/Notify_QoSAdmin_i.h Notify/notify_export.h \ Notify/Notify_FilterAdmin_i.h Notify/Notify_ID_Pool_T.h \ Notify/Notify_ID_Pool_T.i Notify/Notify_ID_Pool_T.cpp \ - Notify/Notify_Types.h Notify/Notify_Listeners.h \ + Notify/Notify_Event.h Notify/Notify_Listeners.h \ Notify/Notify_Proxy_T.cpp Notify/Notify_Event_Manager.h \ - Notify/Notify_ProxySupplier_T.cpp Notify/Notify_ConsumerAdmin_i.h + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + Notify/Notify_Collection.h Notify/Notify_Event_Manager.i \ + Notify/Notify_Event_Map.h Notify/Notify_Event_Map.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ + Notify/Notify_Event_Processor.h \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Stream.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/Stream.i \ + $(ACE_ROOT)/ace/Stream.cpp \ + Notify/Notify_ProxyConsumer_T.cpp Notify/Notify_SupplierAdmin_i.h \ + Notify/Notify_Factory.h Notify/Notify_Channel_Objects_Factory.h -.obj/Notify_SequenceProxyPushSupplier_i.o .obj/Notify_SequenceProxyPushSupplier_i.so .shobj/Notify_SequenceProxyPushSupplier_i.o .shobj/Notify_SequenceProxyPushSupplier_i.so: \ - Notify/Notify_SequenceProxyPushSupplier_i.cpp \ - Notify/Notify_SequenceProxyPushSupplier_i.h \ +.obj/Notify_StructuredProxyPushConsumer_i.o .obj/Notify_StructuredProxyPushConsumer_i.so .shobj/Notify_StructuredProxyPushConsumer_i.o .shobj/Notify_StructuredProxyPushConsumer_i.so: \ + Notify/Notify_StructuredProxyPushConsumer_i.cpp \ + Notify/Notify_StructuredProxyPushConsumer_i.h \ $(ACE_ROOT)/ace/pre.h \ - Notify/Notify_ProxySupplier_T.h Notify/Notify_Proxy_T.h \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/ACE.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -2964,13 +3192,13 @@ realclean: clean $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ + $(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/ACE.i \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(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/Based_Pointer_T.h \ $(ACE_ROOT)/ace/Based_Pointer_T.i \ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ @@ -3006,17 +3234,15 @@ realclean: clean $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ $(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/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/tao/corba.h \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Stream.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 \ @@ -3242,7 +3468,6 @@ realclean: clean $(TAO_ROOT)/tao/MessagingS_T.i \ $(TAO_ROOT)/tao/MessagingS_T.cpp \ $(TAO_ROOT)/tao/MessagingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ @@ -3252,7 +3477,6 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ @@ -3283,20 +3507,48 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ + Notify/Notify_ProxyConsumer_T.h Notify/Notify_Proxy_T.h \ Notify/Notify_QoSAdmin_i.h Notify/notify_export.h \ Notify/Notify_FilterAdmin_i.h Notify/Notify_ID_Pool_T.h \ Notify/Notify_ID_Pool_T.i Notify/Notify_ID_Pool_T.cpp \ - Notify/Notify_Types.h Notify/Notify_Listeners.h \ + Notify/Notify_Event.h Notify/Notify_Listeners.h \ Notify/Notify_Proxy_T.cpp Notify/Notify_Event_Manager.h \ - Notify/Notify_ProxySupplier_T.cpp Notify/Notify_ConsumerAdmin_i.h + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + Notify/Notify_Collection.h Notify/Notify_Event_Manager.i \ + Notify/Notify_Event_Map.h Notify/Notify_Event_Map.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ + Notify/Notify_Event_Processor.h \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Stream.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/Stream.i \ + $(ACE_ROOT)/ace/Stream.cpp \ + Notify/Notify_ProxyConsumer_T.cpp Notify/Notify_SupplierAdmin_i.h \ + Notify/Notify_Factory.h Notify/Notify_Channel_Objects_Factory.h -.obj/Notify_ProxyPushConsumer_i.o .obj/Notify_ProxyPushConsumer_i.so .shobj/Notify_ProxyPushConsumer_i.o .shobj/Notify_ProxyPushConsumer_i.so: Notify/Notify_ProxyPushConsumer_i.cpp \ - Notify/Notify_ProxyPushConsumer_i.h \ +.obj/Notify_SequenceProxyPushConsumer_i.o .obj/Notify_SequenceProxyPushConsumer_i.so .shobj/Notify_SequenceProxyPushConsumer_i.o .shobj/Notify_SequenceProxyPushConsumer_i.so: \ + Notify/Notify_SequenceProxyPushConsumer_i.cpp \ + Notify/Notify_SequenceProxyPushConsumer_i.h \ $(ACE_ROOT)/ace/pre.h \ Notify/Notify_ProxyConsumer_T.h Notify/Notify_Proxy_T.h \ $(ACE_ROOT)/ace/Containers_T.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -3598,7 +3850,6 @@ realclean: clean $(TAO_ROOT)/tao/MessagingS_T.i \ $(TAO_ROOT)/tao/MessagingS_T.cpp \ $(TAO_ROOT)/tao/MessagingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ @@ -3608,7 +3859,6 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ @@ -3642,21 +3892,41 @@ realclean: clean Notify/Notify_QoSAdmin_i.h Notify/notify_export.h \ Notify/Notify_FilterAdmin_i.h Notify/Notify_ID_Pool_T.h \ Notify/Notify_ID_Pool_T.i Notify/Notify_ID_Pool_T.cpp \ - Notify/Notify_Types.h Notify/Notify_Listeners.h \ + Notify/Notify_Event.h Notify/Notify_Listeners.h \ Notify/Notify_Proxy_T.cpp Notify/Notify_Event_Manager.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + Notify/Notify_Collection.h Notify/Notify_Event_Manager.i \ + Notify/Notify_Event_Map.h Notify/Notify_Event_Map.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ + Notify/Notify_Event_Processor.h \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Stream.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/Stream.i \ + $(ACE_ROOT)/ace/Stream.cpp \ Notify/Notify_ProxyConsumer_T.cpp Notify/Notify_SupplierAdmin_i.h \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp + Notify/Notify_Factory.h Notify/Notify_Channel_Objects_Factory.h -.obj/Notify_StructuredProxyPushConsumer_i.o .obj/Notify_StructuredProxyPushConsumer_i.so .shobj/Notify_StructuredProxyPushConsumer_i.o .shobj/Notify_StructuredProxyPushConsumer_i.so: \ - Notify/Notify_StructuredProxyPushConsumer_i.cpp \ - Notify/Notify_StructuredProxyPushConsumer_i.h \ +.obj/Notify_FilterAdmin_i.o .obj/Notify_FilterAdmin_i.so .shobj/Notify_FilterAdmin_i.o .shobj/Notify_FilterAdmin_i.so: Notify/Notify_FilterAdmin_i.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h \ $(ACE_ROOT)/ace/pre.h \ - Notify/Notify_ProxyConsumer_T.h Notify/Notify_Proxy_T.h \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/ACE.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -3680,6 +3950,8 @@ realclean: clean $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ @@ -3958,7 +4230,6 @@ realclean: clean $(TAO_ROOT)/tao/MessagingS_T.i \ $(TAO_ROOT)/tao/MessagingS_T.cpp \ $(TAO_ROOT)/tao/MessagingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ @@ -3968,7 +4239,6 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ @@ -3999,24 +4269,17 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - Notify/Notify_QoSAdmin_i.h Notify/notify_export.h \ - Notify/Notify_FilterAdmin_i.h Notify/Notify_ID_Pool_T.h \ - Notify/Notify_ID_Pool_T.i Notify/Notify_ID_Pool_T.cpp \ - Notify/Notify_Types.h Notify/Notify_Listeners.h \ - Notify/Notify_Proxy_T.cpp Notify/Notify_Event_Manager.h \ - Notify/Notify_ProxyConsumer_T.cpp Notify/Notify_SupplierAdmin_i.h \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp + $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/Notify_Event.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h -.obj/Notify_SequenceProxyPushConsumer_i.o .obj/Notify_SequenceProxyPushConsumer_i.so .shobj/Notify_SequenceProxyPushConsumer_i.o .shobj/Notify_SequenceProxyPushConsumer_i.so: \ - Notify/Notify_SequenceProxyPushConsumer_i.cpp \ - Notify/Notify_SequenceProxyPushConsumer_i.h \ +.obj/Notify_Filter_i.o .obj/Notify_Filter_i.so .shobj/Notify_Filter_i.o .shobj/Notify_Filter_i.so: Notify/Notify_Filter_i.cpp \ + $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/pre.h \ - Notify/Notify_ProxyConsumer_T.h Notify/Notify_Proxy_T.h \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -4040,13 +4303,19 @@ realclean: clean $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Auto_Ptr.i \ + $(ACE_ROOT)/ace/Auto_Ptr.cpp \ + Notify/Notify_Filter_i.h Notify/Notify_Constraint_Interpreter.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h \ + $(TAO_ROOT)/tao/corba.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/ACE.i \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(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/Based_Pointer_T.h \ $(ACE_ROOT)/ace/Based_Pointer_T.i \ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ @@ -4082,17 +4351,15 @@ realclean: clean $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ $(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/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/tao/corba.h \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Stream.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 \ @@ -4318,17 +4585,22 @@ realclean: clean $(TAO_ROOT)/tao/MessagingS_T.i \ $(TAO_ROOT)/tao/MessagingS_T.cpp \ $(TAO_ROOT)/tao/MessagingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ + $(TAO_ROOT)/tao/DynSequence_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ @@ -4346,6 +4618,8 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ + Notify/notify_export.h Notify/Notify_ID_Pool_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ @@ -4359,21 +4633,20 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - Notify/Notify_QoSAdmin_i.h Notify/notify_export.h \ - Notify/Notify_FilterAdmin_i.h Notify/Notify_ID_Pool_T.h \ Notify/Notify_ID_Pool_T.i Notify/Notify_ID_Pool_T.cpp \ - Notify/Notify_Types.h Notify/Notify_Listeners.h \ - Notify/Notify_Proxy_T.cpp Notify/Notify_Event_Manager.h \ - Notify/Notify_ProxyConsumer_T.cpp Notify/Notify_SupplierAdmin_i.h \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp + Notify/Notify_Constraint_Visitors.h -.obj/Notify_FilterAdmin_i.o .obj/Notify_FilterAdmin_i.so .shobj/Notify_FilterAdmin_i.o .shobj/Notify_FilterAdmin_i.so: Notify/Notify_FilterAdmin_i.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h \ +.obj/Notify_FilterFactory_i.o .obj/Notify_FilterFactory_i.so .shobj/Notify_FilterFactory_i.o .shobj/Notify_FilterFactory_i.so: Notify/Notify_FilterFactory_i.cpp \ + Notify/Notify_FilterFactory_i.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -4397,15 +4670,13 @@ realclean: clean $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Containers_T.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/ACE.i \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(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/Based_Pointer_T.h \ $(ACE_ROOT)/ace/Based_Pointer_T.i \ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ @@ -4441,17 +4712,15 @@ realclean: clean $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ $(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/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/tao/corba.h \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Stream.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 \ @@ -4677,17 +4946,13 @@ realclean: clean $(TAO_ROOT)/tao/MessagingS_T.i \ $(TAO_ROOT)/tao/MessagingS_T.cpp \ $(TAO_ROOT)/tao/MessagingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ @@ -4705,6 +4970,17 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ + Notify/notify_export.h Notify/Notify_Filter_i.h \ + Notify/Notify_Constraint_Interpreter.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ + $(TAO_ROOT)/tao/DynSequence_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter.h \ + Notify/Notify_ID_Pool_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ @@ -4718,14 +4994,17 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/Notify_Types.h + Notify/Notify_ID_Pool_T.i Notify/Notify_ID_Pool_T.cpp -.obj/Notify_Filter_i.o .obj/Notify_Filter_i.so .shobj/Notify_Filter_i.o .shobj/Notify_Filter_i.so: Notify/Notify_Filter_i.cpp \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ +.obj/Notify_QoSAdmin_i.o .obj/Notify_QoSAdmin_i.so .shobj/Notify_QoSAdmin_i.o .shobj/Notify_QoSAdmin_i.so: Notify/Notify_QoSAdmin_i.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.h \ $(ACE_ROOT)/ace/pre.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -4749,12 +5028,322 @@ realclean: clean $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - Notify/Notify_Filter_i.h Notify/Notify_Constraint_Interpreter.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/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.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/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(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/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/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/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/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(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/varbase.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(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/IOR_LookupTable.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_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 \ + $(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 \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/IORManipulation.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/IORC.h \ + $(TAO_ROOT)/tao/IORC.i \ + $(TAO_ROOT)/tao/Interceptor.h \ + $(TAO_ROOT)/tao/InterceptorC.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/InterceptorC.i \ + $(TAO_ROOT)/tao/Interceptor.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.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/Context.h \ + $(TAO_ROOT)/tao/Context.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(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/Server_Request.i \ + $(TAO_ROOT)/tao/POA.h \ + $(TAO_ROOT)/tao/Object_Adapter.h \ + $(TAO_ROOT)/tao/Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ + $(ACE_ROOT)/ace/Map_T.h \ + $(ACE_ROOT)/ace/Pair.h \ + $(ACE_ROOT)/ace/Pair_T.h \ + $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Pair_T.cpp \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Active_Map_Manager.h \ + $(ACE_ROOT)/ace/Active_Map_Manager.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Map_T.i \ + $(ACE_ROOT)/ace/Map_T.cpp \ + $(TAO_ROOT)/tao/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServerC.i \ + $(TAO_ROOT)/tao/Key_Adapters.i \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/Servant_Base.h \ + $(TAO_ROOT)/tao/Servant_Base.i \ + $(TAO_ROOT)/tao/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Active_Object_Map.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/Object_Adapter.i \ + $(TAO_ROOT)/tao/POAManager.h \ + $(TAO_ROOT)/tao/POAManager.i \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.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/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/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/POA_CORBA.h \ + $(TAO_ROOT)/tao/DynAnyC.h \ + $(TAO_ROOT)/tao/DynAnyC.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(TAO_ROOT)/tao/Protocol_Factory.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/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ + $(TAO_ROOT)/tao/DynAny_i.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/InterfaceC.h \ + $(TAO_ROOT)/tao/ifrfwd.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/MessagingS.h \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/MessagingS_T.h \ + $(TAO_ROOT)/tao/MessagingS_T.i \ + $(TAO_ROOT)/tao/MessagingS_T.cpp \ + $(TAO_ROOT)/tao/MessagingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h + +.obj/Notify_Constraint_Interpreter.o .obj/Notify_Constraint_Interpreter.so .shobj/Notify_Constraint_Interpreter.o .shobj/Notify_Constraint_Interpreter.so: \ + Notify/Notify_Constraint_Interpreter.cpp \ + Notify/Notify_Constraint_Interpreter.h \ + $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h \ + $(ACE_ROOT)/ace/post.h \ $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -5040,7 +5629,6 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ @@ -5048,7 +5636,6 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ @@ -5066,33 +5653,1292 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - Notify/notify_export.h Notify/Notify_ID_Pool_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(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/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - Notify/Notify_ID_Pool_T.i Notify/Notify_ID_Pool_T.cpp \ - Notify/Notify_Constraint_Visitors.h + Notify/notify_export.h Notify/Notify_Constraint_Visitors.h -.obj/Notify_FilterFactory_i.o .obj/Notify_FilterFactory_i.so .shobj/Notify_FilterFactory_i.o .shobj/Notify_FilterFactory_i.so: Notify/Notify_FilterFactory_i.cpp \ - Notify/Notify_FilterFactory_i.h \ +.obj/Notify_Constraint_Visitors.o .obj/Notify_Constraint_Visitors.so .shobj/Notify_Constraint_Visitors.o .shobj/Notify_Constraint_Visitors.so: Notify/Notify_Constraint_Visitors.cpp \ + Notify/Notify_Constraint_Visitors.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/ACE.i \ + $(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/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_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/Malloc_Base.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/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(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/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/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 \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Stream.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/CDR_Stream.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(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/IOR_LookupTable.h \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/IORManipulation.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/IORC.h \ + $(TAO_ROOT)/tao/IORC.i \ + $(TAO_ROOT)/tao/Interceptor.h \ + $(TAO_ROOT)/tao/InterceptorC.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/InterceptorC.i \ + $(TAO_ROOT)/tao/Interceptor.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.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/Context.h \ + $(TAO_ROOT)/tao/Context.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(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/Server_Request.i \ + $(TAO_ROOT)/tao/POA.h \ + $(TAO_ROOT)/tao/Object_Adapter.h \ + $(TAO_ROOT)/tao/Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ + $(ACE_ROOT)/ace/Map_T.h \ + $(ACE_ROOT)/ace/Pair.h \ + $(ACE_ROOT)/ace/Pair_T.h \ + $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Pair_T.cpp \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Active_Map_Manager.h \ + $(ACE_ROOT)/ace/Active_Map_Manager.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Map_T.i \ + $(ACE_ROOT)/ace/Map_T.cpp \ + $(TAO_ROOT)/tao/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServerC.i \ + $(TAO_ROOT)/tao/Key_Adapters.i \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/Servant_Base.h \ + $(TAO_ROOT)/tao/Servant_Base.i \ + $(TAO_ROOT)/tao/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Active_Object_Map.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/Object_Adapter.i \ + $(TAO_ROOT)/tao/POAManager.h \ + $(TAO_ROOT)/tao/POAManager.i \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.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/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/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/POA_CORBA.h \ + $(TAO_ROOT)/tao/DynAnyC.h \ + $(TAO_ROOT)/tao/DynAnyC.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(TAO_ROOT)/tao/Protocol_Factory.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/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ + $(TAO_ROOT)/tao/DynAny_i.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/InterfaceC.h \ + $(TAO_ROOT)/tao/ifrfwd.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/MessagingS.h \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/MessagingS_T.h \ + $(TAO_ROOT)/tao/MessagingS_T.i \ + $(TAO_ROOT)/tao/MessagingS_T.cpp \ + $(TAO_ROOT)/tao/MessagingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h \ + $(TAO_ROOT)/tao/DynSequence_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h + +.obj/Notify_Event.o .obj/Notify_Event.so .shobj/Notify_Event.o .shobj/Notify_Event.so: Notify/Notify_Event.cpp Notify/Notify_Event.h \ + $(ACE_ROOT)/ace/pre.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(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/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.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/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(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/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/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/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/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(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/varbase.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(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/IOR_LookupTable.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_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 \ + $(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 \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/IORManipulation.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/IORC.h \ + $(TAO_ROOT)/tao/IORC.i \ + $(TAO_ROOT)/tao/Interceptor.h \ + $(TAO_ROOT)/tao/InterceptorC.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/InterceptorC.i \ + $(TAO_ROOT)/tao/Interceptor.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.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/Context.h \ + $(TAO_ROOT)/tao/Context.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(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/Server_Request.i \ + $(TAO_ROOT)/tao/POA.h \ + $(TAO_ROOT)/tao/Object_Adapter.h \ + $(TAO_ROOT)/tao/Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ + $(ACE_ROOT)/ace/Map_T.h \ + $(ACE_ROOT)/ace/Pair.h \ + $(ACE_ROOT)/ace/Pair_T.h \ + $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Pair_T.cpp \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Active_Map_Manager.h \ + $(ACE_ROOT)/ace/Active_Map_Manager.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Map_T.i \ + $(ACE_ROOT)/ace/Map_T.cpp \ + $(TAO_ROOT)/tao/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServerC.i \ + $(TAO_ROOT)/tao/Key_Adapters.i \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/Servant_Base.h \ + $(TAO_ROOT)/tao/Servant_Base.i \ + $(TAO_ROOT)/tao/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Active_Object_Map.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/Object_Adapter.i \ + $(TAO_ROOT)/tao/POAManager.h \ + $(TAO_ROOT)/tao/POAManager.i \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.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/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/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/POA_CORBA.h \ + $(TAO_ROOT)/tao/DynAnyC.h \ + $(TAO_ROOT)/tao/DynAnyC.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(TAO_ROOT)/tao/Protocol_Factory.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/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ + $(TAO_ROOT)/tao/DynAny_i.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/InterfaceC.h \ + $(TAO_ROOT)/tao/ifrfwd.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/MessagingS.h \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/MessagingS_T.h \ + $(TAO_ROOT)/tao/MessagingS_T.i \ + $(TAO_ROOT)/tao/MessagingS_T.cpp \ + $(TAO_ROOT)/tao/MessagingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i + +.obj/Notify_Collection.o .obj/Notify_Collection.so .shobj/Notify_Collection.o .shobj/Notify_Collection.so: Notify/Notify_Collection.cpp \ + Notify/Notify_Collection.h \ + $(ACE_ROOT)/ace/pre.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(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/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.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/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(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/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/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/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/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(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/varbase.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(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/IOR_LookupTable.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_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 \ + $(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 \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/IORManipulation.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/IORC.h \ + $(TAO_ROOT)/tao/IORC.i \ + $(TAO_ROOT)/tao/Interceptor.h \ + $(TAO_ROOT)/tao/InterceptorC.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/InterceptorC.i \ + $(TAO_ROOT)/tao/Interceptor.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.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/Context.h \ + $(TAO_ROOT)/tao/Context.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(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/Server_Request.i \ + $(TAO_ROOT)/tao/POA.h \ + $(TAO_ROOT)/tao/Object_Adapter.h \ + $(TAO_ROOT)/tao/Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ + $(ACE_ROOT)/ace/Map_T.h \ + $(ACE_ROOT)/ace/Pair.h \ + $(ACE_ROOT)/ace/Pair_T.h \ + $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Pair_T.cpp \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Active_Map_Manager.h \ + $(ACE_ROOT)/ace/Active_Map_Manager.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Map_T.i \ + $(ACE_ROOT)/ace/Map_T.cpp \ + $(TAO_ROOT)/tao/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServerC.i \ + $(TAO_ROOT)/tao/Key_Adapters.i \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/Servant_Base.h \ + $(TAO_ROOT)/tao/Servant_Base.i \ + $(TAO_ROOT)/tao/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Active_Object_Map.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/Object_Adapter.i \ + $(TAO_ROOT)/tao/POAManager.h \ + $(TAO_ROOT)/tao/POAManager.i \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.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/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/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/POA_CORBA.h \ + $(TAO_ROOT)/tao/DynAnyC.h \ + $(TAO_ROOT)/tao/DynAnyC.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(TAO_ROOT)/tao/Protocol_Factory.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/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ + $(TAO_ROOT)/tao/DynAny_i.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/InterfaceC.h \ + $(TAO_ROOT)/tao/ifrfwd.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/MessagingS.h \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/MessagingS_T.h \ + $(TAO_ROOT)/tao/MessagingS_T.i \ + $(TAO_ROOT)/tao/MessagingS_T.cpp \ + $(TAO_ROOT)/tao/MessagingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + Notify/notify_export.h Notify/Notify_Event.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ + Notify/Notify_Listeners.h + +.obj/Notify_Event_Map.o .obj/Notify_Event_Map.so .shobj/Notify_Event_Map.o .shobj/Notify_Event_Map.so: Notify/Notify_Event_Map.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(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/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.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/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(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/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/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/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/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(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/varbase.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(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/IOR_LookupTable.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_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 \ + $(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 \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/IORManipulation.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/IORC.h \ + $(TAO_ROOT)/tao/IORC.i \ + $(TAO_ROOT)/tao/Interceptor.h \ + $(TAO_ROOT)/tao/InterceptorC.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/InterceptorC.i \ + $(TAO_ROOT)/tao/Interceptor.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.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/Context.h \ + $(TAO_ROOT)/tao/Context.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(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/Server_Request.i \ + $(TAO_ROOT)/tao/POA.h \ + $(TAO_ROOT)/tao/Object_Adapter.h \ + $(TAO_ROOT)/tao/Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ + $(ACE_ROOT)/ace/Map_T.h \ + $(ACE_ROOT)/ace/Pair.h \ + $(ACE_ROOT)/ace/Pair_T.h \ + $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Pair_T.cpp \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Active_Map_Manager.h \ + $(ACE_ROOT)/ace/Active_Map_Manager.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Map_T.i \ + $(ACE_ROOT)/ace/Map_T.cpp \ + $(TAO_ROOT)/tao/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServerC.i \ + $(TAO_ROOT)/tao/Key_Adapters.i \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/Servant_Base.h \ + $(TAO_ROOT)/tao/Servant_Base.i \ + $(TAO_ROOT)/tao/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Active_Object_Map.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/Object_Adapter.i \ + $(TAO_ROOT)/tao/POAManager.h \ + $(TAO_ROOT)/tao/POAManager.i \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.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/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/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/POA_CORBA.h \ + $(TAO_ROOT)/tao/DynAnyC.h \ + $(TAO_ROOT)/tao/DynAnyC.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(TAO_ROOT)/tao/Protocol_Factory.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/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ + $(TAO_ROOT)/tao/DynAny_i.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/InterfaceC.h \ + $(TAO_ROOT)/tao/ifrfwd.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/MessagingS.h \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/MessagingS_T.h \ + $(TAO_ROOT)/tao/MessagingS_T.i \ + $(TAO_ROOT)/tao/MessagingS_T.cpp \ + $(TAO_ROOT)/tao/MessagingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + Notify/Notify_Event.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ + Notify/Notify_Event_Map.h Notify/Notify_Collection.h \ + Notify/Notify_Event_Map.i Notify/Notify_Factory.h \ + Notify/Notify_Event_Manager_Objects_Factory.h \ + Notify/Notify_Collection_Factory.h + +.obj/Notify_Event_Manager.o .obj/Notify_Event_Manager.so .shobj/Notify_Event_Manager.o .shobj/Notify_Event_Manager.so: Notify/Notify_Event_Manager.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -5392,43 +7238,61 @@ realclean: clean $(TAO_ROOT)/tao/MessagingS_T.i \ $(TAO_ROOT)/tao/MessagingS_T.cpp \ $(TAO_ROOT)/tao/MessagingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ + Notify/Notify_Event_Manager.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/Notify_Collection.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ + Notify/notify_export.h Notify/Notify_Event_Manager.i \ + Notify/Notify_Listeners.h Notify/Notify_Event_Map.h \ + Notify/Notify_Event_Map.i Notify/Notify_Event.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ + Notify/Notify_Event_Processor.h \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Stream.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/Stream.i \ + $(ACE_ROOT)/ace/Stream.cpp \ + Notify/Notify_EventChannel_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ $(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/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - Notify/notify_export.h Notify/Notify_Filter_i.h \ - Notify/Notify_Constraint_Interpreter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ - $(TAO_ROOT)/tao/DynSequence_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter.h \ - Notify/Notify_ID_Pool_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ @@ -5442,15 +7306,346 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - Notify/Notify_ID_Pool_T.i Notify/Notify_ID_Pool_T.cpp + Notify/Notify_ID_Pool_T.h Notify/Notify_ID_Pool_T.i \ + Notify/Notify_ID_Pool_T.cpp Notify/Notify_QoSAdmin_i.h \ + Notify/Notify_Worker_Task.h Notify/Notify_Command.h \ + Notify/Notify_Update_Dispatch_Command.h Notify/Notify_Factory.h \ + Notify/Notify_Event_Manager_Objects_Factory.h -.obj/Notify_QoSAdmin_i.o .obj/Notify_QoSAdmin_i.so .shobj/Notify_QoSAdmin_i.o .shobj/Notify_QoSAdmin_i.so: Notify/Notify_QoSAdmin_i.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.h \ +.obj/Notify_Event_Processor.o .obj/Notify_Event_Processor.so .shobj/Notify_Event_Processor.o .shobj/Notify_Event_Processor.so: Notify/Notify_Event_Processor.cpp \ + Notify/Notify_Event_Processor.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.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/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(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/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/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/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/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/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/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(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/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/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Stream.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/Stream.i \ + $(ACE_ROOT)/ace/Stream.cpp \ $(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/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(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/IOR_LookupTable.h \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/IORManipulation.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/IORC.h \ + $(TAO_ROOT)/tao/IORC.i \ + $(TAO_ROOT)/tao/Interceptor.h \ + $(TAO_ROOT)/tao/InterceptorC.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/InterceptorC.i \ + $(TAO_ROOT)/tao/Interceptor.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.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/Context.h \ + $(TAO_ROOT)/tao/Context.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(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/Server_Request.i \ + $(TAO_ROOT)/tao/POA.h \ + $(TAO_ROOT)/tao/Object_Adapter.h \ + $(TAO_ROOT)/tao/Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ + $(ACE_ROOT)/ace/Map_T.h \ + $(ACE_ROOT)/ace/Pair.h \ + $(ACE_ROOT)/ace/Pair_T.h \ + $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Pair_T.cpp \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Active_Map_Manager.h \ + $(ACE_ROOT)/ace/Active_Map_Manager.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Map_T.i \ + $(ACE_ROOT)/ace/Map_T.cpp \ + $(TAO_ROOT)/tao/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServerC.i \ + $(TAO_ROOT)/tao/Key_Adapters.i \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/Servant_Base.h \ + $(TAO_ROOT)/tao/Servant_Base.i \ + $(TAO_ROOT)/tao/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Active_Object_Map.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/Object_Adapter.i \ + $(TAO_ROOT)/tao/POAManager.h \ + $(TAO_ROOT)/tao/POAManager.i \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/POA_CORBA.h \ + $(TAO_ROOT)/tao/DynAnyC.h \ + $(TAO_ROOT)/tao/DynAnyC.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(TAO_ROOT)/tao/Protocol_Factory.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/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ + $(TAO_ROOT)/tao/DynAny_i.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/InterfaceC.h \ + $(TAO_ROOT)/tao/ifrfwd.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/MessagingS.h \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/MessagingS_T.h \ + $(TAO_ROOT)/tao/MessagingS_T.i \ + $(TAO_ROOT)/tao/MessagingS_T.cpp \ + $(TAO_ROOT)/tao/MessagingS.i \ + Notify/notify_export.h Notify/Notify_Worker_Task.h \ + Notify/Notify_Command.h Notify/Notify_Source_Filter_Eval_Command.h \ + Notify/Notify_Factory.h Notify/Notify_Event_Manager_Objects_Factory.h + +.obj/Notify_Worker_Task.o .obj/Notify_Worker_Task.so .shobj/Notify_Worker_Task.o .shobj/Notify_Worker_Task.so: Notify/Notify_Worker_Task.cpp \ + Notify/Notify_Worker_Task.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -5474,10 +7669,324 @@ realclean: clean $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.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.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Malloc_Base.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/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(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/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/Signal.h \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.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/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 \ + $(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/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(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/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/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(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.cpp \ + $(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/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(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/IOR_LookupTable.h \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/IORManipulation.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/IORC.h \ + $(TAO_ROOT)/tao/IORC.i \ + $(TAO_ROOT)/tao/Interceptor.h \ + $(TAO_ROOT)/tao/InterceptorC.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/InterceptorC.i \ + $(TAO_ROOT)/tao/Interceptor.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.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/Context.h \ + $(TAO_ROOT)/tao/Context.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(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/Server_Request.i \ + $(TAO_ROOT)/tao/POA.h \ + $(TAO_ROOT)/tao/Object_Adapter.h \ + $(TAO_ROOT)/tao/Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ + $(ACE_ROOT)/ace/Map_T.h \ + $(ACE_ROOT)/ace/Pair.h \ + $(ACE_ROOT)/ace/Pair_T.h \ + $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Pair_T.cpp \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Active_Map_Manager.h \ + $(ACE_ROOT)/ace/Active_Map_Manager.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Map_T.i \ + $(ACE_ROOT)/ace/Map_T.cpp \ + $(TAO_ROOT)/tao/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServerC.i \ + $(TAO_ROOT)/tao/Key_Adapters.i \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/Servant_Base.h \ + $(TAO_ROOT)/tao/Servant_Base.i \ + $(TAO_ROOT)/tao/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Active_Object_Map.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/Object_Adapter.i \ + $(TAO_ROOT)/tao/POAManager.h \ + $(TAO_ROOT)/tao/POAManager.i \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/POA_CORBA.h \ + $(TAO_ROOT)/tao/DynAnyC.h \ + $(TAO_ROOT)/tao/DynAnyC.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(TAO_ROOT)/tao/Protocol_Factory.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/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ + $(TAO_ROOT)/tao/DynAny_i.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/InterfaceC.h \ + $(TAO_ROOT)/tao/ifrfwd.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/MessagingS.h \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/MessagingS_T.h \ + $(TAO_ROOT)/tao/MessagingS_T.i \ + $(TAO_ROOT)/tao/MessagingS_T.cpp \ + $(TAO_ROOT)/tao/MessagingS.i \ + Notify/Notify_Command.h Notify/notify_export.h + +.obj/Notify_Source_Filter_Eval_Command.o .obj/Notify_Source_Filter_Eval_Command.so .shobj/Notify_Source_Filter_Eval_Command.o .shobj/Notify_Source_Filter_Eval_Command.so: \ + Notify/Notify_Source_Filter_Eval_Command.cpp \ + Notify/Notify_Source_Filter_Eval_Command.h \ + $(ACE_ROOT)/ace/pre.h \ + Notify/Notify_Command.h \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ @@ -5529,6 +8038,9 @@ realclean: clean $(ACE_ROOT)/ace/Message_Block_T.h \ $(ACE_ROOT)/ace/Message_Block_T.i \ $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/CDR_Stream.i \ @@ -5750,22 +8262,384 @@ realclean: clean $(TAO_ROOT)/tao/MessagingS_T.i \ $(TAO_ROOT)/tao/MessagingS_T.cpp \ $(TAO_ROOT)/tao/MessagingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ + Notify/notify_export.h Notify/Notify_Listeners.h \ + Notify/Notify_Lookup_Command.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + Notify/Notify_Worker_Task.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.cpp \ + Notify/Notify_Event.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i -.obj/Notify_Constraint_Interpreter.o .obj/Notify_Constraint_Interpreter.so .shobj/Notify_Constraint_Interpreter.o .shobj/Notify_Constraint_Interpreter.so: \ - Notify/Notify_Constraint_Interpreter.cpp \ - Notify/Notify_Constraint_Interpreter.h \ +.obj/Notify_Lookup_Command.o .obj/Notify_Lookup_Command.so .shobj/Notify_Lookup_Command.o .shobj/Notify_Lookup_Command.so: Notify/Notify_Lookup_Command.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ + $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(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/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.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/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(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/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/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/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/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(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/varbase.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(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/IOR_LookupTable.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_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 \ + $(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 \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/IORManipulation.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/IORC.h \ + $(TAO_ROOT)/tao/IORC.i \ + $(TAO_ROOT)/tao/Interceptor.h \ + $(TAO_ROOT)/tao/InterceptorC.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/InterceptorC.i \ + $(TAO_ROOT)/tao/Interceptor.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.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/Context.h \ + $(TAO_ROOT)/tao/Context.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(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/Server_Request.i \ + $(TAO_ROOT)/tao/POA.h \ + $(TAO_ROOT)/tao/Object_Adapter.h \ + $(TAO_ROOT)/tao/Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ + $(ACE_ROOT)/ace/Map_T.h \ + $(ACE_ROOT)/ace/Pair.h \ + $(ACE_ROOT)/ace/Pair_T.h \ + $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Pair_T.cpp \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Active_Map_Manager.h \ + $(ACE_ROOT)/ace/Active_Map_Manager.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Map_T.i \ + $(ACE_ROOT)/ace/Map_T.cpp \ + $(TAO_ROOT)/tao/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServerC.i \ + $(TAO_ROOT)/tao/Key_Adapters.i \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/Servant_Base.h \ + $(TAO_ROOT)/tao/Servant_Base.i \ + $(TAO_ROOT)/tao/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Active_Object_Map.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/Object_Adapter.i \ + $(TAO_ROOT)/tao/POAManager.h \ + $(TAO_ROOT)/tao/POAManager.i \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.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/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/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/POA_CORBA.h \ + $(TAO_ROOT)/tao/DynAnyC.h \ + $(TAO_ROOT)/tao/DynAnyC.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(TAO_ROOT)/tao/Protocol_Factory.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/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ + $(TAO_ROOT)/tao/DynAny_i.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/InterfaceC.h \ + $(TAO_ROOT)/tao/ifrfwd.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/MessagingS.h \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/MessagingS_T.h \ + $(TAO_ROOT)/tao/MessagingS_T.i \ + $(TAO_ROOT)/tao/MessagingS_T.cpp \ + $(TAO_ROOT)/tao/MessagingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + Notify/Notify_Lookup_Command.h Notify/Notify_Command.h \ + Notify/notify_export.h Notify/Notify_Event_Manager.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/Notify_Collection.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ + Notify/Notify_Event_Manager.i Notify/Notify_Listeners.h \ + Notify/Notify_Event_Map.h Notify/Notify_Event_Map.i \ + Notify/Notify_Event.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ + Notify/Notify_Event_Processor.h \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Stream.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/Stream.i \ + $(ACE_ROOT)/ace/Stream.cpp \ + Notify/Notify_Listener_Filter_Eval_Command.h \ + Notify/Notify_Worker_Task.h + +.obj/Notify_Listener_Filter_Eval_Command.o .obj/Notify_Listener_Filter_Eval_Command.so .shobj/Notify_Listener_Filter_Eval_Command.o .shobj/Notify_Listener_Filter_Eval_Command.so: \ + Notify/Notify_Listener_Filter_Eval_Command.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -6064,24 +8938,1321 @@ realclean: clean $(TAO_ROOT)/tao/MessagingS_T.i \ $(TAO_ROOT)/tao/MessagingS_T.cpp \ $(TAO_ROOT)/tao/MessagingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ - $(TAO_ROOT)/tao/DynSequence_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + Notify/Notify_Listener_Filter_Eval_Command.h Notify/Notify_Command.h \ + Notify/notify_export.h Notify/Notify_Event_Dispatch_Command.h \ + Notify/Notify_Worker_Task.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.cpp \ + Notify/Notify_Listeners.h Notify/Notify_Event.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i + +.obj/Notify_Event_Dispatch_Command.o .obj/Notify_Event_Dispatch_Command.so .shobj/Notify_Event_Dispatch_Command.o .shobj/Notify_Event_Dispatch_Command.so: \ + Notify/Notify_Event_Dispatch_Command.cpp \ + Notify/Notify_Event_Dispatch_Command.h \ + $(ACE_ROOT)/ace/pre.h \ + Notify/Notify_Command.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.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/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(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/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/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/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 \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(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/varbase.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(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/IOR_LookupTable.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_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 \ + $(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 \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/IORManipulation.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/IORC.h \ + $(TAO_ROOT)/tao/IORC.i \ + $(TAO_ROOT)/tao/Interceptor.h \ + $(TAO_ROOT)/tao/InterceptorC.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/InterceptorC.i \ + $(TAO_ROOT)/tao/Interceptor.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.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/Context.h \ + $(TAO_ROOT)/tao/Context.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(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/Server_Request.i \ + $(TAO_ROOT)/tao/POA.h \ + $(TAO_ROOT)/tao/Object_Adapter.h \ + $(TAO_ROOT)/tao/Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ + $(ACE_ROOT)/ace/Map_T.h \ + $(ACE_ROOT)/ace/Pair.h \ + $(ACE_ROOT)/ace/Pair_T.h \ + $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Pair_T.cpp \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Active_Map_Manager.h \ + $(ACE_ROOT)/ace/Active_Map_Manager.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Map_T.i \ + $(ACE_ROOT)/ace/Map_T.cpp \ + $(TAO_ROOT)/tao/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServerC.i \ + $(TAO_ROOT)/tao/Key_Adapters.i \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/Servant_Base.h \ + $(TAO_ROOT)/tao/Servant_Base.i \ + $(TAO_ROOT)/tao/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Active_Object_Map.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/Object_Adapter.i \ + $(TAO_ROOT)/tao/POAManager.h \ + $(TAO_ROOT)/tao/POAManager.i \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.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/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/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/POA_CORBA.h \ + $(TAO_ROOT)/tao/DynAnyC.h \ + $(TAO_ROOT)/tao/DynAnyC.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(TAO_ROOT)/tao/Protocol_Factory.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/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ + $(TAO_ROOT)/tao/DynAny_i.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/InterfaceC.h \ + $(TAO_ROOT)/tao/ifrfwd.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/MessagingS.h \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/MessagingS_T.h \ + $(TAO_ROOT)/tao/MessagingS_T.i \ + $(TAO_ROOT)/tao/MessagingS_T.cpp \ + $(TAO_ROOT)/tao/MessagingS.i \ + Notify/notify_export.h Notify/Notify_Listeners.h \ + Notify/Notify_Event.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i + +.obj/Notify_Update_Dispatch_Command.o .obj/Notify_Update_Dispatch_Command.so .shobj/Notify_Update_Dispatch_Command.o .shobj/Notify_Update_Dispatch_Command.so: \ + Notify/Notify_Update_Dispatch_Command.cpp \ + Notify/Notify_Update_Dispatch_Command.h \ + $(ACE_ROOT)/ace/pre.h \ + Notify/Notify_Command.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.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/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(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/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/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/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 \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(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/varbase.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(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/IOR_LookupTable.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_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 \ + $(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 \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/IORManipulation.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/IORC.h \ + $(TAO_ROOT)/tao/IORC.i \ + $(TAO_ROOT)/tao/Interceptor.h \ + $(TAO_ROOT)/tao/InterceptorC.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/InterceptorC.i \ + $(TAO_ROOT)/tao/Interceptor.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.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/Context.h \ + $(TAO_ROOT)/tao/Context.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(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/Server_Request.i \ + $(TAO_ROOT)/tao/POA.h \ + $(TAO_ROOT)/tao/Object_Adapter.h \ + $(TAO_ROOT)/tao/Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ + $(ACE_ROOT)/ace/Map_T.h \ + $(ACE_ROOT)/ace/Pair.h \ + $(ACE_ROOT)/ace/Pair_T.h \ + $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Pair_T.cpp \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Active_Map_Manager.h \ + $(ACE_ROOT)/ace/Active_Map_Manager.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Map_T.i \ + $(ACE_ROOT)/ace/Map_T.cpp \ + $(TAO_ROOT)/tao/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServerC.i \ + $(TAO_ROOT)/tao/Key_Adapters.i \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/Servant_Base.h \ + $(TAO_ROOT)/tao/Servant_Base.i \ + $(TAO_ROOT)/tao/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Active_Object_Map.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/Object_Adapter.i \ + $(TAO_ROOT)/tao/POAManager.h \ + $(TAO_ROOT)/tao/POAManager.i \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.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/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/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/POA_CORBA.h \ + $(TAO_ROOT)/tao/DynAnyC.h \ + $(TAO_ROOT)/tao/DynAnyC.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(TAO_ROOT)/tao/Protocol_Factory.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/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ + $(TAO_ROOT)/tao/DynAny_i.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/InterfaceC.h \ + $(TAO_ROOT)/tao/ifrfwd.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/MessagingS.h \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/MessagingS_T.h \ + $(TAO_ROOT)/tao/MessagingS_T.i \ + $(TAO_ROOT)/tao/MessagingS_T.cpp \ + $(TAO_ROOT)/tao/MessagingS.i \ + Notify/notify_export.h Notify/Notify_Collection.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + Notify/Notify_Listeners.h Notify/Notify_Event.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i + +.obj/Notify_Factory.o .obj/Notify_Factory.so .shobj/Notify_Factory.o .shobj/Notify_Factory.so: Notify/Notify_Factory.cpp \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Signal.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/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/Containers.h \ + $(ACE_ROOT)/ace/Malloc_Base.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/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(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/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/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/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + Notify/Notify_Factory.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Stream.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/CDR_Stream.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(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/IOR_LookupTable.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_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/IORManipulation.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/IORC.h \ + $(TAO_ROOT)/tao/IORC.i \ + $(TAO_ROOT)/tao/Interceptor.h \ + $(TAO_ROOT)/tao/InterceptorC.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/InterceptorC.i \ + $(TAO_ROOT)/tao/Interceptor.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.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/Context.h \ + $(TAO_ROOT)/tao/Context.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(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/Server_Request.i \ + $(TAO_ROOT)/tao/POA.h \ + $(TAO_ROOT)/tao/Object_Adapter.h \ + $(TAO_ROOT)/tao/Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ + $(ACE_ROOT)/ace/Map_T.h \ + $(ACE_ROOT)/ace/Pair.h \ + $(ACE_ROOT)/ace/Pair_T.h \ + $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Pair_T.cpp \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Active_Map_Manager.h \ + $(ACE_ROOT)/ace/Active_Map_Manager.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Map_T.i \ + $(ACE_ROOT)/ace/Map_T.cpp \ + $(TAO_ROOT)/tao/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServerC.i \ + $(TAO_ROOT)/tao/Key_Adapters.i \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/Servant_Base.h \ + $(TAO_ROOT)/tao/Servant_Base.i \ + $(TAO_ROOT)/tao/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Active_Object_Map.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/Object_Adapter.i \ + $(TAO_ROOT)/tao/POAManager.h \ + $(TAO_ROOT)/tao/POAManager.i \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.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/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/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/POA_CORBA.h \ + $(TAO_ROOT)/tao/DynAnyC.h \ + $(TAO_ROOT)/tao/DynAnyC.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Operation_Table.h \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ + $(TAO_ROOT)/tao/DynAny_i.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/InterfaceC.h \ + $(TAO_ROOT)/tao/ifrfwd.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/MessagingS.h \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/MessagingS_T.h \ + $(TAO_ROOT)/tao/MessagingS_T.i \ + $(TAO_ROOT)/tao/MessagingS_T.cpp \ + $(TAO_ROOT)/tao/MessagingS.i \ + Notify/notify_export.h Notify/Notify_Default_CO_Factory.h \ + Notify/Notify_Channel_Objects_Factory.h \ + Notify/Notify_Default_POA_Factory.h Notify/Notify_POA_Factory.h \ + Notify/Notify_Default_Collection_Factory.h \ + Notify/Notify_Collection_Factory.h Notify/Notify_Collection.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + Notify/Notify_Default_EMO_Factory.h \ + Notify/Notify_Event_Manager_Objects_Factory.h Notify/Notify_Event.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i + +.obj/Notify_Default_CO_Factory.o .obj/Notify_Default_CO_Factory.so .shobj/Notify_Default_CO_Factory.o .shobj/Notify_Default_CO_Factory.so: Notify/Notify_Default_CO_Factory.cpp \ + Notify/Notify_Default_CO_Factory.h \ + $(ACE_ROOT)/ace/pre.h \ + Notify/Notify_Channel_Objects_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/corba.h \ + $(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_Base.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.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/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/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(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/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/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/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/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(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/varbase.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(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/IOR_LookupTable.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_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_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 \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/IORManipulation.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/IORC.h \ + $(TAO_ROOT)/tao/IORC.i \ + $(TAO_ROOT)/tao/Interceptor.h \ + $(TAO_ROOT)/tao/InterceptorC.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/InterceptorC.i \ + $(TAO_ROOT)/tao/Interceptor.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.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/Context.h \ + $(TAO_ROOT)/tao/Context.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(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/Server_Request.i \ + $(TAO_ROOT)/tao/POA.h \ + $(TAO_ROOT)/tao/Object_Adapter.h \ + $(TAO_ROOT)/tao/Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ + $(ACE_ROOT)/ace/Map_T.h \ + $(ACE_ROOT)/ace/Pair.h \ + $(ACE_ROOT)/ace/Pair_T.h \ + $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Pair_T.cpp \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Active_Map_Manager.h \ + $(ACE_ROOT)/ace/Active_Map_Manager.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Map_T.i \ + $(ACE_ROOT)/ace/Map_T.cpp \ + $(TAO_ROOT)/tao/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServerC.i \ + $(TAO_ROOT)/tao/Key_Adapters.i \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/Servant_Base.h \ + $(TAO_ROOT)/tao/Servant_Base.i \ + $(TAO_ROOT)/tao/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Active_Object_Map.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/Object_Adapter.i \ + $(TAO_ROOT)/tao/POAManager.h \ + $(TAO_ROOT)/tao/POAManager.i \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.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/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/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/POA_CORBA.h \ + $(TAO_ROOT)/tao/DynAnyC.h \ + $(TAO_ROOT)/tao/DynAnyC.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(TAO_ROOT)/tao/Protocol_Factory.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/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ + $(TAO_ROOT)/tao/DynAny_i.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/InterfaceC.h \ + $(TAO_ROOT)/tao/ifrfwd.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/MessagingS.h \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/MessagingS_T.h \ + $(TAO_ROOT)/tao/MessagingS_T.i \ + $(TAO_ROOT)/tao/MessagingS_T.cpp \ + $(TAO_ROOT)/tao/MessagingS.i \ + Notify/notify_export.h Notify/Notify_Factory.h \ + Notify/Notify_EventChannelFactory_i.h Notify/Notify_ID_Pool_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ @@ -6099,13 +10270,68 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - Notify/notify_export.h Notify/Notify_Constraint_Visitors.h + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ + $(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/CosNotifyChannelAdminC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ + Notify/Notify_ID_Pool_T.i Notify/Notify_ID_Pool_T.cpp \ + Notify/Notify_EventChannel_i.h Notify/Notify_QoSAdmin_i.h \ + Notify/Notify_Collection.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + Notify/Notify_Event_Manager.h Notify/Notify_Event_Manager.i \ + Notify/Notify_Listeners.h Notify/Notify_Event_Map.h \ + Notify/Notify_Event_Map.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ + Notify/Notify_Event.h Notify/Notify_Event_Processor.h \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Stream.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/Stream.i \ + $(ACE_ROOT)/ace/Stream.cpp \ + Notify/Notify_FilterFactory_i.h Notify/Notify_ConsumerAdmin_i.h \ + Notify/Notify_FilterAdmin_i.h Notify/Notify_SupplierAdmin_i.h \ + Notify/Notify_StructuredProxyPushSupplier_i.h \ + Notify/Notify_ProxySupplier_T.h Notify/Notify_Proxy_T.h \ + Notify/Notify_Proxy_T.cpp Notify/Notify_ProxySupplier_T.cpp \ + Notify/Notify_SequenceProxyPushSupplier_i.h \ + Notify/Notify_ProxyPushSupplier_i.h \ + Notify/Notify_StructuredProxyPushConsumer_i.h \ + Notify/Notify_ProxyConsumer_T.h Notify/Notify_ProxyConsumer_T.cpp \ + Notify/Notify_SequenceProxyPushConsumer_i.h \ + Notify/Notify_ProxyPushConsumer_i.h -.obj/Notify_Constraint_Visitors.o .obj/Notify_Constraint_Visitors.so .shobj/Notify_Constraint_Visitors.o .shobj/Notify_Constraint_Visitors.so: Notify/Notify_Constraint_Visitors.cpp \ - Notify/Notify_Constraint_Visitors.h \ +.obj/Notify_Default_POA_Factory.o .obj/Notify_Default_POA_Factory.so .shobj/Notify_Default_POA_Factory.o .shobj/Notify_Default_POA_Factory.so: Notify/Notify_Default_POA_Factory.cpp \ + Notify/Notify_Default_POA_Factory.h \ $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + Notify/Notify_POA_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -6129,43 +10355,341 @@ realclean: clean $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/corba.h \ + $(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_Base.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.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/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/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(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/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/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/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/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(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/varbase.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(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/IOR_LookupTable.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_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_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 \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/IORManipulation.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/IORC.h \ + $(TAO_ROOT)/tao/IORC.i \ + $(TAO_ROOT)/tao/Interceptor.h \ + $(TAO_ROOT)/tao/InterceptorC.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/InterceptorC.i \ + $(TAO_ROOT)/tao/Interceptor.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.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/Context.h \ + $(TAO_ROOT)/tao/Context.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(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/Server_Request.i \ + $(TAO_ROOT)/tao/POA.h \ + $(TAO_ROOT)/tao/Object_Adapter.h \ + $(TAO_ROOT)/tao/Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ + $(ACE_ROOT)/ace/Map_T.h \ + $(ACE_ROOT)/ace/Pair.h \ + $(ACE_ROOT)/ace/Pair_T.h \ + $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Pair_T.cpp \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Active_Map_Manager.h \ + $(ACE_ROOT)/ace/Active_Map_Manager.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Map_T.i \ + $(ACE_ROOT)/ace/Map_T.cpp \ + $(TAO_ROOT)/tao/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServerC.i \ + $(TAO_ROOT)/tao/Key_Adapters.i \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/Servant_Base.h \ + $(TAO_ROOT)/tao/Servant_Base.i \ + $(TAO_ROOT)/tao/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Active_Object_Map.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/Object_Adapter.i \ + $(TAO_ROOT)/tao/POAManager.h \ + $(TAO_ROOT)/tao/POAManager.i \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.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/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/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/POA_CORBA.h \ + $(TAO_ROOT)/tao/DynAnyC.h \ + $(TAO_ROOT)/tao/DynAnyC.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(TAO_ROOT)/tao/Protocol_Factory.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/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ + $(TAO_ROOT)/tao/DynAny_i.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/InterfaceC.h \ + $(TAO_ROOT)/tao/ifrfwd.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/MessagingS.h \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/MessagingS_T.h \ + $(TAO_ROOT)/tao/MessagingS_T.i \ + $(TAO_ROOT)/tao/MessagingS_T.cpp \ + $(TAO_ROOT)/tao/MessagingS.i \ + Notify/notify_export.h Notify/Notify_Factory.h + +.obj/Notify_Default_Collection_Factory.o .obj/Notify_Default_Collection_Factory.so .shobj/Notify_Default_Collection_Factory.o .shobj/Notify_Default_Collection_Factory.so: \ + Notify/Notify_Default_Collection_Factory.cpp \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(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.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_T.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ + Notify/Notify_Default_Collection_Factory.h \ + Notify/Notify_Collection_Factory.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/Malloc_Base.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ + Notify/notify_export.h Notify/Notify_Collection.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(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_Base.h \ $(ACE_ROOT)/ace/Based_Pointer_T.h \ $(ACE_ROOT)/ace/Based_Pointer_T.i \ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ @@ -6186,12 +10710,44 @@ realclean: clean $(ACE_ROOT)/ace/Malloc_T.i \ $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ + $(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/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Signal.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/SString.h \ $(ACE_ROOT)/ace/SString.i \ + $(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/varbase.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(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/IOR_LookupTable.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_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_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ @@ -6203,16 +10759,305 @@ realclean: clean $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/IORManipulation.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/IORC.h \ + $(TAO_ROOT)/tao/IORC.i \ + $(TAO_ROOT)/tao/Interceptor.h \ + $(TAO_ROOT)/tao/InterceptorC.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/InterceptorC.i \ + $(TAO_ROOT)/tao/Interceptor.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.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/Context.h \ + $(TAO_ROOT)/tao/Context.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(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/Server_Request.i \ + $(TAO_ROOT)/tao/POA.h \ + $(TAO_ROOT)/tao/Object_Adapter.h \ + $(TAO_ROOT)/tao/Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ + $(ACE_ROOT)/ace/Map_T.h \ + $(ACE_ROOT)/ace/Pair.h \ + $(ACE_ROOT)/ace/Pair_T.h \ + $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Pair_T.cpp \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Active_Map_Manager.h \ + $(ACE_ROOT)/ace/Active_Map_Manager.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Map_T.i \ + $(ACE_ROOT)/ace/Map_T.cpp \ + $(TAO_ROOT)/tao/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServerC.i \ + $(TAO_ROOT)/tao/Key_Adapters.i \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/Servant_Base.h \ + $(TAO_ROOT)/tao/Servant_Base.i \ + $(TAO_ROOT)/tao/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Active_Object_Map.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/Object_Adapter.i \ + $(TAO_ROOT)/tao/POAManager.h \ + $(TAO_ROOT)/tao/POAManager.i \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.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/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/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/POA_CORBA.h \ + $(TAO_ROOT)/tao/DynAnyC.h \ + $(TAO_ROOT)/tao/DynAnyC.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(TAO_ROOT)/tao/Protocol_Factory.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/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ + $(TAO_ROOT)/tao/DynAny_i.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/InterfaceC.h \ + $(TAO_ROOT)/tao/ifrfwd.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/MessagingS.h \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/MessagingS_T.h \ + $(TAO_ROOT)/tao/MessagingS_T.i \ + $(TAO_ROOT)/tao/MessagingS_T.cpp \ + $(TAO_ROOT)/tao/MessagingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp \ + Notify/Notify_Event.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ + Notify/Notify_Listeners.h Notify/Notify_Factory.h + +.obj/Notify_Default_EMO_Factory.o .obj/Notify_Default_EMO_Factory.so .shobj/Notify_Default_EMO_Factory.o .shobj/Notify_Default_EMO_Factory.so: Notify/Notify_Default_EMO_Factory.cpp \ + $(ACE_ROOT)/ace/Arg_Shifter.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Get_Opt.i \ + Notify/Notify_Default_EMO_Factory.h \ + Notify/Notify_Event_Manager_Objects_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Service_Object.i \ $(TAO_ROOT)/tao/corba.h \ $(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_Base.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.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/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/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(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/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/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/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/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/try_macros.h \ $(TAO_ROOT)/tao/orbconf.h \ @@ -6225,6 +11070,27 @@ realclean: clean $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/IOR_LookupTable.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_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_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 \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ @@ -6407,14 +11273,42 @@ realclean: clean $(TAO_ROOT)/tao/MessagingS_T.i \ $(TAO_ROOT)/tao/MessagingS_T.cpp \ $(TAO_ROOT)/tao/MessagingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h \ - $(TAO_ROOT)/tao/DynSequence_i.h \ + Notify/notify_export.h Notify/Notify_Event_Manager.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ - Notify/notify_export.h + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + Notify/Notify_Collection.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ + Notify/Notify_Event_Manager.i Notify/Notify_Listeners.h \ + Notify/Notify_Event_Map.h Notify/Notify_Event_Map.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ + Notify/Notify_Event.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ + Notify/Notify_Event_Processor.h \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Stream.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/Stream.i \ + $(ACE_ROOT)/ace/Stream.cpp \ + Notify/Notify_Worker_Task.h Notify/Notify_Command.h \ + Notify/Notify_Factory.h .obj/Interpreter.o .obj/Interpreter.so .shobj/Interpreter.o .shobj/Interpreter.so: Trader/Interpreter.cpp Trader/Interpreter.h \ $(ACE_ROOT)/ace/pre.h \ @@ -6422,6 +11316,8 @@ realclean: clean $(ACE_ROOT)/ace/post.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -6732,6 +11628,8 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -7047,6 +11945,8 @@ realclean: clean $(ACE_ROOT)/ace/post.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -7354,6 +12254,8 @@ realclean: clean .obj/Constraint_l.o .obj/Constraint_l.so .shobj/Constraint_l.o .shobj/Constraint_l.so: Trader/Constraint_l.cpp \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -7680,6 +12582,8 @@ realclean: clean .obj/Constraint_y.o .obj/Constraint_y.so .shobj/Constraint_y.o .shobj/Constraint_y.so: Trader/Constraint_y.cpp \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -8008,6 +12912,8 @@ realclean: clean $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -8320,6 +13226,8 @@ realclean: clean $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -8626,6 +13534,8 @@ realclean: clean CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -8934,6 +13844,8 @@ realclean: clean CosNotificationS.h CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -9236,13 +14148,12 @@ realclean: clean Notify/notify_export.h CosNotificationC.i CosNotificationS_T.h \ CosNotificationS_T.i CosNotificationS_T.cpp CosNotificationS.i \ CosNotifyFilterS.h CosNotifyCommS.h CosEventCommS.h CosEventCommC.h \ - CosEvent/event_export.h CosEventCommC.i CosEventCommS_T.h \ - CosEventCommS_T.i CosEventCommS_T.cpp CosEventCommS.i \ - CosNotifyCommC.h CosNotifyCommC.i CosNotifyCommS_T.h \ - CosNotifyCommS_T.i CosNotifyCommS_T.cpp CosNotifyCommS.i \ - CosNotifyFilterC.h CosNotifyFilterC.i CosNotifyFilterS_T.h \ - CosNotifyFilterS_T.i CosNotifyFilterS_T.cpp CosNotifyFilterS.i \ - CosEventChannelAdminS.h CosEventChannelAdminC.h \ + CosEventCommC.i CosEventCommS_T.h CosEventCommS_T.i \ + CosEventCommS_T.cpp CosEventCommS.i CosNotifyCommC.h CosNotifyCommC.i \ + CosNotifyCommS_T.h CosNotifyCommS_T.i CosNotifyCommS_T.cpp \ + CosNotifyCommS.i CosNotifyFilterC.h CosNotifyFilterC.i \ + CosNotifyFilterS_T.h CosNotifyFilterS_T.i CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i CosEventChannelAdminS.h CosEventChannelAdminC.h \ CosEventChannelAdminC.i CosEventChannelAdminS_T.h \ CosEventChannelAdminS_T.i CosEventChannelAdminS_T.cpp \ CosEventChannelAdminS.i CosNotifyChannelAdminC.h \ @@ -9255,6 +14166,8 @@ realclean: clean CosNotificationS.h CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -9556,17 +14469,18 @@ realclean: clean $(TAO_ROOT)/tao/MessagingS.i \ Notify/notify_export.h CosNotificationC.i CosNotificationS_T.h \ CosNotificationS_T.i CosNotificationS_T.cpp CosNotificationS.i \ - CosEventCommS.h CosEventCommC.h CosEvent/event_export.h \ - CosEventCommC.i CosEventCommS_T.h CosEventCommS_T.i \ - CosEventCommS_T.cpp CosEventCommS.i CosNotifyCommC.h CosNotifyCommC.i \ - CosNotifyCommS_T.h CosNotifyCommS_T.i CosNotifyCommS_T.cpp \ - CosNotifyCommS.i + CosEventCommS.h CosEventCommC.h CosEventCommC.i CosEventCommS_T.h \ + CosEventCommS_T.i CosEventCommS_T.cpp CosEventCommS.i \ + CosNotifyCommC.h CosNotifyCommC.i CosNotifyCommS_T.h \ + CosNotifyCommS_T.i CosNotifyCommS_T.cpp CosNotifyCommS.i .obj/CosNotifyFilterS.o .obj/CosNotifyFilterS.so .shobj/CosNotifyFilterS.o .shobj/CosNotifyFilterS.so: CosNotifyFilterS.cpp CosNotifyFilterS.h \ $(ACE_ROOT)/ace/pre.h \ CosNotifyCommS.h CosNotificationS.h CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -9868,19 +14782,20 @@ realclean: clean $(TAO_ROOT)/tao/MessagingS.i \ Notify/notify_export.h CosNotificationC.i CosNotificationS_T.h \ CosNotificationS_T.i CosNotificationS_T.cpp CosNotificationS.i \ - CosEventCommS.h CosEventCommC.h CosEvent/event_export.h \ - CosEventCommC.i CosEventCommS_T.h CosEventCommS_T.i \ - CosEventCommS_T.cpp CosEventCommS.i CosNotifyCommC.h CosNotifyCommC.i \ - CosNotifyCommS_T.h CosNotifyCommS_T.i CosNotifyCommS_T.cpp \ - CosNotifyCommS.i CosNotifyFilterC.h CosNotifyFilterC.i \ - CosNotifyFilterS_T.h CosNotifyFilterS_T.i CosNotifyFilterS_T.cpp \ - CosNotifyFilterS.i + CosEventCommS.h CosEventCommC.h CosEventCommC.i CosEventCommS_T.h \ + CosEventCommS_T.i CosEventCommS_T.cpp CosEventCommS.i \ + CosNotifyCommC.h CosNotifyCommC.i CosNotifyCommS_T.h \ + CosNotifyCommS_T.i CosNotifyCommS_T.cpp CosNotifyCommS.i \ + CosNotifyFilterC.h CosNotifyFilterC.i CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i CosNotifyFilterS_T.cpp CosNotifyFilterS.i .obj/CosEventCommS.o .obj/CosEventCommS.so .shobj/CosEventCommS.o .shobj/CosEventCommS.so: CosEventCommS.cpp CosEventCommS.h \ $(ACE_ROOT)/ace/pre.h \ CosEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -10180,7 +15095,7 @@ realclean: clean $(TAO_ROOT)/tao/MessagingS_T.i \ $(TAO_ROOT)/tao/MessagingS_T.cpp \ $(TAO_ROOT)/tao/MessagingS.i \ - CosEvent/event_export.h CosEventCommC.i CosEventCommS_T.h \ + Notify/notify_export.h CosEventCommC.i CosEventCommS_T.h \ CosEventCommS_T.i CosEventCommS_T.cpp CosEventCommS.i .obj/CosEventChannelAdminS.o .obj/CosEventChannelAdminS.so .shobj/CosEventChannelAdminS.o .shobj/CosEventChannelAdminS.so: CosEventChannelAdminS.cpp \ @@ -10189,6 +15104,8 @@ realclean: clean CosEventCommS.h CosEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -10488,7 +15405,7 @@ realclean: clean $(TAO_ROOT)/tao/MessagingS_T.i \ $(TAO_ROOT)/tao/MessagingS_T.cpp \ $(TAO_ROOT)/tao/MessagingS.i \ - CosEvent/event_export.h CosEventCommC.i CosEventCommS_T.h \ + Notify/notify_export.h CosEventCommC.i CosEventCommS_T.h \ CosEventCommS_T.i CosEventCommS_T.cpp CosEventCommS.i \ CosEventChannelAdminC.h CosEventChannelAdminC.i \ CosEventChannelAdminS_T.h CosEventChannelAdminS_T.i \ @@ -10499,6 +15416,8 @@ realclean: clean CosTradingC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -10798,7 +15717,7 @@ realclean: clean $(TAO_ROOT)/tao/MessagingS_T.i \ $(TAO_ROOT)/tao/MessagingS_T.cpp \ $(TAO_ROOT)/tao/MessagingS.i \ - Trader/trading_export.h CosTradingC.i CosTradingS_T.h CosTradingS_T.i \ + Notify/notify_export.h CosTradingC.i CosTradingS_T.h CosTradingS_T.i \ CosTradingS_T.cpp CosTradingS.i .obj/CosTradingReposS.o .obj/CosTradingReposS.so .shobj/CosTradingReposS.o .shobj/CosTradingReposS.so: CosTradingReposS.cpp CosTradingReposS.h \ @@ -10806,6 +15725,8 @@ realclean: clean CosTradingS.h CosTradingC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -11105,7 +16026,7 @@ realclean: clean $(TAO_ROOT)/tao/MessagingS_T.i \ $(TAO_ROOT)/tao/MessagingS_T.cpp \ $(TAO_ROOT)/tao/MessagingS.i \ - Trader/trading_export.h CosTradingC.i CosTradingS_T.h CosTradingS_T.i \ + Notify/notify_export.h CosTradingC.i CosTradingS_T.h CosTradingS_T.i \ CosTradingS_T.cpp CosTradingS.i CosTradingReposC.h CosTradingReposC.i \ CosTradingReposS_T.h CosTradingReposS_T.i CosTradingReposS_T.cpp \ CosTradingReposS.i @@ -11114,6 +16035,8 @@ realclean: clean $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -11420,6 +16343,8 @@ realclean: clean $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -11720,15 +16645,16 @@ realclean: clean $(TAO_ROOT)/tao/MessagingS_T.cpp \ $(TAO_ROOT)/tao/MessagingS.i \ Notify/notify_export.h CosNotificationC.h CosNotificationC.i \ - CosNotifyFilterC.h CosNotifyCommC.h CosEventCommC.h \ - CosEvent/event_export.h CosEventCommC.i CosNotifyCommC.i \ - CosNotifyFilterC.i CosEventChannelAdminC.h CosEventChannelAdminC.i \ - CosNotifyChannelAdminC.i + CosNotifyFilterC.h CosNotifyCommC.h CosEventCommC.h CosEventCommC.i \ + CosNotifyCommC.i CosNotifyFilterC.i CosEventChannelAdminC.h \ + CosEventChannelAdminC.i CosNotifyChannelAdminC.i .obj/CosNotifyCommC.o .obj/CosNotifyCommC.so .shobj/CosNotifyCommC.o .shobj/CosNotifyCommC.so: CosNotifyCommC.cpp CosNotifyCommC.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -12029,13 +16955,14 @@ realclean: clean $(TAO_ROOT)/tao/MessagingS_T.cpp \ $(TAO_ROOT)/tao/MessagingS.i \ Notify/notify_export.h CosNotificationC.h CosNotificationC.i \ - CosEventCommC.h CosEvent/event_export.h CosEventCommC.i \ - CosNotifyCommC.i + CosEventCommC.h CosEventCommC.i CosNotifyCommC.i .obj/CosNotifyFilterC.o .obj/CosNotifyFilterC.so .shobj/CosNotifyFilterC.o .shobj/CosNotifyFilterC.so: CosNotifyFilterC.cpp CosNotifyFilterC.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -12336,13 +17263,15 @@ realclean: clean $(TAO_ROOT)/tao/MessagingS_T.cpp \ $(TAO_ROOT)/tao/MessagingS.i \ Notify/notify_export.h CosNotifyCommC.h CosNotificationC.h \ - CosNotificationC.i CosEventCommC.h CosEvent/event_export.h \ - CosEventCommC.i CosNotifyCommC.i CosNotifyFilterC.i + CosNotificationC.i CosEventCommC.h CosEventCommC.i CosNotifyCommC.i \ + CosNotifyFilterC.i .obj/CosEventCommC.o .obj/CosEventCommC.so .shobj/CosEventCommC.o .shobj/CosEventCommC.so: CosEventCommC.cpp CosEventCommC.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -12642,13 +17571,15 @@ realclean: clean $(TAO_ROOT)/tao/MessagingS_T.i \ $(TAO_ROOT)/tao/MessagingS_T.cpp \ $(TAO_ROOT)/tao/MessagingS.i \ - CosEvent/event_export.h CosEventCommC.i + Notify/notify_export.h CosEventCommC.i .obj/CosEventChannelAdminC.o .obj/CosEventChannelAdminC.so .shobj/CosEventChannelAdminC.o .shobj/CosEventChannelAdminC.so: CosEventChannelAdminC.cpp \ CosEventChannelAdminC.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -12948,13 +17879,15 @@ realclean: clean $(TAO_ROOT)/tao/MessagingS_T.i \ $(TAO_ROOT)/tao/MessagingS_T.cpp \ $(TAO_ROOT)/tao/MessagingS.i \ - CosEvent/event_export.h CosEventCommC.h CosEventCommC.i \ + Notify/notify_export.h CosEventCommC.h CosEventCommC.i \ CosEventChannelAdminC.i .obj/CosTradingC.o .obj/CosTradingC.so .shobj/CosTradingC.o .shobj/CosTradingC.so: CosTradingC.cpp CosTradingC.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -13254,12 +18187,14 @@ realclean: clean $(TAO_ROOT)/tao/MessagingS_T.i \ $(TAO_ROOT)/tao/MessagingS_T.cpp \ $(TAO_ROOT)/tao/MessagingS.i \ - Trader/trading_export.h CosTradingC.i + Notify/notify_export.h CosTradingC.i .obj/CosTradingReposC.o .obj/CosTradingReposC.so .shobj/CosTradingReposC.o .shobj/CosTradingReposC.so: CosTradingReposC.cpp CosTradingReposC.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -13559,7 +18494,6 @@ realclean: clean $(TAO_ROOT)/tao/MessagingS_T.i \ $(TAO_ROOT)/tao/MessagingS_T.cpp \ $(TAO_ROOT)/tao/MessagingS.i \ - Trader/trading_export.h CosTradingC.h CosTradingC.i \ - CosTradingReposC.i + Notify/notify_export.h CosTradingC.h CosTradingC.i CosTradingReposC.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Channel_Objects_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Channel_Objects_Factory.h new file mode 100644 index 00000000000..9fe23a6b276 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Channel_Objects_Factory.h @@ -0,0 +1,110 @@ +/* -*- C++ -*- */ +// $Id$ +// +// ============================================================================ +// +// = LIBRARY +// ORBSVCS Notification +// +// = FILENAME +// Notify_Channel_Objects_Factory.h +// +// = DESCRIPTION +// Factory for all CosNotify objects defined in the idl files and other related objects. +// +// = AUTHOR +// Pradeep Gore <pradeep@cs.wustl.edu> +// +// ============================================================================ + +#ifndef TAO_NOTIFY_CO_FACTORY_H +#define TAO_NOTIFY_CO_FACTORY_H + +#include "ace/pre.h" +#include "ace/Service_Object.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/corba.h" +#include "notify_export.h" + +class TAO_Notify_EventChannelFactory_i; +class TAO_Notify_EventChannel_i; +class TAO_Notify_ConsumerAdmin_i; +class TAO_Notify_SupplierAdmin_i; +class TAO_Notify_FilterFactory_i; +class TAO_Notify_StructuredProxyPushSupplier_i; +class TAO_Notify_SequenceProxyPushSupplier_i; +class TAO_Notify_ProxyPushSupplier_i; +class TAO_Notify_StructuredProxyPushConsumer_i; +class TAO_Notify_SequenceProxyPushConsumer_i; +class TAO_Notify_ProxyPushConsumer_i; +class ACE_Lock; + +class TAO_Notify_Export TAO_Notify_CO_Factory : public ACE_Service_Object +{ + // = TITLE + // TAO_Notify_CO_Factory + // + // = DESCRIPTION + // Factory for channel objects. + // + public: + // = Creation methods + virtual TAO_Notify_EventChannel_i* create_event_channel (TAO_Notify_EventChannelFactory_i* parent, CORBA::Environment &ACE_TRY_ENV)=0; + // Create an Event Channel. + + virtual TAO_Notify_ConsumerAdmin_i* create_consumer_admin (TAO_Notify_EventChannel_i* channel, CORBA::Environment &ACE_TRY_ENV)=0; + // Create a Consumer Admin. + + virtual TAO_Notify_SupplierAdmin_i* create_supplier_admin (TAO_Notify_EventChannel_i* channel, CORBA::Environment &ACE_TRY_ENV)=0; + // Create a Supplier Admin. + + virtual TAO_Notify_FilterFactory_i* create_filter_factory (CORBA::Environment &ACE_TRY_ENV)=0; + // Create the Filter Factory. + + // = Proxy Creation methods. + virtual TAO_Notify_StructuredProxyPushSupplier_i* create_struct_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV)=0; + // Create a Structured ProxyPushSupplier. + + virtual TAO_Notify_SequenceProxyPushSupplier_i* create_seq_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV)=0; + // Create a Sequence ProxyPushSupplier. + + virtual TAO_Notify_ProxyPushSupplier_i* create_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV)=0; + // Create a ProxyPushSupplier. + + virtual TAO_Notify_StructuredProxyPushConsumer_i* create_struct_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV)=0; + // Create a Structured ProxyPushConsumer. + + virtual TAO_Notify_SequenceProxyPushConsumer_i* create_seq_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV)=0; + // Create a Sequence ProxyPushConsumer. + + virtual TAO_Notify_ProxyPushConsumer_i* create_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV)=0; + // Create a ProxyPushConsumer. + + //= Locks + // = Methods to create locks. + virtual ACE_Lock* create_channel_factory_lock (CORBA::Environment &ACE_TRY_ENV)=0; + // Create lock type used by channel factory. + + virtual ACE_Lock* create_event_channel_lock (CORBA::Environment &ACE_TRY_ENV)=0; + // Create lock type used by EC's. + + virtual ACE_Lock* create_consumer_admin_lock (CORBA::Environment &ACE_TRY_ENV)=0; + // Create lock type used by Consumer Admin's. + + virtual ACE_Lock* create_supplier_admin_lock (CORBA::Environment &ACE_TRY_ENV)=0; + // Create lock type used by Supplier Admin's. + + virtual ACE_Lock* create_proxy_supplier_lock (CORBA::Environment &ACE_TRY_ENV)=0; + // Create lock type used by proxy supplier. + + virtual ACE_Lock* create_proxy_consumer_lock (CORBA::Environment &ACE_TRY_ENV)=0; + // Create lock type used by proxy consumer. +}; + +#include "ace/post.h" + +#endif /* TAO_NOTIFY_CO_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.cpp new file mode 100644 index 00000000000..53a7803c1a0 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.cpp @@ -0,0 +1,90 @@ +// $Id$ + +#include "Notify_Collection.h" +#include "Notify_Event.h" +#include "Notify_Listeners.h" + +ACE_RCSID(Notify, Notify_Collection, "$Id$") + +// = TAO_Notify_EventType_List +void +TAO_Notify_EventType_List::populate (CosNotification::EventTypeSeq& event_type_seq) +{ + event_type_seq.length (this->size ()); + + TAO_Notify_EventType_List::ITERATOR iter (*this); + + TAO_Notify_EventType* event_type; + + CORBA::ULong i = 0; + for (iter.first (); iter.next (event_type); iter.advance (), ++i) + event_type_seq[i] = event_type->get_native (); +} + +void +TAO_Notify_EventType_List::insert_seq (const CosNotification::EventTypeSeq& event_type_seq) +{ + TAO_Notify_EventType event_type; + + for (CORBA::ULong i = 0; i < event_type_seq.length (); ++i) + { + event_type = event_type_seq[i]; + inherited::insert (event_type); + } +} + +void +TAO_Notify_EventType_List::remove_seq (const CosNotification::EventTypeSeq& event_type_seq) +{ + TAO_Notify_EventType event_type; + + for (CORBA::ULong i = 0; i < event_type_seq.length (); ++i) + { + event_type = event_type_seq[i]; + inherited::remove (event_type); + } +} + +/********************************************************************/ + +TAO_Notify_Shutdown_Worker::TAO_Notify_Shutdown_Worker (void) +{ +} + +void +TAO_Notify_Shutdown_Worker::work (TAO_Notify_EventListener* listener, CORBA::Environment &ACE_TRY_ENV) +{ + listener->shutdown (ACE_TRY_ENV); +} + +/********************************************************************/ + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +template class ACE_Unbounded_Set <TAO_Notify_EventType>; +template class ACE_Unbounded_Set_Iterator<TAO_Notify_EventType>; +template class ACE_Node<TAO_Notify_EventType>; + +template class ACE_Unbounded_Set<TAO_Notify_EventListener*>; +template class ACE_Unbounded_Set_Iterator<TAO_Notify_EventListener*>; +template class ACE_Node<TAO_Notify_EventListener*>; + +template class ACE_Unbounded_Set<TAO_Notify_UpdateListener*>; +template class ACE_Unbounded_Set_Iterator<TAO_Notify_UpdateListener*>; +template class ACE_Node<TAO_Notify_UpdateListener*>; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +#pragma instantiate ACE_Unbounded_Set<TAO_Notify_EventType> +#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_Notify_EventType> +#pragma instantiate ACE_Node<TAO_Notify_EventType> + +#pragma instantiate ACE_Unbounded_Set<TAO_Notify_EventListener*> +#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_Notify_EventListener*> +#pragma instantiate ACE_Node<TAO_Notify_EventListener*> + +#pragma instantiate ACE_Unbounded_Set<TAO_Notify_UpdateListener*> +#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_Notify_UpdateListener*> +#pragma instantiate ACE_Node<TAO_Notify_UpdateListener*> + +#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.h new file mode 100644 index 00000000000..4066fae6b44 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.h @@ -0,0 +1,87 @@ +// $Id$ +// ========================================================================== +// +// = LIBRARY +// Orbsvcs +// +// = FILENAME +// Notify_Collection.h +// +// = DESCRIPTION +// Collection types used by Notify +// +// = AUTHOR +// Pradeep Gore <pradeep@cs.wustl.edu> +// +// ========================================================================== + +#ifndef TAO_NOTIFY_COLLECTION_H +#define TAO_NOTIFY_COLLECTION_H + +#include "ace/pre.h" +#include "orbsvcs/CosNotifyCommC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "orbsvcs/ESF/ESF_Worker.h" +#include "notify_export.h" + +template<class PROXY> class TAO_ESF_Proxy_Collection; +template<class T> class ACE_Unbounded_Set; + +class TAO_Notify_EventListener; +class TAO_Notify_UpdateListener; +class TAO_Notify_EventType; + +typedef TAO_ESF_Proxy_Collection<TAO_Notify_EventListener> TAO_Notify_EventListener_List; +// A list of event listeners that are looking for the same event type. + +typedef TAO_ESF_Proxy_Collection<TAO_Notify_UpdateListener> TAO_Notify_UpdateListener_List; +// A list of update listeners who want to be notified about publish/subscribe changes. + +class TAO_Notify_Export TAO_Notify_EventType_List : public ACE_Unbounded_Set <TAO_Notify_EventType> +{ + // = TITLE + // TAO_Notify_EventType_List + // + // = DESCRIPTION + // Allows operations using the CosNotification::EventTypeSeq type. + // + + typedef ACE_Unbounded_Set <TAO_Notify_EventType> inherited; + +public: + void populate (CosNotification::EventTypeSeq& event_type_seq); + // Populate <event_type_seq> with the contents of this object. + + void insert_seq (const CosNotification::EventTypeSeq& event_type_seq); + // insert the contents of <event_type_seq> into this object. + + void remove_seq (const CosNotification::EventTypeSeq& event_type_seq); + // remove the contents of <event_type_seq> from this object. +}; + +// **************************************************************** + +// = Collection Iterators. + +class TAO_Notify_Export TAO_Notify_Shutdown_Worker : public TAO_ESF_Worker<TAO_Notify_EventListener> +{ + // = TITLE + // TAO_Notify_Shutdown_Worker + // + // = DESCRIPTION + // Shutdown each listener + // + public: + TAO_Notify_Shutdown_Worker (void); + + // = TAO_ESF_Worker method + void work (TAO_Notify_EventListener* listener, CORBA::Environment &ACE_TRY_ENV); +}; + +// **************************************************************** +#include "ace/post.h" +#endif /* TAO_NOTIFY_COLLECTION_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection_Factory.h new file mode 100644 index 00000000000..64bd4e8e80b --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection_Factory.h @@ -0,0 +1,52 @@ +/* -*- C++ -*- */ +// $Id$ +// +// ============================================================================ +// +// = LIBRARY +// ORBSVCS Notification +// +// = FILENAME +// Notify_Collection_Factory.h +// +// = DESCRIPTION +// A factory fpr the collection types used by Notify. +// +// = AUTHOR +// Pradeep Gore <pradeep@cs.wustl.edu> +// +// ============================================================================ + +#ifndef NOTIFY_COLLECTION_FACTORY_H +#define NOTIFY_COLLECTION_FACTORY_H + +#include "ace/pre.h" +#include "ace/Service_Object.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "notify_export.h" +#include "Notify_Collection.h" + +class TAO_Notify_Export TAO_Notify_Collection_Factory : public ACE_Service_Object +{ + // = TITLE + // TAO_Notify_Collection_Factory + // + // = DESCRIPTION + // Collection factory + // +public: + // = Methods to create listener collections. + virtual TAO_Notify_EventListener_List* create_event_listener_list (CORBA::Environment &ACE_TRY_ENV) = 0; + // Create the event listener list. + + virtual TAO_Notify_UpdateListener_List* create_update_listener_list (CORBA::Environment &ACE_TRY_ENV) = 0; + // create update listener list. +}; + +#include "ace/post.h" + +#endif /* NOTIFY_COLLECTION_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Command.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Command.h new file mode 100644 index 00000000000..52ad40fd060 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Command.h @@ -0,0 +1,50 @@ +/* -*- C++ -*- */ +// $Id$ +// +// ============================================================================ +// +// = LIBRARY +// ORBSVCS Notification +// +// = FILENAME +// Notify_Command.h +// +// = DESCRIPTION +// Command Object base class used by Notify's Worker Task objects. +// +// = AUTHOR +// Pradeep Gore <pradeep@cs.wustl.edu> +// +// ============================================================================ + +#ifndef TAO_NOTIFY_COMMAND_H +#define TAO_NOTIFY_COMMAND_H + +#include "ace/pre.h" +#include "ace/Message_Block.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/corba.h" +#include "notify_export.h" + +class TAO_Notify_Worker_Task; + +class TAO_Notify_Export TAO_Notify_Command : public ACE_Message_Block +{ + // = TITLE + // TAO_Notify_Command + // + // = DESCRIPTION + // + // + public: + virtual int execute (TAO_Notify_Worker_Task* parent_task, CORBA::Environment&) = 0; + // Command callback +}; + +#include "ace/post.h" + +#endif /* TAO_NOTIFY_COMMAND_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h index bd3f83dffbf..00d9fe03ba3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h @@ -19,8 +19,12 @@ #ifndef TAO_NOTIFY_CONSTRAINT_INTERPRETER_H #define TAO_NOTIFY_CONSTRAINT_INTERPRETER_H #include "ace/pre.h" - #include "orbsvcs/Trader/Constraint_Nodes.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "orbsvcs/Trader/Constraint_Visitors.h" #include "orbsvcs/Trader/Interpreter.h" #include "orbsvcs/CosNotifyFilterS.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h index 8a2eff65dad..5748c525103 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h @@ -18,9 +18,14 @@ #ifndef NOTIFY_CONSTRAINT_VISITORS_H #define NOTIFY_CONSTRAINT_VISITORS_H -#include "ace/pre.h" +#include "ace/pre.h" #include "ace/Hash_Map_Manager.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "orbsvcs/orbsvcs/Trader/Constraint_Visitors.h" #include "orbsvcs/CosNotificationC.h" #include "notify_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp index 3ad60898871..de227f41e52 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp @@ -1,53 +1,175 @@ // $Id$ +#include "orbsvcs/ESF/ESF_Proxy_Collection.h" #include "Notify_ConsumerAdmin_i.h" #include "Notify_ProxyPushSupplier_i.h" #include "Notify_StructuredProxyPushSupplier_i.h" #include "Notify_SequenceProxyPushSupplier_i.h" #include "Notify_EventChannel_i.h" -#include "Notify_Resource_Manager.h" #include "Notify_Event_Manager.h" +#include "Notify_Channel_Objects_Factory.h" +#include "Notify_POA_Factory.h" +#include "Notify_Event_Manager_Objects_Factory.h" +#include "Notify_Collection_Factory.h" +#include "Notify_Factory.h" +#include "Notify_Listener_Filter_Eval_Command.h" +#include "Notify_Worker_Task.h" +#include "Notify_Event_Dispatch_Command.h" +#include "Notify_Event_Processor.h" ACE_RCSID(Notify, Notify_ConsumerAdmin_i, "$Id$") // Implementation skeleton constructor -TAO_Notify_ConsumerAdmin_i::TAO_Notify_ConsumerAdmin_i (TAO_Notify_EventChannel_i* myChannel, TAO_Notify_Resource_Manager* resource_manager) - :my_channel_ (myChannel), - resource_manager_ (resource_manager), - event_manager_ (myChannel->get_event_manager ()), - is_destroyed_ (0) -{ - // No-Op. +TAO_Notify_ConsumerAdmin_i::TAO_Notify_ConsumerAdmin_i (TAO_Notify_EventChannel_i* event_channel) + :lock_ (0), + refcount_ (1), + destory_child_POAs_ (0), + event_channel_ (event_channel), + channel_objects_factory_ (TAO_Notify_Factory::get_channel_objects_factory ()), + poa_factory_ (TAO_Notify_Factory::get_poa_factory ()), + event_manager_objects_factory_ (TAO_Notify_Factory::get_event_manager_objects_factory ()), + collection_factory_ (TAO_Notify_Factory::get_collection_factory ()), + event_manager_ (event_channel->get_event_manager ()), + event_listener_list_ (0), + filter_eval_task_ (0), + dispatching_task_ (0) +{ + event_channel_->_add_ref (); // we don't want our parent to go away! } // Implementation skeleton destructor TAO_Notify_ConsumerAdmin_i::~TAO_Notify_ConsumerAdmin_i (void) { - /* ACE_DEBUG ((LM_DEBUG,"in CA %d dtor\n", this->myID_)); */ - this->cleanup_i (); - this->my_channel_->consumer_admin_destroyed (this->myID_); + ACE_DEBUG ((LM_DEBUG,"in CA %d dtor\n", this->my_id_)); + + ACE_DECLARE_NEW_CORBA_ENV; + + delete this->lock_; + + delete this->event_listener_list_; + + this->event_channel_->consumer_admin_destroyed (this->my_id_); + event_channel_->_remove_ref (); +} + +CORBA::ULong +TAO_Notify_ConsumerAdmin_i::_incr_refcnt (void) +{ + ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); + return this->refcount_++; +} + +CORBA::ULong +TAO_Notify_ConsumerAdmin_i::_decr_refcnt (void) +{ + { + ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); + this->refcount_--; + if (this->refcount_ != 0) + return this->refcount_; + } + + delete this; + return 0; +} + +void +TAO_Notify_ConsumerAdmin_i::_add_ref (CORBA_Environment &/*ACE_TRY_ENV*/) +{ + this->_incr_refcnt (); +} + +void +TAO_Notify_ConsumerAdmin_i::_remove_ref (CORBA_Environment &/*ACE_TRY_ENV*/) +{ + this->_decr_refcnt (); +} + +void +TAO_Notify_ConsumerAdmin_i::dispatch_event (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV) +{ + // Dispatch the event to all the registered listeners. + TAO_Notify_Dispatch_Command_Worker worker (&event, this->dispatching_task_); + // Propogate the filter command. + + this->event_listener_list_->for_each (&worker, ACE_TRY_ENV); +} + +CORBA::Boolean +TAO_Notify_ConsumerAdmin_i::evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean /*eval_parent*/, CORBA::Environment &ACE_TRY_ENV) +{ + CORBA::Boolean bval = + this->get_filter_admin ().match (event, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + if ((bval == 1 && this->filter_operator_ == CosNotifyChannelAdmin::AND_OP) || + (bval == 0 && this->filter_operator_ == CosNotifyChannelAdmin::OR_OP)) + { + // If the filter operator requires that each listener attached to this admin be evaluated, + // we feed the listeners to the "listener filter evaluation" task. + + TAO_Notify_Filter_Command_Worker worker (&event, this->filter_eval_task_, 0); + // note the last param. we ask that the parent filter *not* be evaluated again + // because we've done it here. + + this->event_listener_list_->for_each (&worker, ACE_TRY_ENV); + // Propogate the filter command. + + return 0; + } + else if (bval == 1 && this->filter_operator_ == CosNotifyChannelAdmin::OR_OP) + { + // no need to check any of the children. happy dispatching! + return 1; + + // OR we could instead do: + // + // this->dispatch_event (event, ACE_TRY_ENV); + // return 0; + // + // This will short circuit a few steps, because the event processor is going to + // turn around and create a dispatching command object to call dispatch_event. + // My $.02 worth optimization fetish! + // but we'll give in favour of consistency ;) + } + + return 0; // in all [other] cases, return false. } void TAO_Notify_ConsumerAdmin_i::proxy_pushsupplier_destroyed (CosNotifyChannelAdmin::ProxyID proxyID) { + ACE_GUARD (ACE_Lock, ace_mon, *this->lock_); + this->proxy_pushsupplier_ids_.put (proxyID); } void -TAO_Notify_ConsumerAdmin_i::init (CosNotifyChannelAdmin::AdminID myID, - CosNotifyChannelAdmin::InterFilterGroupOperator myOperator, +TAO_Notify_ConsumerAdmin_i::init (CosNotifyChannelAdmin::AdminID my_id, + CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator, PortableServer::POA_ptr my_POA, CORBA::Environment &ACE_TRY_ENV) { my_POA_ = PortableServer::POA::_duplicate (my_POA); - this->proxy_pushsupplier_POA_ = this->resource_manager_-> - create_proxy_pushsupplier_POA (this->my_POA_.in (), myID, ACE_TRY_ENV); + this->lock_ = + this->channel_objects_factory_->create_consumer_admin_lock (ACE_TRY_ENV); + ACE_CHECK; + + this->proxy_pushsupplier_POA_ = this->poa_factory_-> + create_proxy_pushsupplier_POA (this->my_POA_.in (), my_id, + ACE_TRY_ENV); ACE_CHECK; - this->myID_ = myID; - this->myOperator_ = myOperator; + this->my_id_ = my_id; + this->filter_operator_ = filter_operator; + + this->event_listener_list_ = + this->collection_factory_->create_event_listener_list (ACE_TRY_ENV); + + // Save the task to forward filtering/dispatching commands to: + this->filter_eval_task_ = this->event_manager_->event_processor ()->get_listener_filter_eval_task (); + this->dispatching_task_ = this->event_manager_->event_processor ()->get_dispatching_task (); // Initially we set up things so that all listeners are subscribed for // all the events so that things "work" even if we don't twiddle with @@ -55,13 +177,48 @@ TAO_Notify_ConsumerAdmin_i::init (CosNotifyChannelAdmin::AdminID myID, // up subscriptions, we must remove the special event type otherwise we // will get the same event twice! // check with the resource manager if this option is enabled. - if (this->resource_manager_->default_subscription_enabled () == 1) - { + //if (this->resource_manager_->default_subscription_enabled () == 1) + /* { TAO_Notify_EventType& special_type = TAO_Notify_EventType::special_event_type (); this->subscription_list_.insert (special_type); } + */ +} + +void +TAO_Notify_ConsumerAdmin_i::destroy_i (CORBA::Environment &ACE_TRY_ENV) +{ + CosNotification::EventTypeSeq removed; + + CosNotification::EventTypeSeq added (0); + added.length (0); + + // unsubscribe it to our current subscriptions. + removed.length (this->subscription_list_.size ()); + + this->subscription_list_.populate (removed); + + this->event_manager_->subscribe_for_events (this, + added, removed, ACE_TRY_ENV); + ACE_CHECK; + + // deactivate ourselves + this->poa_factory_->deactivate_object (this, this->my_POA_.in (), + ACE_TRY_ENV); + + // shutdown proxy's. + TAO_Notify_Shutdown_Worker shutdown_worker; + + this->event_listener_list_->for_each (&shutdown_worker, ACE_TRY_ENV); + ACE_CHECK; + + this->event_listener_list_->shutdown (ACE_TRY_ENV); + + this->poa_factory_->destroy_POA (this->proxy_pushsupplier_POA_.in (), + ACE_TRY_ENV); + ACE_CHECK; } void @@ -70,15 +227,17 @@ TAO_Notify_ConsumerAdmin_i::destroy (CORBA::Environment &ACE_TRY_ENV) CORBA::SystemException )) { - this->is_destroyed_ = 1; - - this->resource_manager_->destroy_POA (this->proxy_pushsupplier_POA_.in (), - ACE_TRY_ENV); + // unregister from EC + this->event_channel_->unregister_listener (this, ACE_TRY_ENV); ACE_CHECK; - // deactivate ourselves - this->resource_manager_->deactivate_object (this, this->my_POA_.in (), - ACE_TRY_ENV); + this->destroy_i (ACE_TRY_ENV); +} + +void +TAO_Notify_ConsumerAdmin_i::shutdown (CORBA::Environment &ACE_TRY_ENV) +{ + this->destroy_i (ACE_TRY_ENV); } void @@ -88,15 +247,24 @@ TAO_Notify_ConsumerAdmin_i::subscription_change (const CosNotification::EventTyp CosNotifyComm::InvalidEventType )) { - this->event_manager_->subscribe_for_events (this->event_listener_list_, - &this->subscription_list_, + this->event_manager_->subscribe_for_events (this, //*this->event_listener_list_, added, removed, ACE_TRY_ENV); + + { + ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, + CORBA::INTERNAL ()); + ACE_CHECK; + + // simply update our subscription list. + this->subscription_list_.insert_seq (added); + this->subscription_list_.remove_seq (removed); + } } CosNotifyChannelAdmin::ConsumerAdmin_ptr TAO_Notify_ConsumerAdmin_i::get_ref (CORBA::Environment &ACE_TRY_ENV) { - CORBA::Object_var obj = this->resource_manager_-> + CORBA::Object_var obj = this->poa_factory_-> servant_to_reference (this->my_POA_.in (), this, ACE_TRY_ENV); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ()); @@ -121,65 +289,21 @@ void TAO_Notify_ConsumerAdmin_i::register_listener (TAO_Notify_EventListener *listener, CORBA::Environment &ACE_TRY_ENV) { // register it. - this->event_listener_list_.insert (listener); - - // subscribe it to our current subscriptions. - CosNotification::EventTypeSeq added (this->subscription_list_.size ()); - CosNotification::EventTypeSeq removed (0); - - added.length (this->subscription_list_.size ()); - removed.length (0); - - // copy value to the added list. - TAO_Notify_EventType_List::ITERATOR iter (this->subscription_list_); - TAO_Notify_EventType* event_type; - - CORBA::ULong i = 0; - for (iter.first (); iter.next (event_type); iter.advance (), ++i) - added[i] = event_type->get_native (); - - this->event_manager_->subscribe_for_events (listener, - 0, - added, removed, ACE_TRY_ENV); + this->event_listener_list_->connected (listener, ACE_TRY_ENV); + ACE_CHECK; } void TAO_Notify_ConsumerAdmin_i::unregister_listener (TAO_Notify_EventListener *listener, CORBA::Environment &ACE_TRY_ENV) { - this->event_listener_list_.remove (listener); - - // unsubscribe it to our current subscriptions. - CosNotification::EventTypeSeq added (0); - CosNotification::EventTypeSeq removed (this->subscription_list_.size ()); - - removed.length (this->subscription_list_.size ()); - added.length (0); - - // copy value to the added list. - TAO_Notify_EventType_List::ITERATOR iter (this->subscription_list_); - TAO_Notify_EventType* event_type; - - CORBA::ULong i = 0; - for (iter.first (); iter.next (event_type); iter.advance (), ++i) - removed[i] = event_type->get_native (); - - this->event_manager_->subscribe_for_events (listener, - 0, - added, removed, ACE_TRY_ENV); -} - -void -TAO_Notify_ConsumerAdmin_i::cleanup_i (CORBA::Environment &/*ACE_TRY_ENV*/) -{ - // Cleanup all resources.. - this->proxy_pushsupplier_POA_ = PortableServer::POA::_nil (); - this->my_POA_ = PortableServer::POA::_nil (); + this->event_listener_list_->disconnected (listener, ACE_TRY_ENV); + ACE_CHECK; } void TAO_Notify_ConsumerAdmin_i::deactivate_proxy_pushsupplier (PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV) { - this->resource_manager_-> + this->poa_factory_-> deactivate_object (servant, this->proxy_pushsupplier_POA_.in (), ACE_TRY_ENV); } @@ -190,7 +314,7 @@ TAO_Notify_ConsumerAdmin_i::MyID (CORBA::Environment &/*ACE_TRY_ENV*/) CORBA::SystemException )) { - return myID_; + return my_id_; } CosNotifyChannelAdmin::EventChannel_ptr @@ -199,7 +323,7 @@ TAO_Notify_ConsumerAdmin_i::MyChannel (CORBA::Environment &ACE_TRY_ENV) CORBA::SystemException )) { - return my_channel_->get_ref (ACE_TRY_ENV); + return event_channel_->get_ref (ACE_TRY_ENV); } CosNotifyChannelAdmin::InterFilterGroupOperator @@ -208,54 +332,7 @@ TAO_Notify_ConsumerAdmin_i::MyOperator (CORBA::Environment &/*ACE_TRY_ENV*/) CORBA::SystemException )) { - return myOperator_; -} - -CosNotifyFilter::MappingFilter_ptr -TAO_Notify_ConsumerAdmin_i::priority_filter (CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), - CosNotifyFilter::MappingFilter::_nil ()); -} - -void -TAO_Notify_ConsumerAdmin_i::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/, CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - ACE_THROW (CORBA::NO_IMPLEMENT ()); -} - -CosNotifyFilter::MappingFilter_ptr -TAO_Notify_ConsumerAdmin_i::lifetime_filter (CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), - CosNotifyFilter::MappingFilter::_nil ()); -} - -void -TAO_Notify_ConsumerAdmin_i::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/, CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - ACE_THROW (CORBA::NO_IMPLEMENT ()); -} - -CosNotifyChannelAdmin::ProxyIDSeq* -TAO_Notify_ConsumerAdmin_i::pull_suppliers (CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); + return filter_operator_; } CosNotifyChannelAdmin::ProxyIDSeq* @@ -275,31 +352,20 @@ TAO_Notify_ConsumerAdmin_i::get_proxy_supplier (CosNotifyChannelAdmin::ProxyID p )) { CORBA::Object_var obj = - this->resource_manager_->id_to_reference (proxy_id, - proxy_pushsupplier_POA_.in (), - ACE_TRY_ENV); + this->poa_factory_->id_to_reference (proxy_id, + proxy_pushsupplier_POA_.in (), + ACE_TRY_ENV); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxySupplier::_nil ()); return CosNotifyChannelAdmin::ProxySupplier::_narrow (obj.in ()); } -CosNotifyChannelAdmin::ProxySupplier_ptr -TAO_Notify_ConsumerAdmin_i::obtain_notification_pull_supplier (CosNotifyChannelAdmin::ClientType /*ctype*/, CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/, CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyChannelAdmin::AdminLimitExceeded - )) -{ - ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), - CosNotifyChannelAdmin::ProxySupplier::_nil ()); -} - CORBA::Object_ptr TAO_Notify_ConsumerAdmin_i::obtain_struct_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV) { TAO_Notify_StructuredProxyPushSupplier_i* struct_proxy_pushsupplier = - this->resource_manager_->create_struct_proxy_pushsupplier (this, - ACE_TRY_ENV); + this->channel_objects_factory_->create_struct_proxy_pushsupplier (this, + ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::Object::_nil ()); PortableServer::ServantBase_var proxy_pushsupplier_var (struct_proxy_pushsupplier); @@ -307,7 +373,7 @@ TAO_Notify_ConsumerAdmin_i::obtain_struct_proxy_pushsupplier_i (CosNotifyChannel struct_proxy_pushsupplier->init (proxy_id, ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::Object::_nil ()); - return this->resource_manager_-> + return this->poa_factory_-> activate_object_with_id (proxy_id, this->proxy_pushsupplier_POA_.in (), struct_proxy_pushsupplier, @@ -318,8 +384,8 @@ CORBA::Object_ptr TAO_Notify_ConsumerAdmin_i::obtain_sequence_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV) { TAO_Notify_SequenceProxyPushSupplier_i* seq_proxy_pushsupplier = - this->resource_manager_->create_seq_proxy_pushsupplier (this, - ACE_TRY_ENV); + this->channel_objects_factory_->create_seq_proxy_pushsupplier (this, + ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::Object::_nil ()); PortableServer::ServantBase_var proxy_pushsupplier_var (seq_proxy_pushsupplier); @@ -327,7 +393,7 @@ TAO_Notify_ConsumerAdmin_i::obtain_sequence_proxy_pushsupplier_i (CosNotifyChann seq_proxy_pushsupplier->init (proxy_id, ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::Object::_nil ()); - return this->resource_manager_-> + return this->poa_factory_-> activate_object_with_id (proxy_id, this->proxy_pushsupplier_POA_.in (), seq_proxy_pushsupplier, @@ -338,7 +404,7 @@ CORBA::Object_ptr TAO_Notify_ConsumerAdmin_i::obtain_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV) { TAO_Notify_ProxyPushSupplier_i* proxy_pushsupplier = - this->resource_manager_->create_proxy_pushsupplier (this, ACE_TRY_ENV); + this->channel_objects_factory_->create_proxy_pushsupplier (this, ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::Object::_nil ()); PortableServer::ServantBase_var proxy_pushsupplier_var (proxy_pushsupplier); @@ -346,7 +412,7 @@ TAO_Notify_ConsumerAdmin_i::obtain_proxy_pushsupplier_i (CosNotifyChannelAdmin:: proxy_pushsupplier->init (proxy_id, ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::Object::_nil ()); - return this->resource_manager_-> + return this->poa_factory_-> activate_object_with_id (proxy_id, this->proxy_pushsupplier_POA_.in (), proxy_pushsupplier, @@ -362,37 +428,54 @@ TAO_Notify_ConsumerAdmin_i::obtain_notification_push_supplier (CosNotifyChannelA { CORBA::Object_var obj; - proxy_id = this->proxy_pushsupplier_ids_.get (); + { + ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, + CORBA::INTERNAL ()); + ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxySupplier::_nil ()); - switch (ctype) + proxy_id = this->proxy_pushsupplier_ids_.get (); + this->proxy_pushsupplier_ids_.next (); + } + + ACE_TRY { - case CosNotifyChannelAdmin::ANY_EVENT: - { - obj = this->obtain_proxy_pushsupplier_i (proxy_id, ACE_TRY_ENV); - ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxySupplier::_nil ()); - } - break; - case CosNotifyChannelAdmin::STRUCTURED_EVENT: - { - obj = this->obtain_struct_proxy_pushsupplier_i (proxy_id, ACE_TRY_ENV); - ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxySupplier::_nil ()); - } - break; - - case CosNotifyChannelAdmin::SEQUENCE_EVENT: - { - obj = this->obtain_sequence_proxy_pushsupplier_i (proxy_id, - ACE_TRY_ENV); - ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxySupplier::_nil ()); - } - break; - - default: - ACE_THROW_RETURN (CORBA::BAD_PARAM (), - CosNotifyChannelAdmin::ProxySupplier::_nil ()); + switch (ctype) + { + case CosNotifyChannelAdmin::ANY_EVENT: + { + obj = this->obtain_proxy_pushsupplier_i (proxy_id, ACE_TRY_ENV); + ACE_TRY_CHECK; + } + break; + case CosNotifyChannelAdmin::STRUCTURED_EVENT: + { + obj = this->obtain_struct_proxy_pushsupplier_i (proxy_id, ACE_TRY_ENV); + ACE_TRY_CHECK; + } + break; + + case CosNotifyChannelAdmin::SEQUENCE_EVENT: + { + obj = this->obtain_sequence_proxy_pushsupplier_i (proxy_id, + ACE_TRY_ENV); + ACE_TRY_CHECK; + } + break; + + default: + ACE_THROW_RETURN (CORBA::BAD_PARAM (), + CosNotifyChannelAdmin::ProxySupplier::_nil ()); + } + + // this->proxy_pushsupplier_ids_.next (); } - - this->proxy_pushsupplier_ids_.next (); + ACE_CATCHALL + { + this->proxy_pushsupplier_ids_.put (proxy_id); + ACE_RE_THROW; + } + ACE_ENDTRY; + ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxySupplier::_nil ()); return CosNotifyChannelAdmin::ProxySupplier::_narrow (obj.in (), ACE_TRY_ENV); @@ -483,7 +566,7 @@ TAO_Notify_ConsumerAdmin_i::obtain_push_supplier (CORBA::Environment &ACE_TRY_EN TAO_Notify_CosEC_ProxyPushSupplier_i* cosec_proxy; ACE_NEW_THROW_EX (cosec_proxy, - TAO_Notify_CosEC_ProxyPushSupplier_i (this, this->resource_manager_), + TAO_Notify_CosEC_ProxyPushSupplier_i (this), CORBA::NO_MEMORY ()); PortableServer::ServantBase_var proxy_var (cosec_proxy); @@ -492,15 +575,26 @@ TAO_Notify_ConsumerAdmin_i::obtain_push_supplier (CORBA::Environment &ACE_TRY_EN ACE_CHECK_RETURN (CosEventChannelAdmin::ProxyPushSupplier::_nil ()); PortableServer::POA_var def_poa = - this->resource_manager_->get_default_POA (); + this->event_channel_->get_default_POA (); - CORBA::Object_var obj = this->resource_manager_-> + CORBA::Object_var obj = this->poa_factory_-> activate_object (def_poa.in (), cosec_proxy, ACE_TRY_ENV); ACE_CHECK_RETURN (CosEventChannelAdmin::ProxyPushSupplier::_nil ()); return CosEventChannelAdmin::ProxyPushSupplier::_narrow (obj.in ()); } +CosNotifyChannelAdmin::ProxySupplier_ptr +TAO_Notify_ConsumerAdmin_i::obtain_notification_pull_supplier (CosNotifyChannelAdmin::ClientType /*ctype*/, CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC (( + CORBA::SystemException, + CosNotifyChannelAdmin::AdminLimitExceeded + )) +{ + ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), + CosNotifyChannelAdmin::ProxySupplier::_nil ()); +} + CosEventChannelAdmin::ProxyPullSupplier_ptr TAO_Notify_ConsumerAdmin_i::obtain_pull_supplier (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC (( @@ -510,3 +604,92 @@ TAO_Notify_ConsumerAdmin_i::obtain_pull_supplier (CORBA::Environment &ACE_TRY_EN ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CosEventChannelAdmin::ProxyPullSupplier::_nil ()); } + + +CosNotifyFilter::MappingFilter_ptr +TAO_Notify_ConsumerAdmin_i::priority_filter (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC (( + CORBA::SystemException + )) +{ + ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), + CosNotifyFilter::MappingFilter::_nil ()); +} + +void +TAO_Notify_ConsumerAdmin_i::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC (( + CORBA::SystemException + )) +{ + ACE_THROW (CORBA::NO_IMPLEMENT ()); +} + +CosNotifyFilter::MappingFilter_ptr +TAO_Notify_ConsumerAdmin_i::lifetime_filter (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC (( + CORBA::SystemException + )) +{ + ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), + CosNotifyFilter::MappingFilter::_nil ()); +} + +void +TAO_Notify_ConsumerAdmin_i::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC (( + CORBA::SystemException + )) +{ + ACE_THROW (CORBA::NO_IMPLEMENT ()); +} + +CosNotifyChannelAdmin::ProxyIDSeq* +TAO_Notify_ConsumerAdmin_i::pull_suppliers (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC (( + CORBA::SystemException + )) +{ + ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); +} + +/****************************************************************************************************/ + +TAO_Notify_Filter_Command_Worker::TAO_Notify_Filter_Command_Worker (TAO_Notify_Event* event, TAO_Notify_Worker_Task* task, CORBA::Boolean eval_parent) + :event_ (event), + task_ (task), + eval_parent_ (eval_parent) +{ +} + +void +TAO_Notify_Filter_Command_Worker::work (TAO_Notify_EventListener* event_listener, CORBA::Environment &ACE_TRY_ENV) +{ + TAO_Notify_Listener_Filter_Eval_Command* mb = + new TAO_Notify_Listener_Filter_Eval_Command (this->event_, event_listener, this->eval_parent_); + + this->task_->process_event (mb, ACE_TRY_ENV); +} + +/****************************************************************************************************/ + +TAO_Notify_Dispatch_Command_Worker::TAO_Notify_Dispatch_Command_Worker (TAO_Notify_Event* event, TAO_Notify_Worker_Task* task) + :event_ (event), + task_ (task) +{ +} + +TAO_Notify_Dispatch_Command_Worker::~TAO_Notify_Dispatch_Command_Worker () +{ +} + +void +TAO_Notify_Dispatch_Command_Worker::work (TAO_Notify_EventListener* event_listener, CORBA::Environment &ACE_TRY_ENV) +{ + TAO_Notify_Event_Dispatch_Command* dispatch = + new TAO_Notify_Event_Dispatch_Command (this->event_, event_listener); + + task_->process_event (dispatch, ACE_TRY_ENV); +} + +/****************************************************************************************************/ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.h index 227408eadf4..ecf3798a097 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.h @@ -26,13 +26,18 @@ #include "Notify_ID_Pool_T.h" #include "Notify_QoSAdmin_i.h" #include "Notify_FilterAdmin_i.h" -#include "Notify_Types.h" +#include "Notify_Event.h" #include "Notify_Listeners.h" +#include "Notify_Collection.h" #include "notify_export.h" class TAO_Notify_EventChannel_i; -class TAO_Notify_Resource_Manager; class TAO_Notify_Event_Manager; +class TAO_Notify_CO_Factory; +class TAO_Notify_POA_Factory; +class TAO_Notify_EMO_Factory; +class TAO_Notify_Collection_Factory; +class TAO_Notify_Worker_Task; #if defined(_MSC_VER) #if (_MSC_VER >= 1200) @@ -41,7 +46,7 @@ class TAO_Notify_Event_Manager; #pragma warning(disable:4250) #endif /* _MSC_VER */ -class TAO_Notify_Export TAO_Notify_ConsumerAdmin_i : public POA_CosNotifyChannelAdmin::ConsumerAdmin, public PortableServer::RefCountServantBase +class TAO_Notify_Export TAO_Notify_ConsumerAdmin_i : public TAO_Notify_EventListener, public POA_CosNotifyChannelAdmin::ConsumerAdmin, public PortableServer::RefCountServantBase { // = TITLE // TAO_Notify_ConsumerAdmin_i @@ -51,13 +56,32 @@ class TAO_Notify_Export TAO_Notify_ConsumerAdmin_i : public POA_CosNotifyChannel // public: - TAO_Notify_ConsumerAdmin_i (TAO_Notify_EventChannel_i* myChannel, TAO_Notify_Resource_Manager* resource_manager); + TAO_Notify_ConsumerAdmin_i (TAO_Notify_EventChannel_i* myChannel); // Constructor // <myChannel> is this objects parent. virtual ~TAO_Notify_ConsumerAdmin_i (void); // Destructor + // = TAO_Notify_RefCounted + virtual CORBA::ULong _incr_refcnt (void); + virtual CORBA::ULong _decr_refcnt (void); + + // = The Servant methods + virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV); + virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV); + + //= TAO_Notify_EventListener methods + virtual void dispatch_event (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV); + // Callback methods to supply the event to the listener. + + virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean eval_parent, CORBA::Environment &ACE_TRY_ENV); + // Evaluates true if this event is acceptable by the listener. + + virtual void shutdown (CORBA::Environment &ACE_TRY_ENV); + // Ask the listener to relinqish any bindings and prepare to be disposed. + + //= Admin Methods. void init (CosNotifyChannelAdmin::AdminID myID, CosNotifyChannelAdmin::InterFilterGroupOperator myOperator, PortableServer::POA_ptr my_POA, @@ -80,7 +104,7 @@ class TAO_Notify_Export TAO_Notify_ConsumerAdmin_i : public POA_CosNotifyChannel // Register with parent for subscription updates. void unregister_listener (TAO_Notify_EventListener *listener, CORBA::Environment &ACE_TRY_ENV); - // Unregister with parent for subscription updates. + // Unregister with parent from subscription updates. void proxy_pushsupplier_destroyed (CosNotifyChannelAdmin::ProxyID proxyID); // This id is no longer in use.It can be reused by <proxy_pushsupplier_ids_> @@ -278,9 +302,9 @@ virtual CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier ( )); protected: -// = Helper methods - void cleanup_i (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); - // Cleanup all resources used by this object. + // = Helper methods + void destroy_i (CORBA::Environment &ACE_TRY_ENV); + // Destroy CA CORBA::Object_ptr obtain_struct_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV); // Obtain a proxy pushsupplier object @@ -292,48 +316,115 @@ virtual CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier ( // Obtain a sequence proxy pushsupplier object. // = Data members - TAO_Notify_EventChannel_i* my_channel_; - // The channel to which we belong. + ACE_Lock* lock_; + // The locking strategy. + + CORBA::ULong refcount_; + // The reference count. + + CORBA::Boolean destory_child_POAs_; + // Flag to tell if the child poa's should be destroyed. + + TAO_Notify_EventChannel_i* event_channel_; + // The channel to which we belong. + + TAO_Notify_CO_Factory* channel_objects_factory_; + // The factory for channel objects. - TAO_Notify_Resource_Manager* resource_manager_; - // The resource factory that we use. + TAO_Notify_POA_Factory* poa_factory_; + // The factory for POA based containers. - TAO_Notify_Event_Manager* event_manager_; - // The event manager to use. + TAO_Notify_EMO_Factory* event_manager_objects_factory_; + // Event manager objects factory, - CosNotifyChannelAdmin::InterFilterGroupOperator myOperator_; - // The inter filter operator to use. + TAO_Notify_Collection_Factory* collection_factory_; + // Collection objects factory - CosNotifyChannelAdmin::AdminID myID_; - // My ID. + TAO_Notify_Event_Manager* event_manager_; + // The event manager to use. - PortableServer::POA_var my_POA_; - // The POA in which we live. + CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator_; + // The inter filter operator to use. - PortableServer::POA_var proxy_pushsupplier_POA_; - // The POA in which all our push suppliers live. - // We create and own this POA. + CosNotifyChannelAdmin::AdminID my_id_; + // My ID. - TAO_Notify_EventType_List subscription_list_; - // The list of event types that all our interested in receiving. + PortableServer::POA_var my_POA_; + // The POA in which we live. - TAO_Notify_EventListener_List event_listener_list_; - // The list of event listeners that have registered with us + PortableServer::POA_var proxy_pushsupplier_POA_; + // The POA in which all our push suppliers live. + // We create and own this POA. - TAO_Notify_ID_Pool_Ex<CosNotifyChannelAdmin::ProxyID, - CosNotifyChannelAdmin::ProxyIDSeq> proxy_pushsupplier_ids_; - // Id generator for proxy push suppliers. + TAO_Notify_EventType_List subscription_list_; + // The list of event types that all our proxys are interested in receiving. - CORBA::Boolean is_destroyed_; - // Are we dead? + TAO_Notify_EventListener_List* event_listener_list_; + // The list of event listeners that have registered with us - TAO_Notify_QoSAdmin_i qos_admin_; - // Handle QoS admin methods. + TAO_Notify_ID_Pool_Ex<CosNotifyChannelAdmin::ProxyID, + CosNotifyChannelAdmin::ProxyIDSeq> proxy_pushsupplier_ids_; + // Id generator for proxy push suppliers. + + TAO_Notify_QoSAdmin_i qos_admin_; + // Handle QoS admin methods. TAO_Notify_FilterAdmin_i filter_admin_; // Handles the Filter Admin methods. + + TAO_Notify_Worker_Task* filter_eval_task_; + // The task to forward filter evaluation commands to. + + TAO_Notify_Worker_Task* dispatching_task_; + // The task to forward event dispatching commands to. }; +/****************************************************************************************************/ + +class TAO_Notify_Export TAO_Notify_Filter_Command_Worker : public TAO_ESF_Worker<TAO_Notify_EventListener> +{ + // = TITLE + // TAO_Notify_Filter_Command_Worker + // + // = DESCRIPTION + // Enqueue each listener for the filter evaluation command. + // +public: + TAO_Notify_Filter_Command_Worker (TAO_Notify_Event* event, TAO_Notify_Worker_Task* task, CORBA::Boolean eval_parent); + + // = TAO_ESF_Worker method + void work (TAO_Notify_EventListener* listener, CORBA::Environment &ACE_TRY_ENV); + +protected: + TAO_Notify_Event* event_; + TAO_Notify_Worker_Task* task_; + CORBA::Boolean eval_parent_; +}; + +/****************************************************************************************************/ + +class TAO_Notify_Export TAO_Notify_Dispatch_Command_Worker : public TAO_ESF_Worker<TAO_Notify_EventListener> +{ + // = TITLE + // TAO_Notify_Dispatch_Command_Worker + // + // = DESCRIPTION + // Worker to invoke the dispatch command for each member of the collection. + // +public: + TAO_Notify_Dispatch_Command_Worker (TAO_Notify_Event* event, TAO_Notify_Worker_Task* task); + ~TAO_Notify_Dispatch_Command_Worker (); + + // = TAO_ESF_Worker method + void work (TAO_Notify_EventListener* listener, CORBA::Environment &ACE_TRY_ENV); + +protected: + TAO_Notify_Event* event_; + TAO_Notify_Worker_Task* task_; +}; + +/****************************************************************************************************/ + #if defined(_MSC_VER) && (_MSC_VER >= 1200) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp new file mode 100644 index 00000000000..d4a44a0727a --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp @@ -0,0 +1,210 @@ +// $Id$ + +#include "Notify_Default_CO_Factory.h" +#include "Notify_Factory.h" +#include "Notify_EventChannelFactory_i.h" +#include "Notify_EventChannel_i.h" +#include "Notify_Event_Manager.h" +#include "Notify_FilterFactory_i.h" +#include "Notify_ConsumerAdmin_i.h" +#include "Notify_SupplierAdmin_i.h" +#include "Notify_StructuredProxyPushSupplier_i.h" +#include "Notify_SequenceProxyPushSupplier_i.h" +#include "Notify_ProxyPushSupplier_i.h" +#include "Notify_StructuredProxyPushConsumer_i.h" +#include "Notify_SequenceProxyPushConsumer_i.h" +#include "Notify_ProxyPushConsumer_i.h" + +ACE_RCSID(Notify, Notify_Default_CO_Factory, "$Id$") + +int +TAO_Notify_Default_CO_Factory::init_svc (void) +{ + return ACE_Service_Config::static_svcs ()-> + insert (&ace_svc_desc_TAO_Notify_Default_CO_Factory); +} + +TAO_Notify_Default_CO_Factory::TAO_Notify_Default_CO_Factory (void) +{ +} + +TAO_Notify_Default_CO_Factory::~TAO_Notify_Default_CO_Factory () +{ +} + +int +TAO_Notify_Default_CO_Factory::init (int /*argc*/, char* /*argv*/[]) +{ + return 0; +} + +int +TAO_Notify_Default_CO_Factory::fini (void) +{ + return 0; +} + + +TAO_Notify_EventChannel_i* +TAO_Notify_Default_CO_Factory::create_event_channel (TAO_Notify_EventChannelFactory_i* parent, CORBA::Environment &ACE_TRY_ENV) +{ + TAO_Notify_EventChannel_i* channel; + ACE_NEW_THROW_EX (channel, + TAO_Notify_EventChannel_i (parent), + CORBA::NO_MEMORY ()); + return channel; +} + +TAO_Notify_ConsumerAdmin_i* +TAO_Notify_Default_CO_Factory::create_consumer_admin (TAO_Notify_EventChannel_i* event_channel, + CORBA::Environment &ACE_TRY_ENV) +{ + TAO_Notify_ConsumerAdmin_i* consumer_admin_i; + ACE_NEW_THROW_EX (consumer_admin_i, + TAO_Notify_ConsumerAdmin_i (event_channel), + CORBA::NO_MEMORY ()); + return consumer_admin_i; +} + +TAO_Notify_SupplierAdmin_i* +TAO_Notify_Default_CO_Factory::create_supplier_admin (TAO_Notify_EventChannel_i* event_channel, + CORBA::Environment &ACE_TRY_ENV) +{ + TAO_Notify_SupplierAdmin_i* supplier_admin_i; + + ACE_NEW_THROW_EX (supplier_admin_i, + TAO_Notify_SupplierAdmin_i (event_channel), + CORBA::NO_MEMORY ()); + return supplier_admin_i; +} + + +TAO_Notify_FilterFactory_i* +TAO_Notify_Default_CO_Factory::create_filter_factory (CORBA::Environment &ACE_TRY_ENV) +{ + TAO_Notify_FilterFactory_i* filterfactory; + ACE_NEW_THROW_EX (filterfactory, + TAO_Notify_FilterFactory_i (), + CORBA::NO_MEMORY ()); + return filterfactory; +} + + +TAO_Notify_StructuredProxyPushSupplier_i* +TAO_Notify_Default_CO_Factory::create_struct_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV) +{ + TAO_Notify_StructuredProxyPushSupplier_i* proxy; + ACE_NEW_THROW_EX (proxy, + TAO_Notify_StructuredProxyPushSupplier_i (parent), + CORBA::NO_MEMORY ()); + return proxy; +} + +TAO_Notify_SequenceProxyPushSupplier_i* +TAO_Notify_Default_CO_Factory::create_seq_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV) +{ + TAO_Notify_SequenceProxyPushSupplier_i* proxy; + ACE_NEW_THROW_EX (proxy, + TAO_Notify_SequenceProxyPushSupplier_i (parent), + CORBA::NO_MEMORY ()); + return proxy; +} + +TAO_Notify_ProxyPushSupplier_i* +TAO_Notify_Default_CO_Factory::create_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV) +{ + TAO_Notify_ProxyPushSupplier_i* proxy; + ACE_NEW_THROW_EX (proxy, + TAO_Notify_ProxyPushSupplier_i (parent), + CORBA::NO_MEMORY ()); + return proxy; +} + + +TAO_Notify_StructuredProxyPushConsumer_i* +TAO_Notify_Default_CO_Factory::create_struct_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV) +{ + TAO_Notify_StructuredProxyPushConsumer_i* proxy; + ACE_NEW_THROW_EX (proxy, + TAO_Notify_StructuredProxyPushConsumer_i (parent), + CORBA::NO_MEMORY ()); + return proxy; +} + +TAO_Notify_ProxyPushConsumer_i* +TAO_Notify_Default_CO_Factory::create_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV) +{ + TAO_Notify_ProxyPushConsumer_i* proxy; + ACE_NEW_THROW_EX (proxy, + TAO_Notify_ProxyPushConsumer_i (parent), + CORBA::NO_MEMORY ()); + return proxy; +} + +TAO_Notify_SequenceProxyPushConsumer_i* +TAO_Notify_Default_CO_Factory::create_seq_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV) +{ + TAO_Notify_SequenceProxyPushConsumer_i* proxy; + ACE_NEW_THROW_EX (proxy, + TAO_Notify_SequenceProxyPushConsumer_i (parent), + CORBA::NO_MEMORY ()); + return proxy; +} + + +ACE_Lock* +TAO_Notify_Default_CO_Factory::create_channel_factory_lock (CORBA::Environment &ACE_TRY_ENV) +{ + return create_event_channel_lock (ACE_TRY_ENV); +} + +ACE_Lock* +TAO_Notify_Default_CO_Factory::create_event_channel_lock (CORBA::Environment &ACE_TRY_ENV) +{ + ACE_Lock* lock; + ACE_NEW_THROW_EX (lock, + ACE_Lock_Adapter<ACE_SYNCH_MUTEX> (), + CORBA::NO_MEMORY ()); + return lock; +} + +ACE_Lock* +TAO_Notify_Default_CO_Factory::create_consumer_admin_lock (CORBA::Environment &ACE_TRY_ENV) +{ + // Later: + return create_event_channel_lock (ACE_TRY_ENV); +} + +ACE_Lock* +TAO_Notify_Default_CO_Factory::create_supplier_admin_lock (CORBA::Environment &ACE_TRY_ENV) +{ + // Later: + return create_event_channel_lock (ACE_TRY_ENV); +} + +ACE_Lock* +TAO_Notify_Default_CO_Factory::create_proxy_supplier_lock (CORBA::Environment &ACE_TRY_ENV) +{ + // Later: + return create_event_channel_lock (ACE_TRY_ENV); +} + +ACE_Lock* +TAO_Notify_Default_CO_Factory::create_proxy_consumer_lock (CORBA::Environment &ACE_TRY_ENV) +{ + // Later: + return create_event_channel_lock (ACE_TRY_ENV); +} + + +// **************************************************************** + +ACE_STATIC_SVC_DEFINE (TAO_Notify_Default_CO_Factory, + ACE_TEXT (TAO_NOTIFY_DEF_CO_FACTORY_NAME), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (TAO_Notify_Default_CO_Factory), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0) +ACE_FACTORY_DEFINE (TAO_Notify, TAO_Notify_Default_CO_Factory) + +// **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h new file mode 100644 index 00000000000..c81f837a8c8 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h @@ -0,0 +1,110 @@ +/* -*- C++ -*- */ +// $Id$ +// +// ============================================================================ +// +// = LIBRARY +// ORBSVCS Notification +// +// = FILENAME +// Notify_Default_CO_Factory.h +// +// = DESCRIPTION +// Default factory for channel objects. +// +// = AUTHOR +// Pradeep Gore <pradeep@cs.wustl.edu> +// +// ============================================================================ + +#ifndef NOTIFY_DEFAULT_CO_FACTORY_H +#define NOTIFY_DEFAULT_CO_FACTORY_H + +#include "ace/pre.h" +#include "Notify_Channel_Objects_Factory.h" +#include "notify_export.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +class TAO_Notify_Export TAO_Notify_Default_CO_Factory : public TAO_Notify_CO_Factory +{ + // = TITLE + // TAO_Notify_Default_CO_Factory + // + // = DESCRIPTION + // Default Channel Objects factory + // +public: + TAO_Notify_Default_CO_Factory (void); + ~TAO_Notify_Default_CO_Factory (); + + static int init_svc (void); + // Helper function to register the default factory into the service + // configurator. + + // = The Service_Object entry points + virtual int init (int argc, char* argv[]); + virtual int fini (void); + + // = TAO_Notify_CO_Factory methods + // = Creation methods + TAO_Notify_EventChannel_i* create_event_channel (TAO_Notify_EventChannelFactory_i* parent, CORBA::Environment &ACE_TRY_ENV); + // Create an Event Channel. + + TAO_Notify_ConsumerAdmin_i* create_consumer_admin (TAO_Notify_EventChannel_i* channel, CORBA::Environment &ACE_TRY_ENV); + // Create a Consumer Admin. + + TAO_Notify_SupplierAdmin_i* create_supplier_admin (TAO_Notify_EventChannel_i* channel, CORBA::Environment &ACE_TRY_ENV); + // Create a Supplier Admin. + + TAO_Notify_FilterFactory_i* create_filter_factory (CORBA::Environment &ACE_TRY_ENV); + // Create the Filter Factory. + + // = Proxy Creation methods. + TAO_Notify_StructuredProxyPushSupplier_i* create_struct_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV); + // Create a Structured ProxyPushSupplier. + + TAO_Notify_SequenceProxyPushSupplier_i* create_seq_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV); + // Create a Sequence ProxyPushSupplier. + + TAO_Notify_ProxyPushSupplier_i* create_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV); + // Create a ProxyPushSupplier. + + TAO_Notify_StructuredProxyPushConsumer_i* create_struct_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV); + // Create a Structured ProxyPushConsumer. + + TAO_Notify_SequenceProxyPushConsumer_i* create_seq_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV); + // Create a Sequence ProxyPushConsumer. + + TAO_Notify_ProxyPushConsumer_i* create_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV); + // Create a ProxyPushConsumer. + + //= Locks + // = Methods to create locks. + ACE_Lock* create_channel_factory_lock (CORBA::Environment &ACE_TRY_ENV); + // Create lock type used by channel factory. + + ACE_Lock* create_event_channel_lock (CORBA::Environment &ACE_TRY_ENV); + // Create lock type used by EC's. + + ACE_Lock* create_consumer_admin_lock (CORBA::Environment &ACE_TRY_ENV); + // Create lock type used by Consumer Admin's. + + ACE_Lock* create_supplier_admin_lock (CORBA::Environment &ACE_TRY_ENV); + // Create lock type used by Supplier Admin's. + + ACE_Lock* create_proxy_supplier_lock (CORBA::Environment &ACE_TRY_ENV); + // Create lock type used by proxy supplier. + + ACE_Lock* create_proxy_consumer_lock (CORBA::Environment &ACE_TRY_ENV); + // Create lock type used by proxy consumer. +}; + +ACE_STATIC_SVC_DECLARE (TAO_Notify_Default_CO_Factory) +ACE_FACTORY_DECLARE (TAO_Notify,TAO_Notify_Default_CO_Factory) + +#include "ace/post.h" + +#endif /* NOTIFY_DEFAULT_CO_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp new file mode 100644 index 00000000000..7112efe9dc5 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp @@ -0,0 +1,117 @@ +// $Id$ + +#include "ace/Synch_T.h" +#include "Notify_Default_Collection_Factory.h" +#include "orbsvcs/ESF/ESF_Immediate_Changes.h" +#include "orbsvcs/ESF/ESF_Proxy_List.h" +#include "Notify_Event.h" +#include "Notify_Listeners.h" +#include "Notify_Factory.h" + +ACE_RCSID(Notify, Notify_Default_Collection_Factory, "$Id$") + +typedef TAO_ESF_Proxy_List<TAO_Notify_EventListener>::Iterator TAO_Notify_EventListener_List_Iterator; +typedef TAO_ESF_Proxy_List<TAO_Notify_UpdateListener>::Iterator TAO_Notify_UpdateListener_List_Iterator; + +int +TAO_Notify_Default_Collection_Factory::init_svc (void) +{ + return ACE_Service_Config::static_svcs ()-> + insert (&ace_svc_desc_TAO_Notify_Default_Collection_Factory); +} + +TAO_Notify_Default_Collection_Factory::TAO_Notify_Default_Collection_Factory (void) +{ +} + +TAO_Notify_Default_Collection_Factory::~TAO_Notify_Default_Collection_Factory () +{ +} + +int +TAO_Notify_Default_Collection_Factory::init (int /*argc*/, char* /*argv*/[]) +{ + return 0; +} + +int +TAO_Notify_Default_Collection_Factory::fini (void) +{ + ACE_DEBUG ((LM_DEBUG, "TAO_Notify_Default_Collection_Factory::fini\n")); + return 0; +} + +TAO_Notify_EventListener_List* +TAO_Notify_Default_Collection_Factory::create_event_listener_list (CORBA::Environment &/*ACE_TRY_ENV*/) +{ + TAO_Notify_EventListener_List* listener_list = + new TAO_ESF_Immediate_Changes<TAO_Notify_EventListener, + TAO_ESF_Proxy_List<TAO_Notify_EventListener>, + TAO_Notify_EventListener_List_Iterator, + ACE_SYNCH_MUTEX> (); + + return listener_list; + /*ACE_NEW_THROW_EX (listener_list, + TAO_ESF_Immediate_Changes<TAO_Notify_EventListener, + TAO_ESF_Proxy_List<TAO_Notify_EventListener>, + TAO_Notify_EventListener_List_Iterator, + ACE_SYNCH_MUTEX> (), + CORBA::NO_MEMORY ());*/ + // TODO: create other kinds of lists. +} + +TAO_Notify_UpdateListener_List* +TAO_Notify_Default_Collection_Factory::create_update_listener_list (CORBA::Environment &/*ACE_TRY_ENV*/) +{ + TAO_Notify_UpdateListener_List* listener_list = + new TAO_ESF_Immediate_Changes<TAO_Notify_UpdateListener, + TAO_ESF_Proxy_List<TAO_Notify_UpdateListener>, + TAO_Notify_UpdateListener_List_Iterator, + ACE_SYNCH_MUTEX> (); // ACE_SYNCH_NULL_MUTEX + + return listener_list; +} + +// **************************************************************** + +ACE_STATIC_SVC_DEFINE (TAO_Notify_Default_Collection_Factory, + ACE_TEXT (TAO_NOTIFY_DEF_COLLECTION_FACTORY_NAME), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (TAO_Notify_Default_Collection_Factory), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0) +ACE_FACTORY_DEFINE (TAO_Notify, TAO_Notify_Default_Collection_Factory) + +// **************************************************************** + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +template class TAO_ESF_Worker<TAO_Notify_EventListener>; +template class TAO_ESF_Worker<TAO_Notify_UpdateListener>; + +template class TAO_ESF_Immediate_Changes<TAO_Notify_EventListener, TAO_ESF_Proxy_List<TAO_Notify_EventListener>, ACE_Unbounded_Set_Iterator<TAO_Notify_EventListener *>, ACE_SYNCH_MUTEX>; +template class TAO_ESF_Immediate_Changes<TAO_Notify_UpdateListener, TAO_ESF_Proxy_List<TAO_Notify_UpdateListener>, ACE_Unbounded_Set_Iterator<TAO_Notify_UpdateListener *>, ACE_SYNCH_MUTEX>; +template class TAO_ESF_Immediate_Changes<TAO_Notify_UpdateListener, TAO_ESF_Proxy_List<TAO_Notify_UpdateListener>, ACE_Unbounded_Set_Iterator<TAO_Notify_UpdateListener *>, ACE_Null_Mutex>; + +template class TAO_ESF_Proxy_List<TAO_Notify_EventListener>; +template class TAO_ESF_Proxy_Collection<TAO_Notify_EventListener>; + +template class TAO_ESF_Proxy_List<TAO_Notify_UpdateListener>; +template class TAO_ESF_Proxy_Collection<TAO_Notify_UpdateListener>; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +#pragma instantiate TAO_ESF_Worker<TAO_Notify_EventListener> +#pragma instantiate TAO_ESF_Worker<TAO_Notify_UpdateListener> + +#pragma instantiate TAO_ESF_Immediate_Changes<TAO_Notify_EventListener, TAO_ESF_Proxy_List<TAO_Notify_EventListener>, ACE_Unbounded_Set_Iterator<TAO_Notify_EventListener *>, ACE_SYNCH_MUTEX> +#pragma instantiate TAO_ESF_Immediate_Changes<TAO_Notify_UpdateListener, TAO_ESF_Proxy_List<TAO_Notify_UpdateListener>, ACE_Unbounded_Set_Iterator<TAO_Notify_UpdateListener *>, ACE_SYNCH_MUTEX> +#pragma instantiate TAO_ESF_Immediate_Changes<TAO_Notify_UpdateListener, TAO_ESF_Proxy_List<TAO_Notify_UpdateListener>, ACE_Unbounded_Set_Iterator<TAO_Notify_UpdateListener *>, ACE_Null_Mutex> + +#pragma instantiate TAO_ESF_Proxy_List<TAO_Notify_EventListener> +#pragma instantiate TAO_ESF_Proxy_Collection<TAO_Notify_EventListener> + +#pragma instantiate TAO_ESF_Proxy_List<TAO_Notify_UpdateListener> +#pragma instantiate TAO_ESF_Proxy_Collection<TAO_Notify_UpdateListener> + +#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h new file mode 100644 index 00000000000..b25a55d1243 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h @@ -0,0 +1,62 @@ +/* -*- C++ -*- */ +// $Id$ +// +// ============================================================================ +// +// = LIBRARY +// ORBSVCS Notification +// +// = FILENAME +// Notify_Default_Collection_Factory.h +// +// = DESCRIPTION +// Default factory for collections +// +// = AUTHOR +// Pradeep Gore <pradeep@cs.wustl.edu> +// +// ============================================================================ + +#ifndef NOTIFY_DEFAULT_COLLECTION_FACTORY_H +#define NOTIFY_DEFAULT_COLLECTION_FACTORY_H +#include "ace/pre.h" +#include "Notify_Collection_Factory.h" +#include "notify_export.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +class TAO_Notify_Export TAO_Notify_Default_Collection_Factory : public TAO_Notify_Collection_Factory +{ + // = TITLE + // TAO_Notify_Default_Collection_Factory + // + // = DESCRIPTION + // Default factory for collections + // +public: + TAO_Notify_Default_Collection_Factory (void); + ~TAO_Notify_Default_Collection_Factory (); + + static int init_svc (void); + // Helper function to register the default factory into the service + // configurator. + + // = The Service_Object entry points + virtual int init (int argc, char* argv[]); + virtual int fini (void); + + // = Methods to create listener collections. + virtual TAO_Notify_EventListener_List* create_event_listener_list (CORBA::Environment &ACE_TRY_ENV); + // Create the event listener list. + + virtual TAO_Notify_UpdateListener_List* create_update_listener_list (CORBA::Environment &ACE_TRY_ENV); + // create update listener list. +}; + +ACE_STATIC_SVC_DECLARE (TAO_Notify_Default_Collection_Factory) +ACE_FACTORY_DECLARE (TAO_Notify,TAO_Notify_Default_Collection_Factory) + +#include "ace/post.h" +#endif /* NOTIFY_DEFAULT_COLLECTION_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp new file mode 100644 index 00000000000..537c55f0e6f --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp @@ -0,0 +1,167 @@ +// $Id$ + +#include "ace/Arg_Shifter.h" +#include "ace/Get_Opt.h" +#include "Notify_Default_EMO_Factory.h" +#include "Notify_Event_Manager.h" +#include "Notify_Event_Map.h" +#include "Notify_Event_Processor.h" +#include "Notify_Worker_Task.h" +#include "Notify_Factory.h" +#include "Notify_Event.h" + +ACE_RCSID(Notify, Notify_Default_EMO_Factory, "$Id$") + +int +TAO_Notify_Default_EMO_Factory::init_svc (void) +{ + return ACE_Service_Config::static_svcs ()-> + insert (&ace_svc_desc_TAO_Notify_Default_EMO_Factory); +} + +TAO_Notify_Default_EMO_Factory::TAO_Notify_Default_EMO_Factory (void) + : mt_dispatching_ (0), + mt_source_eval_ (0), + mt_lookup_ (0), + mt_listener_eval_ (0) +{ +} + +TAO_Notify_Default_EMO_Factory::~TAO_Notify_Default_EMO_Factory () +{ +} + +int +TAO_Notify_Default_EMO_Factory::init (int argc, char* argv[]) +{ + ACE_DEBUG ((LM_DEBUG, "TAO_Notify_Default_EMO_Factory::init\n")); + ACE_Arg_Shifter arg_shifter (argc, argv); + + + while (arg_shifter.is_anything_left ()) + { + char *arg = arg_shifter.get_current (); + + if (ACE_OS::strcasecmp (arg, "-MTDispatching") == 0) + { + this->mt_dispatching_ = 1; + arg_shifter.consume_arg (); + } + if (ACE_OS::strcasecmp (arg, "MTSourceEval") == 0) + { + this->mt_source_eval_ = 1; + arg_shifter.consume_arg (); + } + if (ACE_OS::strcasecmp (arg, "-MTLookup") == 0) + { + this->mt_lookup_ = 1; + arg_shifter.consume_arg (); + } + if (ACE_OS::strcasecmp (arg, "-MTListenerEval") == 0) + { + this->mt_listener_eval_ = 1; + arg_shifter.consume_arg (); + } + else + { + arg_shifter.ignore_arg (); + } + } + return 0; +} + +int +TAO_Notify_Default_EMO_Factory::fini (void) +{ + ACE_DEBUG ((LM_DEBUG, "TAO_Notify_Default_EMO_Factory::fini\n")); + return 0; +} + +TAO_Notify_Event_Manager* +TAO_Notify_Default_EMO_Factory::create_event_manager (TAO_Notify_EventChannel_i* channel, CORBA::Environment &ACE_TRY_ENV) +{ + TAO_Notify_Event_Manager* event_manager; + ACE_NEW_THROW_EX (event_manager, + TAO_Notify_Event_Manager (channel), + CORBA::NO_MEMORY ()); + return event_manager; +} + +TAO_Notify_Event_Map* +TAO_Notify_Default_EMO_Factory::create_event_map (CORBA::Environment &ACE_TRY_ENV) +{ + TAO_Notify_Event_Map* event_map; + ACE_NEW_THROW_EX (event_map, + TAO_Notify_Event_Map (), + CORBA::NO_MEMORY ()); + return event_map; +} + +TAO_Notify_Event_Processor* +TAO_Notify_Default_EMO_Factory::create_event_processor (TAO_Notify_Event_Manager* event_manager, CORBA::Environment &ACE_TRY_ENV) +{ + TAO_Notify_Event_Processor* event_processor; + ACE_NEW_THROW_EX (event_processor, + TAO_Notify_Event_Processor (event_manager), + CORBA::NO_MEMORY ()); + return event_processor; +} + + +TAO_Notify_Worker_Task* +TAO_Notify_Default_EMO_Factory::create_source_eval_task (TAO_Notify_Event_Manager* event_manager, CORBA::Environment &ACE_TRY_ENV) +{ + // @@ pass the correct option to initialize this as passive/active object. + TAO_Notify_Worker_Task* task; + ACE_NEW_THROW_EX (task, + TAO_Notify_Worker_Task (event_manager,this->mt_source_eval_), + CORBA::NO_MEMORY ()); + return task; +} + +TAO_Notify_Worker_Task* +TAO_Notify_Default_EMO_Factory::create_lookup_task (TAO_Notify_Event_Manager* event_manager, CORBA::Environment &ACE_TRY_ENV) +{ + // @@ pass the correct option to initialize this as passive/active object. + TAO_Notify_Worker_Task* task; + ACE_NEW_THROW_EX (task, + TAO_Notify_Worker_Task (event_manager,this->mt_lookup_), + CORBA::NO_MEMORY ()); + return task; +} + +TAO_Notify_Worker_Task* +TAO_Notify_Default_EMO_Factory::create_listener_eval_task (TAO_Notify_Event_Manager* event_manager, CORBA::Environment &ACE_TRY_ENV) +{ + // @@ pass the correct option to initialize this as passive/active object. + TAO_Notify_Worker_Task* task; + ACE_NEW_THROW_EX (task, + TAO_Notify_Worker_Task (event_manager, this->mt_listener_eval_), + CORBA::NO_MEMORY ()); + return task; +} + +TAO_Notify_Worker_Task* +TAO_Notify_Default_EMO_Factory::create_dispatching_task (TAO_Notify_Event_Manager* event_manager, CORBA::Environment &ACE_TRY_ENV) +{ + // @@ pass the correct option to initialize this as passive/active object. + TAO_Notify_Worker_Task* task; + ACE_NEW_THROW_EX (task, + TAO_Notify_Worker_Task (event_manager, + this->mt_dispatching_), + CORBA::NO_MEMORY ()); + return task; +} + + +// **************************************************************** + +ACE_STATIC_SVC_DEFINE (TAO_Notify_Default_EMO_Factory, + ACE_TEXT (TAO_NOTIFY_DEF_EMO_FACTORY_NAME), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (TAO_Notify_Default_EMO_Factory), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0) +ACE_FACTORY_DEFINE (TAO_Notify, TAO_Notify_Default_EMO_Factory) + +// **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h new file mode 100644 index 00000000000..e42bec02a9e --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h @@ -0,0 +1,72 @@ +/* -*- C++ -*- */ +// $Id$ +// +// ============================================================================ +// +// = LIBRARY +// ORBSVCS Notification +// +// = FILENAME +// Notify_Default_EMO_Factory.h +// +// = DESCRIPTION +// Default factory for event manager and its helper objects. +// +// = AUTHOR +// Pradeep Gore <pradeep@cs.wustl.edu> +// +// ============================================================================ + +#ifndef NOTIFY_DEFAULT_EMO_FACTORY_H +#define NOTIFY_DEFAULT_EMO_FACTORY_H + +#include "ace/pre.h" +#include "Notify_Event_Manager_Objects_Factory.h" +#include "notify_export.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +class TAO_Notify_Export TAO_Notify_Default_EMO_Factory : public TAO_Notify_EMO_Factory +{ + public: + TAO_Notify_Default_EMO_Factory (void); + ~TAO_Notify_Default_EMO_Factory (); + + static int init_svc (void); + // Helper function to register the default factory into the service + // configurator. + + // = The Service_Object entry points + virtual int init (int argc, char* argv[]); + virtual int fini (void); + + virtual TAO_Notify_Event_Manager* create_event_manager (TAO_Notify_EventChannel_i* channel, CORBA::Environment &ACE_TRY_ENV); + // Create an event manager. + + virtual TAO_Notify_Event_Map* create_event_map (CORBA::Environment &ACE_TRY_ENV); + // Create the event map. + + virtual TAO_Notify_Event_Processor* create_event_processor (TAO_Notify_Event_Manager* event_manager, CORBA::Environment &ACE_TRY_ENV); + // Create event processor. + + // = Create processing tasks. + virtual TAO_Notify_Worker_Task* create_source_eval_task (TAO_Notify_Event_Manager* event_manager, CORBA::Environment &ACE_TRY_ENV); + virtual TAO_Notify_Worker_Task* create_lookup_task (TAO_Notify_Event_Manager* event_manager, CORBA::Environment &ACE_TRY_ENV); + virtual TAO_Notify_Worker_Task* create_listener_eval_task (TAO_Notify_Event_Manager* event_manager, CORBA::Environment &ACE_TRY_ENV); + virtual TAO_Notify_Worker_Task* create_dispatching_task (TAO_Notify_Event_Manager* event_manager, CORBA::Environment &ACE_TRY_ENV); + +protected: + // = Params read via the svc.conf + CORBA::Boolean mt_dispatching_; + CORBA::Boolean mt_source_eval_; + CORBA::Boolean mt_lookup_; + CORBA::Boolean mt_listener_eval_; +}; + +ACE_STATIC_SVC_DECLARE (TAO_Notify_Default_EMO_Factory) +ACE_FACTORY_DECLARE (TAO_Notify,TAO_Notify_Default_EMO_Factory) + +#include "ace/post.h" +#endif /* NOTIFY_DEFAULT_EMO_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp new file mode 100644 index 00000000000..ba4d7fcb357 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp @@ -0,0 +1,263 @@ +// $Id$ + +#include "Notify_Default_POA_Factory.h" +#include "Notify_Factory.h" + +#define EC_POA_NAME "EC_POA" +// The POA name in which all the EC's live. + +ACE_RCSID(Notify, Notify_Default_POA_Factory, "$Id$") + +int +TAO_Notify_Default_POA_Factory::init_svc (void) +{ + return ACE_Service_Config::static_svcs ()-> + insert (&ace_svc_desc_TAO_Notify_Default_POA_Factory); +} + +TAO_Notify_Default_POA_Factory::TAO_Notify_Default_POA_Factory (void) +{ +} + +TAO_Notify_Default_POA_Factory::~TAO_Notify_Default_POA_Factory () +{ +} + +int +TAO_Notify_Default_POA_Factory::init (int /*argc*/, char* /*argv*/[]) +{ + return 0; +} + +int +TAO_Notify_Default_POA_Factory::fini (void) +{ + ACE_DEBUG ((LM_DEBUG, "TAO_Notify_Default_POA_Factory::fini\n")); + return 0; +} + +PortableServer::POA_ptr +TAO_Notify_Default_POA_Factory::create_event_channel_POA (PortableServer::POA_ptr parent_poa, CORBA::Environment &ACE_TRY_ENV) +{ + return this->create_generic_childPOA_i (EC_POA_NAME, + parent_poa, ACE_TRY_ENV); +} + + +PortableServer::POA_ptr +TAO_Notify_Default_POA_Factory::create_supplier_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV) +{ + char child_poa_name[BUFSIZ]; + + ACE_OS::sprintf (child_poa_name, "%d%s", new_poa_id, "SA"); + + return this->create_generic_childPOA_i (child_poa_name, parent_poa, + ACE_TRY_ENV); +} + +PortableServer::POA_ptr +TAO_Notify_Default_POA_Factory::create_consumer_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV) +{ + char child_poa_name[BUFSIZ]; + + ACE_OS::sprintf (child_poa_name, "%d%s", new_poa_id, "CA"); + + return this->create_generic_childPOA_i (child_poa_name, + parent_poa, ACE_TRY_ENV); +} + +PortableServer::POA_ptr +TAO_Notify_Default_POA_Factory::create_proxy_pushconsumer_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV) +{ + char child_poa_name[BUFSIZ]; + + ACE_OS::sprintf (child_poa_name, "%d%s", new_poa_id, "PPC"); + + return this->create_generic_childPOA_i (child_poa_name, + parent_poa, ACE_TRY_ENV); +} + +PortableServer::POA_ptr +TAO_Notify_Default_POA_Factory::create_proxy_pushsupplier_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV) +{ + char child_poa_name[BUFSIZ]; + + ACE_OS::sprintf (child_poa_name, "%d%s", new_poa_id, "PPS"); + + return this->create_generic_childPOA_i (child_poa_name, + parent_poa, ACE_TRY_ENV); +} + +PortableServer::POA_ptr +TAO_Notify_Default_POA_Factory::create_generic_childPOA_i (const char* child_poa_name, PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV) +{ + // @@ Pradeep: if the Notification service is ever going to be + // persistent or fault tolerant you may need to create this stuff + // with the persistent policy too, probably you can handle that + // using a different 'Resource_Manager' that overrides this + // method. Just a thought... + + // Create a UNIQUE_ID and USER_ID policy because we want the POA + // to detect duplicates for us. + PortableServer::IdUniquenessPolicy_var idpolicy = + poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID, + ACE_TRY_ENV); + ACE_CHECK_RETURN (PortableServer::POA::_nil()); + + PortableServer::IdAssignmentPolicy_var assignpolicy = + poa->create_id_assignment_policy (PortableServer::USER_ID, + ACE_TRY_ENV); + ACE_CHECK_RETURN (PortableServer::POA::_nil ()); + + PortableServer::POAManager_var manager = + poa->the_POAManager (ACE_TRY_ENV); + ACE_CHECK_RETURN (PortableServer::POA::_nil ()); + + // Create a PolicyList + CORBA::PolicyList policy_list; + policy_list.length (2); + policy_list [0] = + PortableServer::IdUniquenessPolicy::_duplicate (idpolicy.in ()); + policy_list [1] = + PortableServer::IdAssignmentPolicy::_duplicate (assignpolicy.in ()); + + // @@ Pradeep: is it possible to use a more meaningful name? + + // Create the child POA. + PortableServer::POA_var poa_ret = poa->create_POA (child_poa_name, + manager.in (), + policy_list, + ACE_TRY_ENV); + ACE_CHECK_RETURN (PortableServer::POA::_nil()); + + idpolicy->destroy (ACE_TRY_ENV); + ACE_CHECK_RETURN (PortableServer::POA::_nil()); + + assignpolicy->destroy (); + ACE_CHECK_RETURN (PortableServer::POA::_nil()); + + return poa_ret._retn (); +} + +PortableServer::ObjectId * +TAO_Notify_Default_POA_Factory::long_to_ObjectId (const CORBA::Long id) +{ + // Modified code from string_to_ObjectId .. + // + + CORBA::ULong buffer_size = 4; + + // Create the buffer for the Id + CORBA::Octet *buffer = PortableServer::ObjectId::allocbuf (buffer_size); + + // Copy the contents + ACE_OS::memcpy (buffer, (char*)&id, buffer_size); + + // @@ Pradeep: TAO guarantees that Long is 4 bytes wide, but the + // standard only guarantees that it is at least 4 bytes wide. You + // may want to think about that.... + + // Create and return a new ID + PortableServer::ObjectId *obj_id = 0; + ACE_NEW_RETURN (obj_id, + PortableServer::ObjectId (buffer_size, + buffer_size, + buffer, + 1), + 0); + + return obj_id; +} + +CORBA::Object_ptr +TAO_Notify_Default_POA_Factory::activate_object_with_id (CORBA::Long id, PortableServer::POA_ptr poa, PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV) +{ + // Convert CORBA::Long to ObjectId + PortableServer::ObjectId_var oid = + this->long_to_ObjectId (id); + + poa->activate_object_with_id (oid.in (), + servant, + ACE_TRY_ENV); + ACE_CHECK_RETURN (CORBA::Object::_nil ()); + + return poa->id_to_reference (oid.in (), + ACE_TRY_ENV); +} + +CORBA::Object_ptr +TAO_Notify_Default_POA_Factory::activate_object (PortableServer::POA_ptr poa, PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV) +{ + PortableServer::ObjectId_var oid = poa->activate_object (servant, ACE_TRY_ENV); + ACE_CHECK_RETURN (CORBA::Object::_nil ()); + + return poa->id_to_reference (oid.in (), ACE_TRY_ENV); +} + +CORBA::Object_ptr +TAO_Notify_Default_POA_Factory::servant_to_reference (PortableServer::POA_ptr poa, PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV) +{ + PortableServer::ObjectId_var oid = poa->servant_to_id (servant, ACE_TRY_ENV); + ACE_CHECK_RETURN (CORBA::Object::_nil ()); + + return poa->id_to_reference (oid.in (), ACE_TRY_ENV); +} + +CORBA::Object_ptr +TAO_Notify_Default_POA_Factory::id_to_reference (CORBA::Long id, PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV) +{ + // Convert CORBA::Long to ObjectId + PortableServer::ObjectId_var oid = + this->long_to_ObjectId (id); + + return poa->id_to_reference (oid.in (), + ACE_TRY_ENV); +} + +void +TAO_Notify_Default_POA_Factory::destroy_POA (PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV) +{ + if (!CORBA::is_nil (poa)) + poa->destroy (1,0,ACE_TRY_ENV); + // The <wait_for_completion> flag causes a deadlock when destroying the POA + // because we are involved in an upcall. + // TODO:I have to think about what the implications of not waiting are. +} + +void +TAO_Notify_Default_POA_Factory::deactivate_object (CORBA::Object_ptr obj, PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV) +{ + if (CORBA::is_nil (poa) || CORBA::is_nil (obj)) + return; + + PortableServer::ObjectId_var id = + poa->reference_to_id (obj, ACE_TRY_ENV); + ACE_CHECK; + poa->deactivate_object (id.in (), ACE_TRY_ENV); + ACE_CHECK; +} + +void +TAO_Notify_Default_POA_Factory::deactivate_object (PortableServer::Servant servant, PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV) +{ + if (CORBA::is_nil (poa) || servant == 0) + return; + + PortableServer::ObjectId_var id = + poa->servant_to_id (servant, ACE_TRY_ENV); + ACE_CHECK; + poa->deactivate_object (id.in (), ACE_TRY_ENV); + ACE_CHECK; +} + +// **************************************************************** + +ACE_STATIC_SVC_DEFINE (TAO_Notify_Default_POA_Factory, + ACE_TEXT (TAO_NOTIFY_DEF_POA_FACTORY_NAME), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (TAO_Notify_Default_POA_Factory), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0) +ACE_FACTORY_DEFINE (TAO_Notify, TAO_Notify_Default_POA_Factory) + +// **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h new file mode 100644 index 00000000000..3953733fefd --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h @@ -0,0 +1,102 @@ +/* -*- C++ -*- */ +// $Id$ +// +// ============================================================================ +// +// = LIBRARY +// ORBSVCS Notification +// +// = FILENAME +// Notify_Default_POA_Factory.h +// +// = DESCRIPTION +// Default factory for POA objects. +// +// = AUTHOR +// Pradeep Gore <pradeep@cs.wustl.edu> +// +// ============================================================================ + +#ifndef TAO_NOTIFY_DEFAULT_POA_FACTORY_H +#define TAO_NOTIFY_DEFAULT_POA_FACTORY_H + +#include "ace/pre.h" +#include "Notify_POA_Factory.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +class TAO_Notify_Export TAO_Notify_Default_POA_Factory : public TAO_Notify_POA_Factory +{ +public: + // = TITLE + // TAO_Notify_Default_POA_Factory + // + // = DESCRIPTION + // Default factory for POA objects. + // + TAO_Notify_Default_POA_Factory (void); + ~TAO_Notify_Default_POA_Factory (); + + static int init_svc (void); + // Helper function to register the default factory into the service + // configurator. + + // = The Service_Object entry points + virtual int init (int argc, char* argv[]); + virtual int fini (void); + + PortableServer::POA_ptr create_event_channel_POA (PortableServer::POA_ptr parent_poa, CORBA::Environment &ACE_TRY_ENV); + // Create the POA to activate Event Channels in. + + PortableServer::POA_ptr create_supplier_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV); + // Create the POA to activate SA's in. + + PortableServer::POA_ptr create_consumer_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV); + // Create the POA to activate CA's in. + + PortableServer::POA_ptr create_proxy_pushconsumer_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV); + // Create the POA to activate proxy push consumers in. + + PortableServer::POA_ptr create_proxy_pushsupplier_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV); + // Create the POA to activate proxy push suppliers in. + + // = Object activation and POA methods + CORBA::Object_ptr activate_object_with_id (CORBA::Long id, PortableServer::POA_ptr poa,PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV); + // Converts <id> to an ObjectId and registers with the POA <poa>. + + CORBA::Object_ptr activate_object (PortableServer::POA_ptr poa,PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV); + // Registers with the POA <poa>. + + CORBA::Object_ptr servant_to_reference (PortableServer::POA_ptr poa,PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV); + // Registers with the POA <poa>. + + CORBA::Object_ptr id_to_reference (CORBA::Long id, PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV); + // Look for the Object with id <id> in <poa>. + + void destroy_POA (PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV); + // Destroy the <poa> + + void deactivate_object (CORBA::Object_ptr obj, PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV); + // Deactivate the object. + + void deactivate_object (PortableServer::Servant servant, PortableServer::POA_ptr, CORBA::Environment &ACE_TRY_ENV); + // Deactivate the object. + +protected: + // = Helper methods + + PortableServer::ObjectId* long_to_ObjectId (const CORBA::Long id); + // Converts a CORBA::Long to an ObjectId + + PortableServer::POA_ptr create_generic_childPOA_i (const char* child_poa_name, PortableServer::POA_ptr parent_poa, CORBA::Environment &ACE_TRY_ENV); + // Create the POA with the most generic policies required of our POA's. + +}; + +ACE_STATIC_SVC_DECLARE (TAO_Notify_Default_POA_Factory) +ACE_FACTORY_DECLARE (TAO_Notify,TAO_Notify_Default_POA_Factory) + +#include "ace/post.h" +#endif /* TAO_NOTIFY_DEFAULT_POA_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Types.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.cpp index 12bcbb53fe5..ee2b6e2614a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Types.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "Notify_Types.h" +#include "Notify_Event.h" -ACE_RCSID(Notify, Notify_Types, "$Id$") +ACE_RCSID(Notify, Notify_Event, "$Id$") TAO_Notify_EventType TAO_Notify_EventType::special_event_type_ ("*", "%ALL"); @@ -107,19 +107,54 @@ TAO_Notify_EventType::get_native (void) const // **************************************************************** +TAO_Notify_Event::TAO_Notify_Event (void) + :lock_ (0), + refcount_ (1) +{ + lock_ = new ACE_Lock_Adapter<ACE_SYNCH_MUTEX> (); +} + +TAO_Notify_Event::~TAO_Notify_Event () +{ + delete this->lock_; + ACE_DEBUG ((LM_DEBUG, "in ~TAO_Notify_Event\n")); +} + + +void +TAO_Notify_Event::_incr_refcnt (void) +{ + ACE_GUARD (ACE_Lock, ace_mon, *this->lock_); + this->refcount_++; + ACE_DEBUG ((LM_DEBUG, "in TAO_Notify_Event incr %d\n", refcount_)); +} + +void +TAO_Notify_Event::_decr_refcnt (void) +{ + { + ACE_GUARD (ACE_Lock, ace_mon, *this->lock_); + this->refcount_--; + } + + ACE_DEBUG ((LM_DEBUG, "in TAO_Notify_Event decr %d\n", refcount_)); + if (this->refcount_ == 0) + delete this; +} + +// **************************************************************** + // = Any Event Type. -TAO_Notify_Any::TAO_Notify_Any (void) - :is_owner_(0) +TAO_Notify_Any::TAO_Notify_Any (CORBA::Any * data) + :data_ (data), + is_owner_(1) { } -TAO_Notify_Any::TAO_Notify_Any (const CORBA::Any & data) - :data_ ((CORBA::Any*)&data), +TAO_Notify_Any::TAO_Notify_Any (const CORBA::Any * data) + :data_ ((CORBA::Any*)data), is_owner_(0) - // Note: This appears like we're casting away const correctness - // but this class still respects it via the is_owner flag. - // { } @@ -133,22 +168,22 @@ TAO_Notify_Event* TAO_Notify_Any::clone (void) { TAO_Notify_Any* clone; - ACE_NEW_RETURN (clone, TAO_Notify_Any (), 0); if (this->is_owner_) { // @@ Are you sure this is the right way to clone? You are // stealing the data from the original class... + ACE_NEW_RETURN (clone, TAO_Notify_Any ((CORBA::Any const *)this->data_), + 0); this->is_owner_ = 0; - clone->data_ = this->data_; - clone->is_owner_ = 1; } else { - ACE_NEW_RETURN (clone->data_, - CORBA::Any (*this->data_), 0); - // Later: cleanup *clone if this new fails. - clone->is_owner_ = 1; + CORBA::Any * data_copy; + ACE_NEW_RETURN (data_copy, CORBA::Any (*this->data_), 0); + ACE_NEW_RETURN (clone, TAO_Notify_Any (data_copy), 0); + + // Later: cleanup data_copy if this new fails. } return clone; @@ -213,14 +248,16 @@ TAO_Notify_Any::do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer, // @@ Pradeep: many of the same comments that i made for // TAO_Notify_Any apply here too. -TAO_Notify_StructuredEvent::TAO_Notify_StructuredEvent (void) - :is_owner_ (0) +TAO_Notify_StructuredEvent::TAO_Notify_StructuredEvent (CosNotification::StructuredEvent * notification) + :data_ (notification), + event_type_ (notification->header.fixed_header.event_type), + is_owner_ (1) { } -TAO_Notify_StructuredEvent::TAO_Notify_StructuredEvent (const CosNotification::StructuredEvent & notification) - :data_ ((CosNotification::StructuredEvent*)¬ification), - event_type_ (notification.header.fixed_header.event_type), +TAO_Notify_StructuredEvent::TAO_Notify_StructuredEvent (const CosNotification::StructuredEvent * notification) + :data_ ((CosNotification::StructuredEvent*)notification), + event_type_ (notification->header.fixed_header.event_type), is_owner_ (0) { } @@ -235,19 +272,19 @@ TAO_Notify_Event* TAO_Notify_StructuredEvent::clone (void) { TAO_Notify_StructuredEvent* clone; - ACE_NEW_RETURN (clone, TAO_Notify_StructuredEvent (), 0); if (this->is_owner_) { + ACE_NEW_RETURN (clone, TAO_Notify_StructuredEvent ((CosNotification::StructuredEvent const *) this->data_), 0); this->is_owner_ = 0; - clone->data_ = this->data_; - clone->is_owner_ = 1; } else { - ACE_NEW_RETURN (clone->data_, - CosNotification::StructuredEvent (*this->data_), 0); - // Later: cleanup *clone if this new fails. + CosNotification::StructuredEvent *data_copy; + ACE_NEW_RETURN (data_copy, CosNotification::StructuredEvent (*this->data_), + 0); + ACE_NEW_RETURN (clone, TAO_Notify_StructuredEvent (data_copy), 0); + // Later: cleanup *data_copy if this new fails. clone->is_owner_ = 1; } @@ -304,74 +341,3 @@ TAO_Notify_StructuredEvent::do_push (CosNotifyComm::StructuredPushConsumer_ptr c { consumer->push_structured_event (*this->data_, ACE_TRY_ENV); } - -// **************************************************************** - -// = TAO_Notify_EventType_List -void -TAO_Notify_EventType_List::populate (CosNotification::EventTypeSeq& event_type_seq) -{ - event_type_seq.length (this->size ()); - - TAO_Notify_EventType_List::ITERATOR iter (*this); - - TAO_Notify_EventType* event_type; - - CORBA::ULong i = 0; - for (iter.first (); iter.next (event_type); iter.advance (), ++i) - event_type_seq[i] = event_type->get_native (); -} - -void -TAO_Notify_EventType_List::insert_seq (const CosNotification::EventTypeSeq& event_type_seq) -{ - TAO_Notify_EventType event_type; - - for (CORBA::ULong i = 0; i < event_type_seq.length (); ++i) - { - event_type = event_type_seq[i]; - inherited::insert (event_type); - } -} - -void -TAO_Notify_EventType_List::remove_seq (const CosNotification::EventTypeSeq& event_type_seq) -{ - TAO_Notify_EventType event_type; - - for (CORBA::ULong i = 0; i < event_type_seq.length (); ++i) - { - event_type = event_type_seq[i]; - inherited::remove (event_type); - } -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Unbounded_Set <TAO_Notify_EventType>; -template class ACE_Unbounded_Set_Iterator<TAO_Notify_EventType>; -template class ACE_Node<TAO_Notify_EventType>; - -template class ACE_Unbounded_Set<TAO_Notify_EventListener*>; -template class ACE_Unbounded_Set_Iterator<TAO_Notify_EventListener*>; -template class ACE_Node<TAO_Notify_EventListener*>; - -template class ACE_Unbounded_Set<TAO_Notify_UpdateListener*>; -template class ACE_Unbounded_Set_Iterator<TAO_Notify_UpdateListener*>; -template class ACE_Node<TAO_Notify_UpdateListener*>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Unbounded_Set<TAO_Notify_EventType> -#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_Notify_EventType> -#pragma instantiate ACE_Node<TAO_Notify_EventType> - -#pragma instantiate ACE_Unbounded_Set<TAO_Notify_EventListener*> -#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_Notify_EventListener*> -#pragma instantiate ACE_Node<TAO_Notify_EventListener*> - -#pragma instantiate ACE_Unbounded_Set<TAO_Notify_UpdateListener*> -#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_Notify_UpdateListener*> -#pragma instantiate ACE_Node<TAO_Notify_UpdateListener*> - -#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Types.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.h index 9e904e2b732..1448dfd5810 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Types.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.h @@ -1,32 +1,37 @@ +/* -*- C++ -*- */ // $Id$ -// ========================================================================== +// +// ============================================================================ // // = LIBRARY -// Orbsvcs +// ORBSVCS Notification // // = FILENAME -// Notify_Types.h +// Notify_Event.h // // = DESCRIPTION -// Internal types used by Notify +// Abstraction for Notify's event types. // // = AUTHOR -// Pradeep Gore <pradeep@cs.wustl.edu> +// Pradeep Gore <pradeep@cs.wustl.edu> // -// ========================================================================== +// ============================================================================ + +#ifndef TAO_NOTIFY_EVENT_H +#define TAO_NOTIFY_EVENT_H -#ifndef TAO_NOTIFY_TYPES_H -#define TAO_NOTIFY_TYPES_H #include "ace/pre.h" +#include "orbsvcs/CosNotificationC.h" +#include "notify_export.h" -#include "orbsvcs/CosNotifyFilterC.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "ace/Containers_T.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ -class TAO_Notify_EventListener; -class TAO_Notify_UpdateListener; +#include "orbsvcs/CosNotifyFilterC.h" +#include "orbsvcs/CosEventCommC.h" -class TAO_Notify_EventType +class TAO_Notify_Export TAO_Notify_EventType { // = TITLE // TAO_Notify_EventType @@ -83,7 +88,7 @@ protected: // like the one above. Or better yet, do not put multiple classes in // the same file. -class TAO_Notify_Event +class TAO_Notify_Export TAO_Notify_Event { // = TITLE // TAO_Notify_Event @@ -95,6 +100,12 @@ class TAO_Notify_Event // This the the "prototype" creational pattern. // public: + TAO_Notify_Event (void); + // The lock for its ref. count. + // Owns the lock. + + virtual ~TAO_Notify_Event (); + virtual CORBA::Boolean is_special_event_type (void) const = 0; // Is this the "special" event type. @@ -114,11 +125,22 @@ public: virtual void do_push (CosEventComm::PushConsumer_ptr consumer, CORBA::Environment &ACE_TRY_ENV) const = 0; virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer, CORBA::Environment &ACE_TRY_ENV) const = 0; // Push self to <consumer> + + // = Refcounted lifetime + void _incr_refcnt (void); + void _decr_refcnt (void); + + protected: + ACE_Lock* lock_; + // The locking strategy. + + CORBA::ULong refcount_; + // The reference count. }; // **************************************************************** -class TAO_Notify_Any : public TAO_Notify_Event +class TAO_Notify_Export TAO_Notify_Any : public TAO_Notify_Event { // = TITLE // TAO_Notify_Any @@ -128,8 +150,12 @@ class TAO_Notify_Any : public TAO_Notify_Event // public: - TAO_Notify_Any (void); - TAO_Notify_Any (const CORBA::Any & data); + TAO_Notify_Any (CORBA::Any* data); + // Refers to the data. Owns it! + + TAO_Notify_Any (const CORBA::Any* data); + // Does not own data. + virtual ~TAO_Notify_Any (); virtual TAO_Notify_Event* clone (void); @@ -152,7 +178,7 @@ protected: // **************************************************************** -class TAO_Notify_StructuredEvent : public TAO_Notify_Event +class TAO_Notify_Export TAO_Notify_StructuredEvent : public TAO_Notify_Event { // = TITLE // TAO_Notify_StructuredEvent @@ -161,8 +187,8 @@ class TAO_Notify_StructuredEvent : public TAO_Notify_Event // This class is the concrete prototype for the Structured Event Type. // public: - TAO_Notify_StructuredEvent (void); - TAO_Notify_StructuredEvent (const CosNotification::StructuredEvent & notification); + TAO_Notify_StructuredEvent (CosNotification::StructuredEvent * notification); + TAO_Notify_StructuredEvent (const CosNotification::StructuredEvent * notification); virtual ~TAO_Notify_StructuredEvent (); virtual TAO_Notify_Event* clone (void); @@ -185,38 +211,6 @@ protected: // Do we own the data. }; -// **************************************************************** - -class TAO_Notify_EventType_List : public ACE_Unbounded_Set <TAO_Notify_EventType> -{ - // = TITLE - // TAO_Notify_EventType_List - // - // = DESCRIPTION - // Allows operations using the CosNotification::EventTypeSeq type. - // - - typedef ACE_Unbounded_Set <TAO_Notify_EventType> inherited; - -public: - void populate (CosNotification::EventTypeSeq& event_type_seq); - // Populate <event_type_seq> with the contents of this object. - - void insert_seq (const CosNotification::EventTypeSeq& event_type_seq); - // insert the contents of <event_type_seq> into this object. - - void remove_seq (const CosNotification::EventTypeSeq& event_type_seq); - // remove the contents of <event_type_seq> from this object. -}; - -// **************************************************************** - -// = typedefs -typedef ACE_Unbounded_Set<TAO_Notify_EventListener*> TAO_Notify_EventListener_List; -// A list of event listeners that are looking for the same event type. - -typedef ACE_Unbounded_Set<TAO_Notify_UpdateListener*> TAO_Notify_UpdateListener_List; -// A list of update listeners who want to be notified about publish/subscribe changes. - #include "ace/post.h" -#endif /* TAO_NOTIFY_TYPES_H */ + +#endif /* TAO_NOTIFY_EVENT_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp index 06d79d74ffd..bcb00683b20 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp @@ -1,10 +1,13 @@ // $Id$ #include "tao/Servant_Base.h" -#include "tao/PortableServerC.h" #include "Notify_EventChannelFactory_i.h" #include "Notify_EventChannel_i.h" -#include "Notify_Resource_Manager.h" +#include "Notify_Channel_Objects_Factory.h" +#include "Notify_POA_Factory.h" +#include "Notify_Factory.h" +#include "Notify_FilterFactory_i.h" +#include "Notify_Event.h" ACE_RCSID(Notify, Notify_EventChannelFactory_i, "$Id$") @@ -14,7 +17,7 @@ TAO_Notify_EventChannelFactory_i::TAO_Notify_EventChannelFactory_i (void) TAO_Notify_EventChannelFactory_i::~TAO_Notify_EventChannelFactory_i (void) { - this->cleanup_i (); + TAO_Notify_Factory::shutdown (); } CosNotifyChannelAdmin::EventChannelFactory_ptr @@ -31,7 +34,7 @@ TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA, C channelfactory->init_i (default_POA, ACE_TRY_ENV); ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannelFactory::_nil ()); - CORBA::Object_var obj = channelfactory->resource_manager_-> + CORBA::Object_var obj = channelfactory->poa_factory_-> activate_object (channelfactory->my_POA_.in (), channelfactory, ACE_TRY_ENV); ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannelFactory::_nil ()); @@ -43,43 +46,60 @@ TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA, C void TAO_Notify_EventChannelFactory_i::init_i (PortableServer::POA_ptr default_POA, CORBA::Environment &ACE_TRY_ENV) { + TAO_Notify_Factory::init (ACE_TRY_ENV); + ACE_CHECK; + this->my_POA_ = PortableServer::POA::_duplicate (default_POA); - this->resource_manager_ = - TAO_Notify_Resource_Manager::create (default_POA, - ACE_TRY_ENV); - ACE_CHECK; + this->channel_objects_factory_ = + TAO_Notify_Factory::get_channel_objects_factory (); - // Which POA should we activate the Event Channels in? - this->ec_POA_ = this->resource_manager_-> + this->poa_factory_ = TAO_Notify_Factory::get_poa_factory (); + + // The POA that we should activate the Event Channels in. + this->ec_POA_ = this->poa_factory_-> create_event_channel_POA (this->my_POA_.in (), ACE_TRY_ENV); + ACE_CHECK; + + this->lock_ = + this->channel_objects_factory_->create_channel_factory_lock (ACE_TRY_ENV); + ACE_CHECK; + + this->default_filter_factory_ = + this->create_default_filter_factory_i (ACE_TRY_ENV); } CosNotifyChannelAdmin::EventChannelFactory_ptr TAO_Notify_EventChannelFactory_i::get_ref (CORBA::Environment &ACE_TRY_ENV) { return CosNotifyChannelAdmin::EventChannelFactory - ::_narrow (this->resource_manager_-> + ::_narrow (this->poa_factory_-> servant_to_reference (this->my_POA_.in (), this, ACE_TRY_ENV)); } void TAO_Notify_EventChannelFactory_i::event_channel_destroyed (CosNotifyChannelAdmin::ChannelID channel_id) { + ACE_GUARD (ACE_Lock, ace_mon, *this->lock_); + this->ec_ids_.put (channel_id); + ACE_DEBUG ((LM_DEBUG, "event_channel_destroyed %d\n", channel_id)); } -void -TAO_Notify_EventChannelFactory_i::cleanup_i (void) +void TAO_Notify_EventChannelFactory_i::shutdown (CORBA::Environment &ACE_TRY_ENV, CORBA::Boolean destroy_children) { - if (this->resource_manager_ != 0) - this->resource_manager_->destroy_POA (this->ec_POA_.in ()); - - delete this->resource_manager_; + if (destroy_children == 1) + { + this->poa_factory_->destroy_POA (this->ec_POA_.in (), ACE_TRY_ENV); - my_POA_ = PortableServer::POA::_nil (); - ec_POA_ = PortableServer::POA::_nil (); - this->resource_manager_ = 0; + this->poa_factory_->deactivate_object(this->default_filter_factory_.in (), + this->my_POA_.in (), + ACE_TRY_ENV); + } + // Deactivate ourselves. + this->poa_factory_->deactivate_object (this, + this->my_POA_.in (), + ACE_TRY_ENV); } CosNotifyChannelAdmin::EventChannel_ptr @@ -94,29 +114,38 @@ TAO_Notify_EventChannelFactory_i::create_channel(const CosNotification::QoSPrope CosNotification::UnsupportedAdmin )) { + ACE_DEBUG ((LM_DEBUG, + "In TAO_Notify_EventChannelFactory_i::create_channel\n")); TAO_Notify_EventChannel_i* channel = - this->resource_manager_->create_event_channel (this, - ACE_TRY_ENV); + this->channel_objects_factory_->create_event_channel (this, + ACE_TRY_ENV); ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil ()); PortableServer::ServantBase_var channel_var (channel); - ec_id = this->ec_ids_.get (); + { + ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, + CORBA::INTERNAL ()); + ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil ()); - channel->init (ec_id, initial_qos, initial_admin, this->ec_POA_.in (), - ACE_TRY_ENV); - ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil ()); + ec_id = this->ec_ids_.get (); - CORBA::Object_var obj = this->resource_manager_-> - activate_object_with_id (ec_id, - this->ec_POA_.in (), - channel, - ACE_TRY_ENV); - ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil ()); + ACE_DEBUG ((LM_DEBUG, "event_channel created %d\n", ec_id)); + channel->init (ec_id, initial_qos, initial_admin, this->my_POA_.in (), this->ec_POA_.in (), + ACE_TRY_ENV); + ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil ()); - this->ec_ids_.next (); + CORBA::Object_var obj = this->poa_factory_-> + activate_object_with_id (ec_id, + this->ec_POA_.in (), + channel, + ACE_TRY_ENV); + ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil ()); - return CosNotifyChannelAdmin::EventChannel::_narrow (obj.in ()); + this->ec_ids_.next (); + + return CosNotifyChannelAdmin::EventChannel::_narrow (obj.in ()); + } } CosNotifyChannelAdmin::ChannelIDSeq* @@ -125,6 +154,8 @@ TAO_Notify_EventChannelFactory_i::get_all_channels (CORBA::Environment & ACE_TRY CORBA::SystemException )) { + ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); + return this->ec_ids_.get_sequence (ACE_TRY_ENV); } @@ -139,8 +170,8 @@ TAO_Notify_EventChannelFactory_i::get_event_channel (CosNotifyChannelAdmin::Chan ACE_TRY { - obj = this->resource_manager_->id_to_reference (id, this->ec_POA_.in (), - ACE_TRY_ENV); + obj = this->poa_factory_->id_to_reference (id, this->ec_POA_.in (), + ACE_TRY_ENV); ACE_TRY_CHECK; } ACE_CATCHANY // Translate any exception to "not found" @@ -153,6 +184,33 @@ TAO_Notify_EventChannelFactory_i::get_event_channel (CosNotifyChannelAdmin::Chan return CosNotifyChannelAdmin::EventChannel::_narrow (obj.in (), ACE_TRY_ENV); } +CosNotifyFilter::FilterFactory_ptr +TAO_Notify_EventChannelFactory_i::create_default_filter_factory_i (CORBA::Environment& ACE_TRY_ENV) +{ + TAO_Notify_FilterFactory_i* filterfactory = + this->channel_objects_factory_->create_filter_factory (ACE_TRY_ENV); + ACE_CHECK_RETURN (CosNotifyFilter::FilterFactory::_nil ()); + + PortableServer::ServantBase_var filterfactory_var (filterfactory); + + // Init goes here. + // ACE_CHECK_RETURN (CosNotifyFilter::FilterFactory::_nil ()); + + CORBA::Object_var obj = + this->poa_factory_->activate_object (this->my_POA_.in (), + filterfactory, ACE_TRY_ENV); + ACE_CHECK_RETURN (CosNotifyFilter::FilterFactory::_nil ()); + + return CosNotifyFilter::FilterFactory::_narrow (obj.in ()); +} + +CosNotifyFilter::FilterFactory_ptr +TAO_Notify_EventChannelFactory_i::get_default_filter_factory (void) +{ + return CosNotifyFilter::FilterFactory:: + _duplicate (this->default_filter_factory_.in ()); +} + #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class TAO_Notify_ID_Pool_Ex<CosNotifyChannelAdmin::ChannelID, CosNotifyChannelAdmin::ChannelIDSeq>; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h index 2aa6e71e32e..4ca355691e0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h @@ -34,7 +34,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -class TAO_Notify_Resource_Manager; +class TAO_Notify_CO_Factory; +class TAO_Notify_POA_Factory; class TAO_Notify_Export TAO_Notify_EventChannelFactory_i : public virtual POA_CosNotifyChannelAdmin::EventChannelFactory, public virtual PortableServer::RefCountServantBase { @@ -58,11 +59,17 @@ public: CosNotifyChannelAdmin::EventChannelFactory_ptr get_ref (CORBA::Environment &ACE_TRY_ENV); // Get the CORBA object. + void shutdown (CORBA::Environment &ACE_TRY_ENV, CORBA::Boolean destroy_children = 0); + // Destroy the factory + // By default, the factory's lifetime is not coupled with its creations + // Setting the <destroy_children> flag to 'true' will destory all event_channels that were created by this factory. + void event_channel_destroyed (CosNotifyChannelAdmin::ChannelID channel_id); // Called by child EC's when they're about to go away. - TAO_Notify_Resource_Manager* get_resource_manager (void); - // Get the resource manager; + // = Accesors + CosNotifyFilter::FilterFactory_ptr get_default_filter_factory (void); + // Accesor for the default filter factory shared by all EC's. // = CosNotifyChannelAdmin::EventChannelFactory methods. virtual CosNotifyChannelAdmin::EventChannel_ptr create_channel ( @@ -100,23 +107,33 @@ virtual CosNotifyChannelAdmin::EventChannel_ptr get_event_channel ( void init_i (PortableServer::POA_ptr default_POA, CORBA::Environment &ACE_TRY_ENV); // Initializes this object. - void cleanup_i (void); - // Cleanup this object. + CosNotifyFilter::FilterFactory_ptr create_default_filter_factory_i (CORBA::Environment& ACE_TRY_ENV); + // Create the default filter factory. // = Data members - TAO_Notify_Resource_Manager* resource_manager_; - // This factory is owned by the Event Channel Factory. + TAO_Notify_CO_Factory* channel_objects_factory_; + // The factory for channel objects. + + TAO_Notify_POA_Factory* poa_factory_; + // The factory for POA based containers. + + PortableServer::POA_var my_POA_; + // The POA in which we live. + // Filter objects and COS EC style proxys live here too. + + PortableServer::POA_var ec_POA_; + // The POA in which we should activate EC's in. + // We create and own this. - PortableServer::POA_var my_POA_; - // The POA in which we live. + TAO_Notify_ID_Pool_Ex<CosNotifyChannelAdmin::ChannelID, + CosNotifyChannelAdmin::ChannelIDSeq> ec_ids_; + // Id generator for event channels - PortableServer::POA_var ec_POA_; - // The POA in which we should activate EC's in. - // We create and own this. + ACE_Lock* lock_; + // The locking strategy. - TAO_Notify_ID_Pool_Ex<CosNotifyChannelAdmin::ChannelID, - CosNotifyChannelAdmin::ChannelIDSeq> ec_ids_; - // Id generator for event channels + CosNotifyFilter::FilterFactory_var default_filter_factory_; + // The default filter factory. }; #if defined(_MSC_VER) && (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp index df2f830fbc5..4a3446e38dd 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp @@ -1,47 +1,69 @@ // $Id$ +#include "orbsvcs/ESF/ESF_Proxy_Collection.h" #include "Notify_EventChannel_i.h" -#include "Notify_Resource_Manager.h" #include "Notify_EventChannelFactory_i.h" #include "Notify_SupplierAdmin_i.h" #include "Notify_ConsumerAdmin_i.h" +#include "Notify_Event_Manager.h" +#include "Notify_Channel_Objects_Factory.h" +#include "Notify_POA_Factory.h" +#include "Notify_Factory.h" +#include "Notify_Event_Manager_Objects_Factory.h" +#include "Notify_Collection_Factory.h" ACE_RCSID(Notify, Notify_EventChannel_i, "$Id$") -TAO_Notify_EventChannel_i::TAO_Notify_EventChannel_i (TAO_Notify_EventChannelFactory_i* my_factory, TAO_Notify_Resource_Manager* resource_manager) - :my_factory_ (my_factory), - resource_manager_(resource_manager), +TAO_Notify_EventChannel_i::TAO_Notify_EventChannel_i (TAO_Notify_EventChannelFactory_i* my_factory) + :lock_ (0), + destory_child_POAs_ (0), + channel_factory_ (my_factory), + channel_objects_factory_ (TAO_Notify_Factory::get_channel_objects_factory ()), + poa_factory_ (TAO_Notify_Factory::get_poa_factory ()), + event_manager_objects_factory_ (TAO_Notify_Factory::get_event_manager_objects_factory ()), default_op_ (CosNotifyChannelAdmin::OR_OP), default_id_ (0), - is_destroyed_ (0), max_queue_length_ (0), max_consumers_ (0), - max_suppliers_ (0) + max_suppliers_ (0), + event_listener_list_ (0) { + channel_factory_->_add_ref (); } // Implementation skeleton destructor TAO_Notify_EventChannel_i::~TAO_Notify_EventChannel_i (void) { - /* ACE_DEBUG ((LM_DEBUG,"in EC dtor\n")); */ - // if (!this->is_destroyed_ == 0) - this->cleanup_i (); + ACE_DEBUG ((LM_DEBUG,"in EC dtor\n")); + // Cleanup all resources.. + + delete this->event_manager_; + delete this->lock_; + delete this->event_listener_list_; + + this->channel_factory_->event_channel_destroyed (this->channel_id_); + channel_factory_->_remove_ref (); } void -TAO_Notify_EventChannel_i::init (CosNotifyChannelAdmin::ChannelID channel_id, const CosNotification::QoSProperties& initial_qos, const CosNotification::AdminProperties& initial_admin, PortableServer::POA_ptr my_POA, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::init (CosNotifyChannelAdmin::ChannelID channel_id, const CosNotification::QoSProperties& initial_qos, const CosNotification::AdminProperties& initial_admin, PortableServer::POA_ptr default_POA, PortableServer::POA_ptr my_POA, CORBA::Environment &ACE_TRY_ENV) { this->channel_id_ = channel_id; + this->my_POA_ = PortableServer::POA::_duplicate (my_POA); + this->default_POA_ = PortableServer::POA::_duplicate (default_POA); + + this->lock_ = + this->channel_objects_factory_->create_event_channel_lock (ACE_TRY_ENV); + ACE_CHECK; + this->event_manager_ = - this->resource_manager_->create_event_manager (this, ACE_TRY_ENV); + this->event_manager_objects_factory_->create_event_manager (this, ACE_TRY_ENV); ACE_CHECK; this->event_manager_->init (ACE_TRY_ENV); ACE_CHECK; - my_POA_ = PortableServer::POA::_duplicate (my_POA); - // try to set initial qos params this->set_qos (initial_qos, ACE_TRY_ENV); ACE_CHECK; @@ -52,26 +74,29 @@ TAO_Notify_EventChannel_i::init (CosNotifyChannelAdmin::ChannelID channel_id, co // Create the POA for the CA's this->CA_POA_ = - this->resource_manager_->create_consumer_admin_POA (this->my_POA_.in (), - channel_id, - ACE_TRY_ENV); + this->poa_factory_->create_consumer_admin_POA (this->my_POA_.in (), channel_id, + ACE_TRY_ENV); ACE_CHECK; // Create the POA for the SA's this->SA_POA_ = - this->resource_manager_->create_supplier_admin_POA (this->my_POA_.in (), - channel_id, - ACE_TRY_ENV); + this->poa_factory_->create_supplier_admin_POA (this->my_POA_.in (), channel_id, + ACE_TRY_ENV); ACE_CHECK; + this->event_listener_list_ = + TAO_Notify_Factory::get_collection_factory ()->create_event_listener_list (ACE_TRY_ENV); + // Create the default Consumer Admin. Because the ID_Pool is being used // the first time here, it will generate the id 0. - CosNotifyChannelAdmin::AdminID id_unused; - this->new_for_consumers (default_op_, id_unused, ACE_TRY_ENV); + + CosNotifyChannelAdmin::ConsumerAdmin_var def_consumer_admin = + this->new_for_consumers (default_op_, id_unused, ACE_TRY_ENV); ACE_CHECK; - this->new_for_suppliers (default_op_, id_unused, ACE_TRY_ENV); + CosNotifyChannelAdmin::SupplierAdmin_var def_supplier_admin = + this->new_for_suppliers (default_op_, id_unused, ACE_TRY_ENV); ACE_CHECK; } @@ -84,34 +109,42 @@ TAO_Notify_EventChannel_i::get_event_manager (void) void TAO_Notify_EventChannel_i::consumer_admin_destroyed (CosNotifyChannelAdmin::AdminID CA_ID) { + ACE_GUARD (ACE_Lock, ace_mon, *this->lock_); + this->consumer_admin_ids_.put (CA_ID); } void TAO_Notify_EventChannel_i::supplier_admin_destroyed (CosNotifyChannelAdmin::AdminID SA_ID) { + ACE_GUARD (ACE_Lock, ace_mon, *this->lock_); + this->supplier_admin_ids_.put (SA_ID); } +PortableServer::POA_ptr +TAO_Notify_EventChannel_i::get_default_POA (void) +{ + return PortableServer::POA::_duplicate (this->default_POA_.in ()); +} + CosNotifyChannelAdmin::EventChannel_ptr TAO_Notify_EventChannel_i::get_ref (CORBA::Environment &ACE_TRY_ENV) { - CORBA::Object_var obj = this->resource_manager_-> + CORBA::Object_var obj = this->poa_factory_-> servant_to_reference (this->my_POA_.in (), this, ACE_TRY_ENV); ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil ()); return CosNotifyChannelAdmin::EventChannel::_narrow (obj.in ()); } + void -TAO_Notify_EventChannel_i::cleanup_i (CORBA::Environment &/*ACE_TRY_ENV*/) +TAO_Notify_EventChannel_i::unregister_listener (TAO_Notify_EventListener* group_listener, CORBA::Environment &ACE_TRY_ENV) { - // Cleanup all resources.. - this->CA_POA_ = PortableServer::POA::_nil (); - this->SA_POA_ = PortableServer::POA::_nil (); - this->my_POA_ = PortableServer::POA::_nil (); - - this->my_factory_->event_channel_destroyed (this->channel_id_); + // UnRegister the group listener. + this->event_listener_list_->disconnected (group_listener, ACE_TRY_ENV); + ACE_CHECK; } void @@ -120,27 +153,32 @@ TAO_Notify_EventChannel_i::destroy (CORBA::Environment &ACE_TRY_ENV) CORBA::SystemException )) { - this->is_destroyed_ = 1; - - this->resource_manager_->destroy_POA (this->CA_POA_.in (), - ACE_TRY_ENV); - this->resource_manager_->destroy_POA (this->SA_POA_.in (), - ACE_TRY_ENV); + this->event_manager_->shutdown (ACE_TRY_ENV); // Deactivate ourselves. - this->resource_manager_->deactivate_object (this, - this->my_POA_.in (), - ACE_TRY_ENV); + this->poa_factory_->deactivate_object (this, + this->my_POA_.in (), + ACE_TRY_ENV); + // shutdown consumer admins's. + TAO_Notify_Shutdown_Worker shutdown_worker; - delete this->event_manager_; - this->event_manager_ = 0; + this->event_listener_list_->for_each (&shutdown_worker, ACE_TRY_ENV); + ACE_CHECK; + + // release all references. + this->event_listener_list_->shutdown (ACE_TRY_ENV); + + this->poa_factory_->destroy_POA (this->CA_POA_.in (), + ACE_TRY_ENV); + this->poa_factory_->destroy_POA (this->SA_POA_.in (), + ACE_TRY_ENV); } CosNotifyChannelAdmin::EventChannelFactory_ptr TAO_Notify_EventChannel_i::MyFactory (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->my_factory_->get_ref (ACE_TRY_ENV); + return this->channel_factory_->get_ref (ACE_TRY_ENV); } CosNotifyChannelAdmin::ConsumerAdmin_ptr @@ -167,7 +205,7 @@ TAO_Notify_EventChannel_i::default_filter_factory (CORBA::Environment &/*ACE_TRY CORBA::SystemException )) { - return this->resource_manager_->get_default_filter_factory (); + return this->channel_factory_->get_default_filter_factory (); } CosNotifyChannelAdmin::ConsumerAdmin_ptr @@ -176,27 +214,38 @@ TAO_Notify_EventChannel_i::new_for_consumers (CosNotifyChannelAdmin::InterFilter CORBA::SystemException )) { - TAO_Notify_ConsumerAdmin_i* consumeradmin = - this->resource_manager_->create_consumer_admin (this, ACE_TRY_ENV); + // @@ use auto_ptr + TAO_Notify_ConsumerAdmin_i* consumer_admin = + this->channel_objects_factory_->create_consumer_admin (this, ACE_TRY_ENV); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ()); - PortableServer::ServantBase_var consumeradmin_var (consumeradmin); + PortableServer::ServantBase_var consumeradmin_var (consumer_admin); - id = this->consumer_admin_ids_.get (); + { + ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, + CORBA::INTERNAL ()); + ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ()); - consumeradmin->init (id, op, this->CA_POA_.in (), ACE_TRY_ENV); - ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ()); + id = this->consumer_admin_ids_.get (); - CORBA::Object_var obj = this->resource_manager_-> - activate_object_with_id (id, - this->CA_POA_.in (), - consumeradmin, - ACE_TRY_ENV); - ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ()); + consumer_admin->init (id, op, this->CA_POA_.in (), ACE_TRY_ENV); + ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ()); - this->consumer_admin_ids_.next (); + CORBA::Object_var obj = + this->poa_factory_->activate_object_with_id (id, + this->CA_POA_.in (), + consumer_admin, + ACE_TRY_ENV); + ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ()); - return CosNotifyChannelAdmin::ConsumerAdmin::_narrow (obj.in ()); + this->consumer_admin_ids_.next (); + + // Register the group listener. + this->event_listener_list_->connected (consumer_admin, ACE_TRY_ENV); + ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ()); + + return CosNotifyChannelAdmin::ConsumerAdmin::_narrow (obj.in ()); + } } CosNotifyChannelAdmin::SupplierAdmin_ptr @@ -206,26 +255,30 @@ TAO_Notify_EventChannel_i::new_for_suppliers (CosNotifyChannelAdmin::InterFilter )) { TAO_Notify_SupplierAdmin_i* supplieradmin = - this->resource_manager_->create_supplier_admin (this, ACE_TRY_ENV); + this->channel_objects_factory_->create_supplier_admin (this, ACE_TRY_ENV); ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ()); PortableServer::ServantBase_var supplieradmin_var (supplieradmin); - id = this->supplier_admin_ids_.get (); + { + ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, + CORBA::INTERNAL ()); + id = this->supplier_admin_ids_.get (); - supplieradmin->init (id, op, this->SA_POA_.in (), ACE_TRY_ENV); - ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ()); + supplieradmin->init (id, op, this->SA_POA_.in (), ACE_TRY_ENV); + ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ()); - CORBA::Object_var obj = this->resource_manager_-> - activate_object_with_id (id, - this->SA_POA_.in (), - supplieradmin, - ACE_TRY_ENV); - ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ()); + CORBA::Object_var obj = this->poa_factory_-> + activate_object_with_id (id, + this->SA_POA_.in (), + supplieradmin, + ACE_TRY_ENV); + ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ()); - supplier_admin_ids_.next (); + supplier_admin_ids_.next (); - return CosNotifyChannelAdmin::SupplierAdmin::_narrow (obj.in ()); + return CosNotifyChannelAdmin::SupplierAdmin::_narrow (obj.in ()); + } } CosNotifyChannelAdmin::ConsumerAdmin_ptr @@ -236,8 +289,8 @@ TAO_Notify_EventChannel_i::get_consumeradmin (CosNotifyChannelAdmin::AdminID id, )) { CORBA::Object_var obj = - this->resource_manager_->id_to_reference (id, this->CA_POA_.in (), - ACE_TRY_ENV); + this->poa_factory_->id_to_reference (id, this->CA_POA_.in (), + ACE_TRY_ENV); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ()); return CosNotifyChannelAdmin::ConsumerAdmin::_narrow (obj.in ()); @@ -251,8 +304,8 @@ TAO_Notify_EventChannel_i::get_supplieradmin (CosNotifyChannelAdmin::AdminID id, )) { CORBA::Object_var obj = - this->resource_manager_->id_to_reference (id, this->SA_POA_.in (), - ACE_TRY_ENV); + this->poa_factory_->id_to_reference (id, this->SA_POA_.in (), + ACE_TRY_ENV); ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ()); return CosNotifyChannelAdmin::SupplierAdmin::_narrow (obj.in ()); @@ -273,6 +326,10 @@ TAO_Notify_EventChannel_i::get_all_supplieradmins (CORBA::Environment &ACE_TRY_E CORBA::SystemException )) { + ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, + CORBA::INTERNAL ()); + ACE_CHECK_RETURN (0); + return this->supplier_admin_ids_.get_sequence (ACE_TRY_ENV); } @@ -370,7 +427,7 @@ TAO_Notify_EventChannel_i::for_consumers (CORBA::Environment& ACE_TRY_ENV) CORBA::SystemException )) { - // There is not no way to destroy CosEventChannelAdmin::ConsumerAdmins + // There is no way to destroy CosEventChannelAdmin::ConsumerAdmin's // so we just return the default Consumer Admin here. // TODO: find a way to disable the destroy method in the default Admin. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h index 418b8d6169d..49cffe72508 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h @@ -27,10 +27,15 @@ #include "orbsvcs/CosNotifyChannelAdminS.h" #include "Notify_ID_Pool_T.h" #include "Notify_QoSAdmin_i.h" -#include "Notify_Event_Manager.h" +#include "Notify_Collection.h" class TAO_Notify_EventChannelFactory_i; class TAO_Notify_Resource_Manager; +class TAO_Notify_Event_Manager; +class TAO_Notify_CO_Factory; +class TAO_Notify_POA_Factory; +class TAO_Notify_EMO_Factory; +class TAO_Notify_EventListener; #if defined(_MSC_VER) #if (_MSC_VER >= 1200) @@ -49,10 +54,19 @@ class TAO_Notify_Export TAO_Notify_EventChannel_i : public virtual POA_CosNotify // This class handles all the object factory functionality.All the event // routing is handled by its contained Event Manager class. // + // = MISC. NOTES + // This class creates and owns 2 child POA's. one to contain CA's and the other for SA's. + // Now, a Channel object can be destoyed in 2 ways - as a side effect of its parent POA being + // destroyed or if this class's <destroy> method is invoked. If the object is being destroyed + // as a result of its Parent POA being destroyed, it is illegal to destroy a childPOA + // because, the root poa destruction will destroy all child poa's. + // So in the destructor we conditionally check if the child POAs should be destroyed explicitly + // or not. + // public: - TAO_Notify_EventChannel_i (TAO_Notify_EventChannelFactory_i* my_factory, TAO_Notify_Resource_Manager* resource_manager); + TAO_Notify_EventChannel_i (TAO_Notify_EventChannelFactory_i* channel_factory); // Constructor. - // <my_factory> is the parent. + // <channel_factory> is the parent. virtual ~TAO_Notify_EventChannel_i (void); // Destructor @@ -60,13 +74,16 @@ class TAO_Notify_Export TAO_Notify_EventChannel_i : public virtual POA_CosNotify void init (CosNotifyChannelAdmin::ChannelID channel_id, const CosNotification::QoSProperties& initial_qos, const CosNotification::AdminProperties& initial_admin, + PortableServer::POA_ptr default_POA, PortableServer::POA_ptr my_POA, CORBA::Environment &ACE_TRY_ENV); // Initialize this object. // checks if the <initial_qos> and <initial admin> are valid. // creates default filter, consumer admin and supplier admin. - // If any part of the initialization fails, the <cleanup_i> method - // is called to undo any resource allocations. + + // = Accessors + PortableServer::POA_ptr get_default_POA (void); + // Get the default POA. CosNotifyChannelAdmin::EventChannel_ptr get_ref (CORBA::Environment &ACE_TRY_ENV); // Get the CORBA object for this servant @@ -74,12 +91,17 @@ class TAO_Notify_Export TAO_Notify_EventChannel_i : public virtual POA_CosNotify TAO_Notify_Event_Manager* get_event_manager (void); // Get the event manager. + // = Child destroyed notification. void consumer_admin_destroyed (CosNotifyChannelAdmin::AdminID CA_ID); // This id is no longer in use.It can be reused by <consumer_admin_ids_>. void supplier_admin_destroyed (CosNotifyChannelAdmin::AdminID SA_ID); // This id is no longer in use.It can be reused by <supplier_admin_ids_>. + void unregister_listener (TAO_Notify_EventListener* group_listener, CORBA::Environment &ACE_TRY_ENV); + // Consumer Admin's are Group Listeners that are registered automatically with the EC when a ConsumerAdmin + // is created. When a consumer is destroyed, it asks the EC to unregister itself. + // = Interface methods virtual CosNotifyChannelAdmin::EventChannelFactory_ptr MyFactory ( CORBA::Environment &ACE_TRY_ENV @@ -223,40 +245,51 @@ virtual CosNotification::QoSProperties * get_qos ( )); protected: - // = Helper Methods - void cleanup_i (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); - // Cleanup all resources used by this object. + // = Data Members + ACE_Lock* lock_; + // The locking strategy. + + CORBA::Boolean destory_child_POAs_; + // Flag to tell our destructor if we should destroy the CA and SA POA's. + // default is false, the parent poa destruction will remove these. + // set to true if the <destroy> method is invoked. + + TAO_Notify_EventChannelFactory_i* channel_factory_; + // The factory that created us. - // = Data Members - TAO_Notify_EventChannelFactory_i* my_factory_; - // The factory that created us. + PortableServer::POA_var default_POA_; + // The default POA in which we activate objects that don't have ids' pre-assigned. - PortableServer::POA_var my_POA_; - // The POA in which i live. + PortableServer::POA_var my_POA_; + // The POA in which i live. - PortableServer::POA_var CA_POA_; - // The POA in which we should activate ConsumerAdmins in. - // We create and own this. + PortableServer::POA_var CA_POA_; + // The POA in which we should activate ConsumerAdmins in. + // We create and own this. - PortableServer::POA_var SA_POA_; - // The POA in which we should activate SupplierAdmins in. - // We create and own this. + PortableServer::POA_var SA_POA_; + // The POA in which we should activate SupplierAdmins in. + // We create and own this. - CosNotifyChannelAdmin::ChannelID channel_id_; - // The ID assigned to this channel. + CosNotifyChannelAdmin::ChannelID channel_id_; + // The ID assigned to this channel. - TAO_Notify_Resource_Manager* resource_manager_; - // We get this factory from the EventChannelFactory who owns it. - // This factory is accessible to all the objects created in this - // Event Channel. + TAO_Notify_CO_Factory* channel_objects_factory_; + // The factory for channel objects. - TAO_Notify_ID_Pool_Ex<CosNotifyChannelAdmin::AdminID, - CosNotifyChannelAdmin::AdminIDSeq> consumer_admin_ids_; - // Id generator for consumer admins. + TAO_Notify_POA_Factory* poa_factory_; + // The factory for POA based containers. - TAO_Notify_ID_Pool_Ex<CosNotifyChannelAdmin::AdminID, - CosNotifyChannelAdmin::AdminIDSeq> supplier_admin_ids_; - // Id generator for supplier admins. + TAO_Notify_EMO_Factory* event_manager_objects_factory_; + // Event manager objects factory, + + TAO_Notify_ID_Pool_Ex<CosNotifyChannelAdmin::AdminID, + CosNotifyChannelAdmin::AdminIDSeq> consumer_admin_ids_; + // Id generator for consumer admins. + + TAO_Notify_ID_Pool_Ex<CosNotifyChannelAdmin::AdminID, + CosNotifyChannelAdmin::AdminIDSeq> supplier_admin_ids_; + // Id generator for supplier admins. const CosNotifyChannelAdmin::InterFilterGroupOperator default_op_; // Default InterFilterGroupOperator operator used when creating @@ -265,9 +298,6 @@ protected: const CosNotifyChannelAdmin::AdminID default_id_; // Default id's to CosEventChannelAdmin::ConsumerAdmin, SupplierAdmin. - CORBA::Boolean is_destroyed_; - // Flag to tell if we have be destroyed. - // @@ Pradeep can you explain why there is any maximum for these // values? Should they be configurable by the user so the resource // requirements can be bounded? @@ -292,6 +322,9 @@ protected: TAO_Notify_Event_Manager* event_manager_; // The event manager. + + TAO_Notify_EventListener_List* event_listener_list_; + // The list of group event listeners that have registered with us. }; #if defined(_MSC_VER) && (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.cpp new file mode 100644 index 00000000000..1c4d8d15f7b --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.cpp @@ -0,0 +1,31 @@ +// $Id$ + +#include "Notify_Event_Dispatch_Command.h" +#include "Notify_Listeners.h" +#include "Notify_Event.h" + +ACE_RCSID(Notify, TAO_Notify_Event_Dispatch_Command, "$Id$") + +TAO_Notify_Event_Dispatch_Command::TAO_Notify_Event_Dispatch_Command (TAO_Notify_Event* event, TAO_Notify_EventListener* event_listener) + :event_ (event), + event_listener_ (event_listener) +{ + event_listener_->_incr_refcnt (); + this->event_->_incr_refcnt (); +} + +TAO_Notify_Event_Dispatch_Command::~TAO_Notify_Event_Dispatch_Command () +{ + ACE_DEBUG ((LM_DEBUG, "in ~TAO_Notify_Event_Dispatch_Command\n")); + event_listener_->_decr_refcnt (); + this->event_->_decr_refcnt (); +} + +int +TAO_Notify_Event_Dispatch_Command::execute (TAO_Notify_Worker_Task* /*parent_task*/, CORBA::Environment& ACE_TRY_ENV) +{ + this->event_listener_->dispatch_event (*this->event_, ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + return 0; +} diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.h new file mode 100644 index 00000000000..4f6d58e54e3 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.h @@ -0,0 +1,57 @@ +/* -*- C++ -*- */ +// $Id$ +// +// ============================================================================ +// +// = LIBRARY +// ORBSVCS Notification +// +// = FILENAME +// Notify_Event_Dispatch_Command.h +// +// = DESCRIPTION +// Definition for the Command object responsible for dispatching events to consumers. +// +// = AUTHOR +// Pradeep Gore <pradeep@cs.wustl.edu> +// +// ============================================================================ + +#ifndef TAO_NOTIFY_EVENT_DISPATCH_COMMAND_H +#define TAO_NOTIFY_EVENT_DISPATCH_COMMAND_H + +#include "ace/pre.h" +#include "Notify_Command.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +class TAO_Notify_Event; +class TAO_Notify_EventListener; +class TAO_Notify_Worker_Task; + +class TAO_Notify_Export TAO_Notify_Event_Dispatch_Command : public TAO_Notify_Command +{ + // = TITLE + // TAO_Notify_Event_Dispatch_Command + // + // = DESCRIPTION + // The Command for dispatching to a consumer. + // + public: + // = Initialization and termination code. + TAO_Notify_Event_Dispatch_Command (TAO_Notify_Event* event, TAO_Notify_EventListener* event_listener); + ~TAO_Notify_Event_Dispatch_Command (); + + virtual int execute (TAO_Notify_Worker_Task* parent_task, CORBA::Environment& ACE_TRY_ENV); + // Command callback + + protected: + // = Data Members + TAO_Notify_Event* event_; + TAO_Notify_EventListener* event_listener_; +}; + +#include "ace/post.h" +#endif /* TAO_NOTIFY_EVENT_DISPATCH_COMMAND_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp index 31b7dedff6f..5e47be552f2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp @@ -1,382 +1,154 @@ // $Id$ +#include "orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/ESF/ESF_Proxy_Collection.h" #include "Notify_Event_Manager.h" #include "Notify_EventChannel_i.h" +#include "Notify_Event_Map.h" +#include "Notify_Event_Processor.h" +#include "Notify_Worker_Task.h" +#include "Notify_Update_Dispatch_Command.h" +#include "Notify_Factory.h" +#include "Notify_Event_Manager_Objects_Factory.h" +#include "Notify_Event.h" + +#if ! defined (__ACE_INLINE__) +#include "Notify_Event_Manager.i" +#endif /* __ACE_INLINE__ */ ACE_RCSID(Notify, Notify_Event_Manager, "$Id$") TAO_Notify_Event_Manager::TAO_Notify_Event_Manager (TAO_Notify_EventChannel_i* event_channel) - :event_channel_ (event_channel) + :event_channel_ (event_channel), + event_map_ (0), + event_processor_ (0), + updates_dispatching_task_ (0), + emo_factory_ (TAO_Notify_Factory::get_event_manager_objects_factory ()) { - // No-Op. } TAO_Notify_Event_Manager::~TAO_Notify_Event_Manager () { - // No-Op. + delete this->event_map_; + delete this->event_processor_; + delete this->updates_dispatching_task_; + delete this->lock_; } void -TAO_Notify_Event_Manager::init (CORBA::Environment &/*ACE_TRY_ENV*/) +TAO_Notify_Event_Manager::init (CORBA::Environment &ACE_TRY_ENV) { - // No-Op. -} - -void -TAO_Notify_Event_Manager::subscribe_for_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List* current, const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, CORBA::Environment &ACE_TRY_ENV) -{ - TAO_Notify_EventType_List added_update, removed_update; + ACE_NEW_THROW_EX (this->lock_, + ACE_Lock_Adapter<ACE_SYNCH_MUTEX> (), + CORBA::NO_MEMORY ()); - this->subscribe_for_events_i (event_listener, current, added_update, - added, ACE_TRY_ENV); + // Create members. + this->event_map_ = + this->emo_factory_->create_event_map (ACE_TRY_ENV); ACE_CHECK; - this->unsubscribe_from_events_i (event_listener, current, removed_update, - removed, ACE_TRY_ENV); + this->event_processor_ = + this->emo_factory_->create_event_processor (this, ACE_TRY_ENV); ACE_CHECK; - // if either of the lists are *not* empty, send updates - if (added_update.is_empty () == 0 || removed_update.is_empty () == 0) - this->dispatch_updates_i (this->subscription_change_listeners_, - added_update, removed_update, ACE_TRY_ENV); -} - -void -TAO_Notify_Event_Manager::subscribe_for_events (TAO_Notify_EventListener_List& event_listener_list, TAO_Notify_EventType_List* current, const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, CORBA::Environment &ACE_TRY_ENV) -{ - TAO_Notify_EventType_List added_update, removed_update; + this->updates_dispatching_task_ = + // @@ add another method to RM + this->emo_factory_->create_dispatching_task (this, ACE_TRY_ENV); + ACE_CHECK; - this->subscribe_for_events_i (event_listener_list, current, added_update, - added, ACE_TRY_ENV); + // Init the objects + this->event_map_->init (ACE_TRY_ENV); ACE_CHECK; - this->unsubscribe_from_events_i (event_listener_list, current, - removed_update, removed, ACE_TRY_ENV); + this->event_processor_->init (ACE_TRY_ENV); ACE_CHECK; - // if either of the lists are *not* empty, send updates - if (added_update.is_empty () == 0 || removed_update.is_empty () == 0) - this->dispatch_updates_i (this->subscription_change_listeners_, - added_update, removed_update, ACE_TRY_ENV); + // @@ check return value + this->updates_dispatching_task_->open (0); } void -TAO_Notify_Event_Manager::subscribe_for_events_i (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List* current, TAO_Notify_EventType_List& update, const CosNotification::EventTypeSeq & added, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Event_Manager::shutdown (CORBA::Environment &ACE_TRY_ENV) { - TAO_Notify_EventListener_List* event_listener_list; - TAO_Notify_EventType event_type; - - for (CORBA::ULong index = 0; index < added.length (); index++) - { - event_type = added[index]; -#if 0 - ACE_DEBUG ((LM_DEBUG, "subscribing %x for event: %s, %s\n", - event_listener, - event_type.event_type_.domain_name.in (), - event_type.event_type_.type_name.in ())); -#endif - if (event_type.is_special ()) - event_listener_list = &default_subscription_list_; - else if (this->event_recipient_map_.find (event_type, - event_listener_list) == -1) - { - // create the list. - TAO_Notify_EventListener_List* new_list; - - ACE_NEW_THROW_EX (new_list, - TAO_Notify_EventListener_List (), - CORBA::NO_MEMORY ()); - - // add the list to the recipient map. - this->event_recipient_map_.bind (event_type, new_list); - event_listener_list = new_list; - } - - event_listener_list->insert (event_listener); - - // mirror changes in the subscription list - if (this->subscription_list_.insert (event_type) == 0) - update.insert (event_type); - - // update the caller's current subscription list - if (current != 0) - current->insert (event_type); - } -} + ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, + CORBA::INTERNAL ()); + ACE_CHECK; -void -TAO_Notify_Event_Manager::subscribe_for_events_i (TAO_Notify_EventListener_List& list_to_add, TAO_Notify_EventType_List* current, TAO_Notify_EventType_List& update, const CosNotification::EventTypeSeq & added, CORBA::Environment &ACE_TRY_ENV) -{ - TAO_Notify_EventListener_List* event_listener_list; - TAO_Notify_EventType event_type; - - for (CORBA::ULong index = 0; index < added.length (); index++) - { - event_type = added[index]; - - if (event_type.is_special ()) - event_listener_list = &default_subscription_list_; - else if (this->event_recipient_map_.find (event_type, - event_listener_list) == -1) - { - // create the list. - TAO_Notify_EventListener_List* new_list; - - ACE_NEW_THROW_EX (new_list, - TAO_Notify_EventListener_List (), - CORBA::NO_MEMORY ()); - - // add the list to the recipient map. - this->event_recipient_map_.bind (event_type, new_list); - event_listener_list = new_list; - } - - TAO_Notify_EventListener_List::ITERATOR iter (list_to_add); - - TAO_Notify_EventListener** event_listener; - - for (iter.first (); iter.next (event_listener); iter.advance ()) - { -#if 0 - ACE_DEBUG ((LM_DEBUG, "subscribing %x for event: %s, %s\n", - *event_listener, - event_type.event_type_.domain_name.in (), - event_type.event_type_.type_name.in ())); -#endif - ACE_ASSERT (*event_listener != 0); - event_listener_list->insert (*event_listener); - } - - // mirror changes in the subscription list - if (this->subscription_list_.insert (event_type) == 0) - update.insert (event_type); - - // update the caller's current subscription list - if (current != 0) - current->insert (event_type); - } -} + this->event_processor_->shutdown (ACE_TRY_ENV); + ACE_CHECK; -void -TAO_Notify_Event_Manager::unsubscribe_from_events_i (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List* current, TAO_Notify_EventType_List &update, const CosNotification::EventTypeSeq & removed, CORBA::Environment &/*ACE_TRY_ENV*/) -{ - TAO_Notify_EventListener_List* event_listener_list; - TAO_Notify_EventType event_type; - - for (CORBA::ULong index = 0; index < removed.length (); index++) - { - event_type = removed[index]; - - // find out if there is a event listener list for this event type. - if (event_type.is_special ()) - event_listener_list = &this->default_subscription_list_; - else if (this->event_recipient_map_.find (event_type, - event_listener_list) == -1) - continue; - - // remove <event_listener> from the list. - - event_listener_list->remove (event_listener); - - // If this was the last entry in the list then we should remove - // the corrsponding event_type from the recipient_map. - // However i'm going to leave the blank entries based on the assumption - // that a system will have a fixed set of event types. - // This way we save that cost of creating a new entry in the map and - // its corresponding listener list when an event type seen before - // shows up again. - // Later we could add logic to check at non-time-critical points, if - // the map has grown too big and prune it. (lazy evaluation). - - // mirror changes in the subscription list - if (this->subscription_list_.remove (event_type) == 0) - update.insert (event_type); // modify the update list. - - if (current != 0) - current->remove (event_type); - } -} + this->event_map_->shutdown (ACE_TRY_ENV); + ACE_CHECK; -void -TAO_Notify_Event_Manager::unsubscribe_from_events_i (TAO_Notify_EventListener_List& list_to_add, TAO_Notify_EventType_List* current, TAO_Notify_EventType_List &update, const CosNotification::EventTypeSeq & removed, CORBA::Environment &/*ACE_TRY_ENV*/) -{ - TAO_Notify_EventListener_List* event_listener_list; - TAO_Notify_EventType event_type; - - for (CORBA::ULong index = 0; index < removed.length (); index++) - { - event_type = removed[index]; - - // find out if there is a event listener list for this event type. - if (event_type.is_special ()) - event_listener_list = &this->default_subscription_list_; - else if (this->event_recipient_map_.find (event_type, - event_listener_list) == -1) - continue; - - TAO_Notify_EventListener_List::ITERATOR iter (list_to_add); - - TAO_Notify_EventListener** event_listener; - - for (iter.first (); iter.next (event_listener); iter.advance ()) - { - ACE_ASSERT (*event_listener != 0); - // remove <event_listener> from the list. - event_listener_list->remove (*event_listener); - } - - // mirror changes in the subscription list - if (this->subscription_list_.remove (event_type) == 0) - update.insert (event_type); // modify the update list. - - if (current != 0) - current->remove (event_type); - } + this->updates_dispatching_task_->shutdown (ACE_TRY_ENV); } void -TAO_Notify_Event_Manager::push (TAO_Notify_Event& event, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Event_Manager::subscribe_for_events (TAO_Notify_EventListener* event_listener, const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, CORBA::Environment &ACE_TRY_ENV) { - // If the event is *not* the special event - // send it to the list that matches it. - // In any case send it to the default list. -#if 0 - ACE_DEBUG ((LM_DEBUG, "finding a match for event: %s, %s\n", - event.event_type ().event_type_.domain_name.in (), - event.event_type ().event_type_.type_name.in ())); -#endif - if (!event.is_special_event_type ()) - { - TAO_Notify_EventListener_List* subscription_list; - // find the subscription list for <event_type> - if (this->event_recipient_map_.find (event.event_type (), - subscription_list) == 0) - { - this->dispatch_event_i (event, subscription_list, ACE_TRY_ENV); - } - } - // Those subscribed for the default events get everything. - if (this->default_subscription_list_.is_empty () == 0) - { - this->dispatch_event_i (event, - &default_subscription_list_, ACE_TRY_ENV); - ACE_CHECK; - } -} + TAO_Notify_EventType_List added_update, removed_update; -void -TAO_Notify_Event_Manager::dispatch_event_i (TAO_Notify_Event &event, TAO_Notify_EventListener_List* proxy_list, CORBA::Environment &ACE_TRY_ENV) -{ - TAO_Notify_EventListener_List::ITERATOR iter (*proxy_list); + this->event_map_->subscribe_for_events (event_listener, added_update, + added, ACE_TRY_ENV); + ACE_CHECK; - TAO_Notify_EventListener** event_listener; + this->event_map_->unsubscribe_from_events (event_listener, removed_update, + removed, ACE_TRY_ENV); + ACE_CHECK; - for (iter.first (); iter.next (event_listener); iter.advance ()) - { - ACE_ASSERT (*event_listener != 0); - (*event_listener)->dispatch_event (event, ACE_TRY_ENV); - } + // if either of the lists are *not* empty, send updates + if (added_update.is_empty () == 0 || removed_update.is_empty () == 0) + this->dispatch_updates_i (this->event_map_->subscription_change_listeners (), + added_update, removed_update, ACE_TRY_ENV); } void -TAO_Notify_Event_Manager::dispatch_updates_i (TAO_Notify_UpdateListener_List& update_listener_list, TAO_Notify_EventType_List& added, TAO_Notify_EventType_List& removed, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Event_Manager::update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, CORBA::Environment &ACE_TRY_ENV) { - TAO_Notify_UpdateListener_List::ITERATOR iter (update_listener_list); + TAO_Notify_EventType_List added_list; + TAO_Notify_EventType_List removed_list; - TAO_Notify_UpdateListener** update_listener; + this->event_map_->update_publication_list (added, removed, + added_list, removed_list, ACE_TRY_ENV); + ACE_CHECK; - for (iter.first (); iter.next (update_listener); iter.advance ()) - { - (*update_listener)->dispatch_update (added, removed, ACE_TRY_ENV); - } + // if either of the lists are *not* empty, send updates + if (added_list.is_empty () == 0 || removed_list.is_empty () == 0) + this->dispatch_updates_i (this->event_map_->publication_change_listeners (), + added_list, removed_list, ACE_TRY_ENV); } void -TAO_Notify_Event_Manager::register_for_publication_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment& /*ACE_TRY_ENV*/) +TAO_Notify_Event_Manager::dispatch_updates_i (TAO_Notify_UpdateListener_List* update_listener_list, TAO_Notify_EventType_List& added, TAO_Notify_EventType_List& removed, CORBA::Environment &ACE_TRY_ENV) { - this->publication_change_listeners_.insert (update_listener); -} + ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, + CORBA::INTERNAL ()); -void -TAO_Notify_Event_Manager::register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment& /*ACE_TRY_ENV*/) -{ - this->subscription_change_listeners_.insert (update_listener); -} + TAO_Notify_Update_Worker update_worker (this->updates_dispatching_task_, + added, removed); -void -TAO_Notify_Event_Manager:: unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment& /*ACE_TRY_ENV*/) -{ - this->subscription_change_listeners_.remove (update_listener); + update_listener_list->for_each (&update_worker, ACE_TRY_ENV); } -void -TAO_Notify_Event_Manager::unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment& /*ACE_TRY_ENV*/) -{ - this->publication_change_listeners_.remove (update_listener); -} +/********************************************************************/ -CosNotification::EventTypeSeq* -TAO_Notify_Event_Manager::obtain_offered_types (void) +TAO_Notify_Update_Worker::TAO_Notify_Update_Worker (TAO_Notify_Worker_Task * updates_dispatching_task, TAO_Notify_EventType_List& added, TAO_Notify_EventType_List& removed) + : added_ (added), + removed_ (removed), + updates_dispatching_task_ (updates_dispatching_task) { - CosNotification::EventTypeSeq* event_type_seq; - - ACE_NEW_RETURN (event_type_seq, - CosNotification::EventTypeSeq(this->publication_list_.size ()), - 0); - - this->publication_list_.populate (*event_type_seq); - - return event_type_seq; -} - -CosNotification::EventTypeSeq* -TAO_Notify_Event_Manager::obtain_subscription_types (void) -{ - CosNotification::EventTypeSeq* event_type_seq; - - ACE_NEW_RETURN (event_type_seq, - CosNotification::EventTypeSeq(this->subscription_list_.size ()), - 0); - - this->subscription_list_.populate (*event_type_seq); - - return event_type_seq; } void -TAO_Notify_Event_Manager::update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Update_Worker::work (TAO_Notify_UpdateListener* listener, CORBA::Environment &ACE_TRY_ENV) { - TAO_Notify_EventType event_type; - - TAO_Notify_EventType_List added_list; - TAO_Notify_EventType_List removed_list; + TAO_Notify_Update_Dispatch_Command* mb = + new TAO_Notify_Update_Dispatch_Command (listener, this->added_, + this->removed_); - CORBA::ULong len = removed.length (); - CORBA::ULong i = 0 ; - for (; i < len; ++i) - { - event_type = removed[i]; - if (this->publication_list_.remove (event_type) == 0) - { - removed_list.insert (event_type); - } - } - - len = added.length (); - for (i = 0; i < len; i++) - { - event_type = added[i]; - if (this->publication_list_.insert (event_type) == 0) - { - added_list.insert (event_type); - } - } - - // if either of the lists are *not* empty, send updates - if (added_list.is_empty () == 0 || removed_list.is_empty () == 0) - this->dispatch_updates_i (this->publication_change_listeners_, - added_list, removed_list, ACE_TRY_ENV); + this->updates_dispatching_task_->process_event (mb, ACE_TRY_ENV); } +/********************************************************************/ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Hash_Map_Entry<TAO_Notify_EventType, TAO_Notify_EventListener_List *>; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h index e46df7bc1d1..2b5f34aec6e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h @@ -18,18 +18,29 @@ #ifndef TAO_NOTIFY_EVENT_MANAGER #define TAO_NOTIFY_EVENT_MANAGER #include "ace/pre.h" -#include "ace/Containers_T.h" +#include "orbsvcs/CosNotificationC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Notify_Listeners.h" -#include "Notify_Types.h" +#include "orbsvcs/ESF/ESF_Worker.h" +#include "Notify_Collection.h" +#include "notify_export.h" class TAO_Notify_EventChannel_i; - -class TAO_Notify_Event_Manager +class TAO_Notify_Event; +class TAO_Notify_Event_Processor; +class TAO_Notify_Event_Map; +class TAO_Notify_Update_Dispatcher; +class TAO_Notify_EventSource; +class TAO_Notify_EventListener; +class TAO_Notify_UpdateListener; +class TAO_Notify_Worker_Task; +class TAO_Notify_EMO_Factory; +class TAO_Notify_Event_Processor; + +class TAO_Notify_Export TAO_Notify_Event_Manager { // = TITLE // TAO_Notify_Event_Manager @@ -49,15 +60,14 @@ class TAO_Notify_Event_Manager void init (CORBA::Environment &ACE_TRY_ENV); // Init + void shutdown (CORBA::Environment &ACE_TRY_ENV); + // Shutdown operations. + // = Publish/Subscribe management // = Subscription - void subscribe_for_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List* current, const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, CORBA::Environment &ACE_TRY_ENV); + void subscribe_for_events (TAO_Notify_EventListener* event_listener, const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, CORBA::Environment &ACE_TRY_ENV); // Subscribes <event_listener> for events <added>. // Unsubscribes <event_listener> for events <removed>. - // Updates the <current> subscription. - - void subscribe_for_events (TAO_Notify_EventListener_List& event_listener_list, TAO_Notify_EventType_List* current, const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, CORBA::Environment &ACE_TRY_ENV); - // Subscribes the whole group. // = Publications void update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, CORBA::Environment &ACE_TRY_ENV); @@ -65,79 +75,90 @@ class TAO_Notify_Event_Manager // what kind of events they expect to produce. // = Updates - void unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment &ACE_TRY_ENV); - // Unregister from subscription updates. - void register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment &ACE_TRY_ENV); // Registers the subscription update listener with the Event Manager. + void unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment &ACE_TRY_ENV); + // Unregister from subscription updates. + void register_for_publication_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment &ACE_TRY_ENV); // Registers the publication update listener with the Event Manager. void unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment &ACE_TRY_ENV); // Unregister from publication updates. + // = Accessors CosNotification::EventTypeSeq* obtain_offered_types(void); // Obtain the publication list. CosNotification::EventTypeSeq* obtain_subscription_types (void); // Obtain the subscription list. + TAO_Notify_Event_Map* event_map (void); + // Get the event map. + + TAO_Notify_Event_Processor* event_processor (void); + // Ge the Event Processor. + // = Event forwarding methods. - void push (TAO_Notify_Event& event, CORBA::Environment &ACE_TRY_ENV); + void process_event (TAO_Notify_Event* event, TAO_Notify_EventSource* event_source, CORBA::Environment &ACE_TRY_ENV); // Delivers the event to listeners subscribed for <event> + // <event_source> is the <event> source to the Event Manager. protected: - // = Helpers - void subscribe_for_events_i (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List* current, TAO_Notify_EventType_List& update, const CosNotification::EventTypeSeq & added, CORBA::Environment &ACE_TRY_ENV); - - void subscribe_for_events_i (TAO_Notify_EventListener_List& event_listener_list, TAO_Notify_EventType_List* current, TAO_Notify_EventType_List& update, const CosNotification::EventTypeSeq & added, CORBA::Environment &ACE_TRY_ENV); - - void unsubscribe_from_events_i (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List* current, TAO_Notify_EventType_List &update, const CosNotification::EventTypeSeq & removed, CORBA::Environment &ACE_TRY_ENV); - - void unsubscribe_from_events_i (TAO_Notify_EventListener_List& event_listener_list, TAO_Notify_EventType_List* current, TAO_Notify_EventType_List &update, const CosNotification::EventTypeSeq & removed, CORBA::Environment &ACE_TRY_ENV); + // = Event dispatching methods. + void dispatch_updates_i (TAO_Notify_UpdateListener_List* update_listener_list, TAO_Notify_EventType_List& added, TAO_Notify_EventType_List& removed, CORBA::Environment &ACE_TRY_ENV); + // Dispatch the updates to the <update_listener_list> - // = Event and updates dispatching methods. - void dispatch_event_i (TAO_Notify_Event& event, TAO_Notify_EventListener_List* event_listener_list, CORBA::Environment &ACE_TRY_ENV); - // Dispatches <event> to the list. + // = Data members. + TAO_Notify_EventChannel_i * event_channel_; + // The Event Channel that we're managing for. - void dispatch_updates_i (TAO_Notify_UpdateListener_List& update_listener_list, TAO_Notify_EventType_List& added, TAO_Notify_EventType_List& removed, CORBA::Environment &ACE_TRY_ENV); - // Dispatch the updates to the <update_listener_list> + TAO_Notify_Event_Map* event_map_; + // Container for event <-> source/sinks mappings. - // = Typedefs - typedef ACE_Hash_Map_Manager <TAO_Notify_EventType, TAO_Notify_EventListener_List*, ACE_SYNCH_MUTEX> EVENT_RECIPIENT_MAP; + TAO_Notify_Event_Processor * event_processor_; + // Handles processing of events. - // = Data Members - TAO_Notify_EventChannel_i* event_channel_; - // The Event Channel that we're managing for. + TAO_Notify_Worker_Task * updates_dispatching_task_; + // Dispatches updates to update listeners. - EVENT_RECIPIENT_MAP event_recipient_map_; - // A Map of event types and the groups of event listeners interested in them. - // The keys of the map are a list of events that consumers have currently - // subscribed for. + TAO_Notify_EMO_Factory* emo_factory_; + // Event manager objects factory. - TAO_Notify_EventListener_List default_subscription_list_; - // Save a reference to the default list, we don't want to spend time - // looking for it in the <event_recipient_map>. + ACE_Lock* lock_; + // The locking strategy. +}; - TAO_Notify_EventType_List publication_list_; - // The list of event types that are being currently published by suppliers. +/**************************************************************************/ - TAO_Notify_EventType_List subscription_list_; - // The list of event types that are being currently subscribed to by - // consumers. This list is the same as the list of keys in the - // <event_recepient_map>. We keep a copy of that list here to reduce - // contention for the map which will be accessed for every event that - // enters the system. +class TAO_Notify_Export TAO_Notify_Update_Worker : public TAO_ESF_Worker<TAO_Notify_UpdateListener> +{ + // = TITLE + // TAO_Notify_Update_Worker + // + // = DESCRIPTION + // Worker to send update commands to the updates dispatching task. + // + public: + // = Initialization and termination code. + TAO_Notify_Update_Worker (TAO_Notify_Worker_Task * updates_dispatching_task, TAO_Notify_EventType_List& added, TAO_Notify_EventType_List& removed); - TAO_Notify_UpdateListener_List subscription_change_listeners_; - // This is a list of listeners that want to be notified if the subsciptions - // from consumers changes the <event_recipient_map_> keys. + // = TAO_ESF_Worker method + void work (TAO_Notify_UpdateListener* listener, CORBA::Environment &ACE_TRY_ENV); + protected: + // = Data members. + TAO_Notify_EventType_List& added_; + TAO_Notify_EventType_List& removed_; + // Data to transmit. - TAO_Notify_UpdateListener_List publication_change_listeners_; - // This is a list of listeners that want to be notified if the publications - // from suppliers changes the <publication_list_>. + TAO_Notify_Worker_Task * updates_dispatching_task_; + // Update dispatcher }; +#if defined (__ACE_INLINE__) +#include "Notify_Event_Manager.i" +#endif /* __ACE_INLINE__ */ + #include "ace/post.h" #endif /* TAO_NOTIFY_EVENT_MANAGER */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.i b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.i new file mode 100644 index 00000000000..1b979a93d17 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.i @@ -0,0 +1,62 @@ +//$Id$ +#include "Notify_Listeners.h" +#include "Notify_Event_Map.h" +#include "Notify_Event_Processor.h" + +ACE_INLINE void +TAO_Notify_Event_Manager::process_event (TAO_Notify_Event* event, TAO_Notify_EventSource* event_source, CORBA::Environment &ACE_TRY_ENV) +{ + this->event_processor_->process_event (event, event_source, ACE_TRY_ENV); +} + +ACE_INLINE void +TAO_Notify_Event_Manager::register_for_publication_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment& ACE_TRY_ENV) +{ + this->event_map_->register_for_publication_updates (update_listener, + ACE_TRY_ENV); +} + +ACE_INLINE void +TAO_Notify_Event_Manager::register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment& ACE_TRY_ENV) +{ + this->event_map_->register_for_subscription_updates (update_listener, + ACE_TRY_ENV); +} + +ACE_INLINE void +TAO_Notify_Event_Manager:: unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment& ACE_TRY_ENV) +{ + this->event_map_->unregister_from_subscription_updates (update_listener, + ACE_TRY_ENV); +} + +ACE_INLINE void +TAO_Notify_Event_Manager::unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment& ACE_TRY_ENV) +{ + this->event_map_->unregister_from_publication_updates(update_listener, + ACE_TRY_ENV); +} + +ACE_INLINE TAO_Notify_Event_Map* +TAO_Notify_Event_Manager::event_map (void) +{ + return this->event_map_; +} + +ACE_INLINE TAO_Notify_Event_Processor* +TAO_Notify_Event_Manager::event_processor (void) +{ + return this->event_processor_; +} + +ACE_INLINE CosNotification::EventTypeSeq* +TAO_Notify_Event_Manager::obtain_offered_types (void) +{ + return this->event_map_->obtain_offered_types (); +} + +ACE_INLINE CosNotification::EventTypeSeq* +TAO_Notify_Event_Manager::obtain_subscription_types (void) +{ + return this->event_map_->obtain_subscription_types (); +} diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager_Objects_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager_Objects_Factory.h new file mode 100644 index 00000000000..bc6c4972ce5 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager_Objects_Factory.h @@ -0,0 +1,65 @@ +/* -*- C++ -*- */ +// $Id$ +// +// ============================================================================ +// +// = LIBRARY +// ORBSVCS Notification +// +// = FILENAME +// Notify_Event_Manager_Objects_Factory.h +// +// = DESCRIPTION +// Interface definition of Factory for event manager objects. +// +// = AUTHOR +// Pradeep Gore <pradeep@cs.wustl.edu> +// +// ============================================================================ + +#ifndef NOTIFY_EMO_FACTORY_H +#define NOTIFY_EMO_FACTORY_H + +#include "ace/pre.h" +#include "ace/Service_Object.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/corba.h" +#include "notify_export.h" + +class TAO_Notify_Event_Manager; +class TAO_Notify_Event_Map; +class TAO_Notify_Event_Processor; +class TAO_Notify_Worker_Task; +class TAO_Notify_EventChannel_i; + +class TAO_Notify_Export TAO_Notify_EMO_Factory : public ACE_Service_Object +{ + // = TITLE + // TAO_Notify_EMO_Factory + // + // = DESCRIPTION + // Factory interface for event manager and friends. + // + public: + virtual TAO_Notify_Event_Manager* create_event_manager (TAO_Notify_EventChannel_i* channel, CORBA::Environment &ACE_TRY_ENV)= 0; + // Create an event manager. + + virtual TAO_Notify_Event_Map* create_event_map (CORBA::Environment &ACE_TRY_ENV)= 0; + // Create the event map. + + virtual TAO_Notify_Event_Processor* create_event_processor (TAO_Notify_Event_Manager* event_manager, CORBA::Environment &ACE_TRY_ENV)= 0; + // Create event processor. + + // = Create processing tasks. + virtual TAO_Notify_Worker_Task* create_source_eval_task (TAO_Notify_Event_Manager* event_manager, CORBA::Environment &ACE_TRY_ENV)= 0; + virtual TAO_Notify_Worker_Task* create_lookup_task (TAO_Notify_Event_Manager* event_manager, CORBA::Environment &ACE_TRY_ENV)= 0; + virtual TAO_Notify_Worker_Task* create_listener_eval_task (TAO_Notify_Event_Manager* event_manager, CORBA::Environment &ACE_TRY_ENV)= 0; + virtual TAO_Notify_Worker_Task* create_dispatching_task (TAO_Notify_Event_Manager* event_manager, CORBA::Environment &ACE_TRY_ENV)= 0; +}; + +#include "ace/post.h" +#endif /* NOTIFY_EMO_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.cpp new file mode 100644 index 00000000000..c4eedaf9431 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.cpp @@ -0,0 +1,230 @@ +// $Id$ + +#include "orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "Notify_Event.h" +#include "Notify_Event_Map.h" +#include "Notify_Factory.h" +#include "Notify_Collection.h" +#include "Notify_Event_Manager_Objects_Factory.h" +#include "Notify_Collection_Factory.h" + +#if ! defined (__ACE_INLINE__) +#include "Notify_Event_Map.i" +#endif /* __ACE_INLINE__ */ + +ACE_RCSID(Notify, Notify_Event_Map, "$Id$") + +TAO_Notify_Event_Map::TAO_Notify_Event_Map (void) + :default_subscription_list_ (0), + subscription_change_listeners_ (0), + publication_change_listeners_ (0), + emo_factory_ (TAO_Notify_Factory::get_event_manager_objects_factory ()), + collection_factory_ (TAO_Notify_Factory::get_collection_factory ()) +{ +} + +TAO_Notify_Event_Map::~TAO_Notify_Event_Map () +{ + // delete all event listener lists in the event map. + EVENT_RECIPIENT_MAP::ITERATOR iterator (this->event_recipient_map_); + + for (EVENT_RECIPIENT_MAP::ENTRY *entry = 0; + iterator.next (entry) != 0; + iterator.advance ()) + { + delete entry->int_id_; + } + + delete default_subscription_list_; + delete subscription_change_listeners_; + delete publication_change_listeners_; +} + +void +TAO_Notify_Event_Map::init (CORBA::Environment &ACE_TRY_ENV) +{ + this->default_subscription_list_ = + this->collection_factory_->create_event_listener_list (ACE_TRY_ENV); + ACE_CHECK; + // Create the default list of listeners. + + this->subscription_change_listeners_ + = this->collection_factory_->create_update_listener_list (ACE_TRY_ENV); + ACE_CHECK; + + this->publication_change_listeners_ + = this->collection_factory_->create_update_listener_list (ACE_TRY_ENV); +} + +void +TAO_Notify_Event_Map::shutdown (CORBA::Environment &ACE_TRY_ENV) +{ + // Shutdown all event listener lists in the event map. + EVENT_RECIPIENT_MAP::ITERATOR iterator (this->event_recipient_map_); + + for (EVENT_RECIPIENT_MAP::ENTRY *entry = 0; + iterator.next (entry) != 0; + iterator.advance ()) + { + entry->int_id_->shutdown (ACE_TRY_ENV); + } + + default_subscription_list_->shutdown (ACE_TRY_ENV); + subscription_change_listeners_->shutdown (ACE_TRY_ENV); + publication_change_listeners_->shutdown (ACE_TRY_ENV); +} + +void +TAO_Notify_Event_Map::subscribe_for_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List& update, const CosNotification::EventTypeSeq & added, CORBA::Environment &ACE_TRY_ENV) +{ + TAO_Notify_EventListener_List* event_listener_list; + TAO_Notify_EventType event_type; + + for (CORBA::ULong index = 0; index < added.length (); index++) + { + event_type = added[index]; +#if 0 + ACE_DEBUG ((LM_DEBUG, "subscribing %x for event: %s, %s\n", + event_listener, + event_type.event_type_.domain_name.in (), + event_type.event_type_.type_name.in ())); +#endif + if (event_type.is_special ()) + event_listener_list = default_subscription_list_; + else if (this->event_recipient_map_.find (event_type, + event_listener_list) == -1) + { + // create the list. + TAO_Notify_EventListener_List* new_list = + this->collection_factory_->create_event_listener_list (ACE_TRY_ENV); + + // add the list to the recipient map. + this->event_recipient_map_.bind (event_type, new_list); + event_listener_list = new_list; + } + + event_listener_list->connected (event_listener, ACE_TRY_ENV); + ACE_CHECK; + + // mirror changes in the subscription list + if (this->subscription_list_.insert (event_type) == 0) + update.insert (event_type); + } +} + +void +TAO_Notify_Event_Map::unsubscribe_from_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List &update, const CosNotification::EventTypeSeq & removed, CORBA::Environment &ACE_TRY_ENV) +{ + TAO_Notify_EventListener_List* event_listener_list; + TAO_Notify_EventType event_type; + + for (CORBA::ULong index = 0; index < removed.length (); index++) + { + event_type = removed[index]; + + // find out if there is a event listener list for this event type. + if (event_type.is_special ()) + event_listener_list = this->default_subscription_list_; + else if (this->event_recipient_map_.find (event_type, + event_listener_list) == -1) + continue; + + // remove <event_listener> from the list. + + event_listener_list->disconnected (event_listener, ACE_TRY_ENV); + ACE_CHECK; + + // If this was the last entry in the list then we should remove + // the corrsponding event_type from the recipient_map. + // However i'm going to leave the blank entries based on the assumption + // that a system will have a fixed set of event types. + // This way we save that cost of creating a new entry in the map and + // its corresponding listener list when an event type seen before + // shows up again. + // Later we could add logic to check at non-time-critical points, if + // the map has grown too big and prune it. (lazy evaluation). + + // mirror changes in the subscription list + if (this->subscription_list_.remove (event_type) == 0) + update.insert (event_type); // modify the update list. + } +} + +void +TAO_Notify_Event_Map::register_for_publication_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment& ACE_TRY_ENV) +{ + this->publication_change_listeners_->connected (update_listener, ACE_TRY_ENV); +} + +void +TAO_Notify_Event_Map::register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment& ACE_TRY_ENV) +{ + this->subscription_change_listeners_->connected (update_listener, ACE_TRY_ENV); +} + +void +TAO_Notify_Event_Map:: unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment& ACE_TRY_ENV) +{ + this->subscription_change_listeners_->disconnected (update_listener, ACE_TRY_ENV); +} + +void +TAO_Notify_Event_Map::unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment& ACE_TRY_ENV) +{ + this->publication_change_listeners_->disconnected (update_listener, ACE_TRY_ENV); +} + +CosNotification::EventTypeSeq* +TAO_Notify_Event_Map::obtain_offered_types (void) +{ + CosNotification::EventTypeSeq* event_type_seq; + + ACE_NEW_RETURN (event_type_seq, + CosNotification::EventTypeSeq(this->publication_list_.size ()), + 0); + + this->publication_list_.populate (*event_type_seq); + + return event_type_seq; +} + +CosNotification::EventTypeSeq* +TAO_Notify_Event_Map::obtain_subscription_types (void) +{ + CosNotification::EventTypeSeq* event_type_seq; + + ACE_NEW_RETURN (event_type_seq, + CosNotification::EventTypeSeq(this->subscription_list_.size ()), + 0); + + this->subscription_list_.populate (*event_type_seq); + + return event_type_seq; +} + +void +TAO_Notify_Event_Map::update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, TAO_Notify_EventType_List &added_list, TAO_Notify_EventType_List &removed_list, CORBA::Environment &/*ACE_TRY_ENV*/) +{ + TAO_Notify_EventType event_type; + + CORBA::ULong len = removed.length (); + CORBA::ULong i = 0 ; + for (; i < len; ++i) + { + event_type = removed[i]; + if (this->publication_list_.remove (event_type) == 0) + { + removed_list.insert (event_type); + } + } + + len = added.length (); + for (i = 0; i < len; i++) + { + event_type = added[i]; + if (this->publication_list_.insert (event_type) == 0) + { + added_list.insert (event_type); + } + } +} diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.h new file mode 100644 index 00000000000..1233c1ee741 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.h @@ -0,0 +1,150 @@ +/* -*- C++ -*- */ +// $Id$ +// +// ============================================================================ +// +// = LIBRARY +// ORBSVCS Notification +// +// = FILENAME +// Notify_Event_Map.h +// +// = DESCRIPTION +// Stores information about subscription mappings +// +// = AUTHOR +// Pradeep Gore <pradeep@cs.wustl.edu> +// +// ============================================================================ + +#ifndef TAO_NOTIFY_Event_Map_HEADER_H +#define TAO_NOTIFY_Event_Map_HEADER_H + +#include "ace/pre.h" +#include "orbsvcs/CosNotificationC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "orbsvcs/ESF/ESF_Worker.h" +#include "Notify_Collection.h" +#include "notify_export.h" + +class TAO_Notify_EventListener; +class TAO_Notify_UpdateListener; +class TAO_Notify_EventType; +class TAO_Notify_Collection_Factory; +class TAO_Notify_EMO_Factory; + +class TAO_Notify_Export TAO_Notify_Event_Map +{ + // = TITLE + // TAO_Notify_Event_Map + // + // = DESCRIPTION + // This is a compound container consisting of: + // - A "recipient" map : mapping between an event and its subscriibers + // - Lists of current events being subscribed, published. + // - Lists of subscriptions, publications update listeners. + // +public: + TAO_Notify_Event_Map (void); + // Constructor. + + virtual ~TAO_Notify_Event_Map (); + // Destructor. + + void init (CORBA::Environment &ACE_TRY_ENV); + // Init + + void shutdown (CORBA::Environment &ACE_TRY_ENV); + // Shutdown releases all listeners. + + // = Subscribe and Unsubscribe methods. + void subscribe_for_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List& update, const CosNotification::EventTypeSeq & added, CORBA::Environment &ACE_TRY_ENV); + + void unsubscribe_from_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List &update, const CosNotification::EventTypeSeq & removed, CORBA::Environment &ACE_TRY_ENV); + + // = Publish and Unpublish methods + // Later: + void update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, TAO_Notify_EventType_List &added_list, TAO_Notify_EventType_List &removed_list, CORBA::Environment &ACE_TRY_ENV); + // Suppliers can send anonymous requests to the Event Manager to indicate + // what kind of events they expect to produce. + + // = Subscription Updates + void register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment &ACE_TRY_ENV); + // Registers the subscription update listener with the Event Manager. + + void unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment &ACE_TRY_ENV); + // Unregister from subscription updates. + + // = Publication Updates + void register_for_publication_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment &ACE_TRY_ENV); + // Registers the publication update listener with the Event Manager. + + void unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment &ACE_TRY_ENV); + // Unregister from publication updates. + + // = Subscription list lookup + int find (TAO_Notify_EventType const & event_type, TAO_Notify_EventListener_List*& event_listener_list); + + // = Accessors + CosNotification::EventTypeSeq* obtain_offered_types(void); + // Obtain the publication list. + + CosNotification::EventTypeSeq* obtain_subscription_types (void); + // Obtain the subscription list. + + TAO_Notify_UpdateListener_List* subscription_change_listeners (void); + TAO_Notify_UpdateListener_List* publication_change_listeners (void); + TAO_Notify_EventListener_List* default_subscription_list (void); + +protected: + // = Typedefs + typedef ACE_Hash_Map_Manager <TAO_Notify_EventType, + TAO_Notify_EventListener_List*, ACE_SYNCH_MUTEX> EVENT_RECIPIENT_MAP; + + // = Data Members + EVENT_RECIPIENT_MAP event_recipient_map_; + // A Map of event types and the groups of event listeners interested in them. + // The keys of the map are a list of events that consumers have currently + // subscribed for. + + TAO_Notify_EventListener_List* default_subscription_list_; + // Save a reference to the default list, we don't want to spend time + // looking for it in the <event_recipient_map>. + + TAO_Notify_EventType_List publication_list_; + // The list of event types that are being currently published by suppliers. + + TAO_Notify_EventType_List subscription_list_; + // The list of event types that are being currently subscribed to by + // consumers. This list is the same as the list of keys in the + // <event_recepient_map>. We keep a copy of that list here to reduce + // contention for the map which will be accessed for every event that + // enters the system. + + TAO_Notify_UpdateListener_List* subscription_change_listeners_; + // This is a list of listeners that want to be notified if the subsciptions + // from consumers changes the <event_recipient_map_> keys. + + TAO_Notify_UpdateListener_List* publication_change_listeners_; + // This is a list of listeners that want to be notified if the publications + // from suppliers changes the <publication_list_>. + + TAO_Notify_EMO_Factory* emo_factory_; + // Evenet Manager Objects factory. + + TAO_Notify_Collection_Factory* collection_factory_; + // Collection objects factory. +}; + +/********************************************************************/ + +#if defined (__ACE_INLINE__) +#include "Notify_Event_Map.i" +#endif /* __ACE_INLINE__ */ + +#include "ace/post.h" +#endif /* TAO_NOTIFY_Event_Map_HEADER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.i b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.i new file mode 100644 index 00000000000..003c4bd3e59 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.i @@ -0,0 +1,29 @@ +//$Id$ + +#include "ace/Containers_T.h" +#include "orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "Notify_Event.h" + +ACE_INLINE int +TAO_Notify_Event_Map::find (TAO_Notify_EventType const & event_type, TAO_Notify_EventListener_List*& event_listener_list) +{ + return this->event_recipient_map_.find (event_type, event_listener_list); +} + +ACE_INLINE TAO_Notify_UpdateListener_List* +TAO_Notify_Event_Map::publication_change_listeners (void) +{ + return publication_change_listeners_; +} + +ACE_INLINE TAO_Notify_UpdateListener_List* +TAO_Notify_Event_Map::subscription_change_listeners (void) +{ + return subscription_change_listeners_; +} + +ACE_INLINE TAO_Notify_EventListener_List* +TAO_Notify_Event_Map::default_subscription_list (void) +{ + return default_subscription_list_; +} diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.cpp new file mode 100644 index 00000000000..863f329b0d1 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.cpp @@ -0,0 +1,125 @@ +// $Id$ + +#include "Notify_Event_Processor.h" +#include "Notify_Worker_Task.h" +#include "Notify_Source_Filter_Eval_Command.h" +#include "Notify_Factory.h" +#include "Notify_Event_Manager_Objects_Factory.h" + +ACE_RCSID(Notify, Notify_Event_Processor, "$Id$") + +#define NOTIFY_EVENT_PROCESSING_STAGES 4 + +#define NOTIFY_SOURCE_FILTER_EVAL_STAGE 0 +#define NOTIFY_LOOKUP_STAGE 1 +#define NOTIFY_LISTENER_FILTER_EVAL_STAGE 2 +#define NOTIFY_DISPATCHING_STAGE 3 + +TAO_Notify_Event_Processor::TAO_Notify_Event_Processor (TAO_Notify_Event_Manager* event_manager) + :event_manager_ (event_manager), + first_task_ (0), + listener_filter_eval_task_ (0), + dispatching_task_ (0), + emo_factory_ (0) +{ +} + +TAO_Notify_Event_Processor::~TAO_Notify_Event_Processor () +{ +} + +void +TAO_Notify_Event_Processor::init (CORBA::Environment& ACE_TRY_ENV) +{ + this->emo_factory_ = + TAO_Notify_Factory::get_event_manager_objects_factory (); + + // = Create the tasks. + TAO_Notify_Worker_Task* tasks[NOTIFY_EVENT_PROCESSING_STAGES]; + + tasks[NOTIFY_SOURCE_FILTER_EVAL_STAGE] = + this->emo_factory_->create_source_eval_task (this->event_manager_, + ACE_TRY_ENV); + ACE_CHECK; + + tasks[NOTIFY_LOOKUP_STAGE] = + this->emo_factory_->create_lookup_task (this->event_manager_, + ACE_TRY_ENV); + ACE_CHECK; + + tasks[NOTIFY_LISTENER_FILTER_EVAL_STAGE] = + this->emo_factory_->create_listener_eval_task (this->event_manager_, + ACE_TRY_ENV); + ACE_CHECK; + + tasks[NOTIFY_DISPATCHING_STAGE] = + this->emo_factory_->create_dispatching_task (this->event_manager_, + ACE_TRY_ENV); + ACE_CHECK; + + // = Create the Modules. + TAO_Notify_Module* modules[NOTIFY_EVENT_PROCESSING_STAGES]; + + ACE_NEW_THROW_EX (modules[NOTIFY_SOURCE_FILTER_EVAL_STAGE], + TAO_Notify_Module ("1", + tasks[NOTIFY_SOURCE_FILTER_EVAL_STAGE]), + CORBA::NO_MEMORY ()); + + ACE_NEW_THROW_EX (modules[NOTIFY_LOOKUP_STAGE], + TAO_Notify_Module ("2", + tasks[NOTIFY_LOOKUP_STAGE]), + CORBA::NO_MEMORY ()); + + ACE_NEW_THROW_EX (modules[NOTIFY_LISTENER_FILTER_EVAL_STAGE], + TAO_Notify_Module ("3", + tasks[NOTIFY_LISTENER_FILTER_EVAL_STAGE]), + CORBA::NO_MEMORY ()); + + ACE_NEW_THROW_EX (modules[NOTIFY_DISPATCHING_STAGE], + TAO_Notify_Module ("4", + tasks[NOTIFY_DISPATCHING_STAGE]), + CORBA::NO_MEMORY ()); + + for (int index = NOTIFY_EVENT_PROCESSING_STAGES -1; + index > -1; --index) + // push modules backworks + { + if (this->processing_stream_.push (modules[index]) == -1) + ACE_THROW (CORBA::INTERNAL ()); + } + + // set the first stream + this->first_task_ = tasks[NOTIFY_SOURCE_FILTER_EVAL_STAGE]; + this->listener_filter_eval_task_ = tasks [NOTIFY_LISTENER_FILTER_EVAL_STAGE]; + this->dispatching_task_ = tasks [NOTIFY_DISPATCHING_STAGE]; +} + +TAO_Notify_Worker_Task* +TAO_Notify_Event_Processor::get_listener_filter_eval_task (void) +{ + return this->listener_filter_eval_task_; +} + +TAO_Notify_Worker_Task* +TAO_Notify_Event_Processor::get_dispatching_task (void) +{ + return this->dispatching_task_; +} + +void +TAO_Notify_Event_Processor::shutdown (CORBA::Environment &/*ACE_TRY_ENV*/) +{ + this->processing_stream_.close (); + // this->first_task_->shutdown (ACE_TRY_ENV); + // This will post a "shutdown" message to all linked tasks. +} + +void +TAO_Notify_Event_Processor::process_event (TAO_Notify_Event* event, TAO_Notify_EventSource* event_source, CORBA::Environment& ACE_TRY_ENV) +{ + // TODO: use cache allocator here. + TAO_Notify_Source_Filter_Eval_Command* mb = + new TAO_Notify_Source_Filter_Eval_Command (event, event_source); + + this->first_task_->process_event (mb, ACE_TRY_ENV); +} diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.h new file mode 100644 index 00000000000..882f1a997e6 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.h @@ -0,0 +1,98 @@ +/* -*- C++ -*- */ +// $Id$ +// +// ============================================================================ +// +// = LIBRARY +// ORBSVCS Notification +// +// = FILENAME +// Notify_Event_Processor.h +// +// = DESCRIPTION +// The Event Processor holds the strategies for processing the event as it goes from +// source to destination(s). +// It is composed of 4 ACE_Task's that can be either passive or active: +// a) Source filter evaluation task - checks if the event passes the source's filter. +// b) Lookup Task - Looksup which listeners are subscribed to recieve this events. +// c) Listener filter evaluation task - checks if the event passes the listeners filter. +// d) Dispatching Task - dispatches the event to listeners. +// +// Breaking up the event processing into these stages allows us to configure the Notify's EC +// according to the requirements that suit a client's use case. +// +// = AUTHOR +// Pradeep Gore <pradeep@cs.wustl.edu> +// +// ============================================================================ +// + +#ifndef TAO_NOTIFY_EVENT_PROCESSOR_H +#define TAO_NOTIFY_EVENT_PROCESSOR_H + +#include "ace/pre.h" +#include "ace/Module.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "ace/Stream.h" +#include "ace/streams.h" +#include "tao/corba.h" +#include "notify_export.h" + +class TAO_Notify_Event; +class TAO_Notify_Event_Manager; +class TAO_Notify_EventSource; +class TAO_Notify_Worker_Task; +class TAO_Notify_EMO_Factory; + +class TAO_Notify_Export TAO_Notify_Event_Processor +{ + // = TITLE + // TAO_Notify_Event_Processor + // + // = DESCRIPTION + // The Event Processor. + // + public: + // = Initialialization and termination code. + TAO_Notify_Event_Processor (TAO_Notify_Event_Manager* event_manager); + virtual ~TAO_Notify_Event_Processor (); + + void init (CORBA::Environment& ACE_TRY_ENV); + // Init + + void shutdown (CORBA::Environment &ACE_TRY_ENV); + // Shutdown operations. + + void process_event (TAO_Notify_Event* event, TAO_Notify_EventSource* event_source, CORBA::Environment& ACE_TRY_ENV); + // Event processing entry point. + + // = Accessors + TAO_Notify_Worker_Task* get_listener_filter_eval_task (void); + TAO_Notify_Worker_Task* get_dispatching_task (void); + + protected: + typedef ACE_Module<ACE_MT_SYNCH> TAO_Notify_Module; + typedef ACE_Stream<ACE_MT_SYNCH> TAO_Notify_Stream; + + // = Data Members + TAO_Notify_Event_Manager* event_manager_; + // The Event Manager + + TAO_Notify_Stream processing_stream_; + // The processing stream. + + TAO_Notify_Worker_Task* first_task_; + TAO_Notify_Worker_Task* listener_filter_eval_task_; + TAO_Notify_Worker_Task* dispatching_task_; + // Tasks required for direct access. + + TAO_Notify_EMO_Factory* emo_factory_; + // Factory for manager ojects +}; + +#include "ace/post.h" +#endif /* TAO_NOTIFY_EVENT_PROCESSOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.cpp new file mode 100644 index 00000000000..2c45349df81 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.cpp @@ -0,0 +1,105 @@ +// $Id$ + +#include "ace/Dynamic_Service.h" +#include "Notify_Factory.h" +#include "Notify_Default_CO_Factory.h" +#include "Notify_Default_POA_Factory.h" +#include "Notify_Default_Collection_Factory.h" +#include "Notify_Default_EMO_Factory.h" +#include "Notify_Event.h" + +ACE_RCSID(Notify, Notify_Factory, "$Id$") + +TAO_Notify_CO_Factory* TAO_Notify_Factory::co_factory_ = 0; +TAO_Notify_POA_Factory* TAO_Notify_Factory::poa_factory_ = 0; +TAO_Notify_Collection_Factory* TAO_Notify_Factory::collection_factory_ = 0; +TAO_Notify_EMO_Factory* TAO_Notify_Factory::emo_factory_ = 0; + +void +TAO_Notify_Factory::init (CORBA::Environment &ACE_TRY_ENV) +{ + co_factory_ = + ACE_Dynamic_Service <TAO_Notify_CO_Factory>::instance (TAO_NOTIFY_DEF_CO_FACTORY_NAME); + + if (co_factory_ == 0) + { + ACE_NEW_THROW_EX (co_factory_, + TAO_Notify_Default_CO_Factory (), + CORBA::NO_MEMORY ()); + } + + poa_factory_ = + ACE_Dynamic_Service <TAO_Notify_POA_Factory>::instance (TAO_NOTIFY_DEF_POA_FACTORY_NAME); + + if (poa_factory_ == 0) + { + ACE_NEW_THROW_EX (poa_factory_, + TAO_Notify_Default_POA_Factory (), + CORBA::NO_MEMORY ()); + } + + collection_factory_ = + ACE_Dynamic_Service <TAO_Notify_Collection_Factory>::instance (TAO_NOTIFY_DEF_COLLECTION_FACTORY_NAME); + + if (collection_factory_ == 0) + { + ACE_NEW_THROW_EX (collection_factory_, + TAO_Notify_Default_Collection_Factory (), + CORBA::NO_MEMORY ()); + } + + emo_factory_ = + ACE_Dynamic_Service <TAO_Notify_EMO_Factory>::instance (TAO_NOTIFY_DEF_EMO_FACTORY_NAME); + + if (emo_factory_ == 0) + { + ACE_NEW_THROW_EX (emo_factory_, + TAO_Notify_Default_EMO_Factory (), + CORBA::NO_MEMORY ()); + } +} + +void +TAO_Notify_Factory::shutdown (void) +{ + // @@ +} + +TAO_Notify_CO_Factory* +TAO_Notify_Factory::get_channel_objects_factory (void) +{ + return TAO_Notify_Factory::co_factory_; +} + +TAO_Notify_POA_Factory* +TAO_Notify_Factory::get_poa_factory (void) +{ + return TAO_Notify_Factory::poa_factory_; +} + +TAO_Notify_Collection_Factory* +TAO_Notify_Factory::get_collection_factory (void) +{ + return TAO_Notify_Factory::collection_factory_; +} + +TAO_Notify_EMO_Factory* +TAO_Notify_Factory::get_event_manager_objects_factory (void) +{ + return TAO_Notify_Factory::emo_factory_; +} + +// **************************************************************** + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +template class ACE_Dynamic_Service<TAO_Notify_CO_Factory>; +template class ACE_Dynamic_Service<TAO_Notify_POA_Factory>; +template class ACE_Dynamic_Service<TAO_Notify_Collection_Factory>; +template class ACE_Dynamic_Service<TAO_Notify_EMO_Factory>; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +#pragma instantiate ACE_Dynamic_Service<TAO_Notify_Resource_Factory> + +#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.h new file mode 100644 index 00000000000..0dd144d8406 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.h @@ -0,0 +1,84 @@ +/* -*- C++ -*- */ +// $Id$ +// +// ============================================================================ +// +// = LIBRARY +// ORBSVCS Notification +// +// = FILENAME +// Notify_Factory.h +// +// = DESCRIPTION +// A collection of factories - +// a) A factory for event channel objects - the EC factory, EC, Admins, Proxys, et al. +// b) A factory for collections. +// c) A factory for POA's. +// d) A factory for manager objects. +// +// = AUTHOR +// Pradeep Gore <pradeep@cs.wustl.edu> +// +// ============================================================================ + +#ifndef NOTIFY_FACTORY_H +#define NOTIFY_FACTORY_H + +#include "ace/pre.h" +#include "tao/corba.h" +#include "notify_export.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +class TAO_Notify_CO_Factory; +class TAO_Notify_POA_Factory; +class TAO_Notify_Collection_Factory; +class TAO_Notify_EMO_Factory; +class TAO_Notify_EventChannelFactory_i; + +class TAO_Notify_Export TAO_Notify_Factory +{ + // = TITLE + // TAO_Notify_Factory + // + // = DESCRIPTION + // This classes initializes the static default factories. + // + public: + static TAO_Notify_CO_Factory* get_channel_objects_factory (void); + // The factory for channel objects. + + static TAO_Notify_POA_Factory* get_poa_factory (void); + // The factory for POA's. + + static TAO_Notify_Collection_Factory* get_collection_factory (void); + // Factory for all collections in the notify service. + + static TAO_Notify_EMO_Factory* get_event_manager_objects_factory (void); + // The event manager objects. + + protected: + friend class TAO_Notify_EventChannelFactory_i; + + static void init (CORBA::Environment &ACE_TRY_ENV); + // Initalize the services. + + static void shutdown (void); + // shutdown the svcs. + + // = Data Members + static TAO_Notify_CO_Factory* co_factory_; + static TAO_Notify_POA_Factory* poa_factory_; + static TAO_Notify_Collection_Factory* collection_factory_; + static TAO_Notify_EMO_Factory* emo_factory_; +}; + +#define TAO_NOTIFY_DEF_CO_FACTORY_NAME "Notify_Default_Channel_Objects_Factory" +#define TAO_NOTIFY_DEF_POA_FACTORY_NAME "Notify_Default_POA_Factory" +#define TAO_NOTIFY_DEF_COLLECTION_FACTORY_NAME "Notify_Default_Collection_Factory" +#define TAO_NOTIFY_DEF_EMO_FACTORY_NAME "Notify_Default_Event_Manager_Objects_Factory" + +#include "ace/post.h" +#endif /* NOTIFY_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h index d064dc33785..e73e2abfd85 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h @@ -20,7 +20,7 @@ #include "ace/pre.h" #include "Notify_ID_Pool_T.h" -#include "Notify_Types.h" +#include "Notify_Event.h" #include "orbsvcs/CosNotifyFilterS.h" #include "ace/Hash_Map_Manager.h" #include "notify_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.cpp index d92fa78a2f5..e978a4ae31c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.cpp @@ -60,8 +60,8 @@ TAO_Notify_ID_Pool<ID_TYPE>::next (void) iter.first (); iter.next (id_next); - this->reuse_list_.remove (*id_next); this->id_ = *id_next; + this->reuse_list_.remove (*id_next); } } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h index 21b11a482b6..fa06fd04e98 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h @@ -18,8 +18,12 @@ #ifndef TAO_NOTIFY_ID_POOL_T_H #define TAO_NOTIFY_ID_POOL_T_H #include "ace/pre.h" - #include "ace/OS.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Containers_T.h" #include "orbsvcs/CosNotifyChannelAdminS.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.i b/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.i index 166c9e2f6d0..47159b11f78 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.i +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.i @@ -1,5 +1 @@ /* -*- C++ -*- $Id$ */ - - - - diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.cpp new file mode 100644 index 00000000000..f4be3401dbf --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.cpp @@ -0,0 +1,49 @@ +// $Id$ + +#include "orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "Notify_Listener_Filter_Eval_Command.h" +#include "Notify_Event_Dispatch_Command.h" +#include "Notify_Worker_Task.h" +#include "Notify_Listeners.h" +#include "Notify_Event.h" + +ACE_RCSID(Notify, Notify_Listener_Filter_Eval_Command, "$Id$") + +TAO_Notify_Listener_Filter_Eval_Command::TAO_Notify_Listener_Filter_Eval_Command (TAO_Notify_Event* event, TAO_Notify_EventListener* event_listener, CORBA::Boolean eval_parent) + :event_ (event), + event_listener_ (event_listener), + eval_parent_ (eval_parent) +{ + event_listener_->_incr_refcnt (); + this->event_->_incr_refcnt (); +} + +TAO_Notify_Listener_Filter_Eval_Command::~TAO_Notify_Listener_Filter_Eval_Command () +{ + event_listener_->_decr_refcnt (); + this->event_->_decr_refcnt (); +} + +int +TAO_Notify_Listener_Filter_Eval_Command::execute (TAO_Notify_Worker_Task* parent_task, + CORBA::Environment& ACE_TRY_ENV) +{ + CORBA::Boolean result = + this->event_listener_->evaluate_filter (*this->event_, this->eval_parent_, ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + if (result == 1) + { + TAO_Notify_Event_Dispatch_Command* dispatch = + new TAO_Notify_Event_Dispatch_Command (this->event_, this->event_listener_); + + ACE_ASSERT (parent_task->next () != 0); + + TAO_Notify_Worker_Task* next_task = + ACE_static_cast (TAO_Notify_Worker_Task*, parent_task->next()); + + return next_task->process_event (dispatch, ACE_TRY_ENV); + } + + return -1; +} diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.h new file mode 100644 index 00000000000..3e27fe99ba5 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.h @@ -0,0 +1,58 @@ +/* -*- C++ -*- */ +// $Id$ +// +// ============================================================================ +// +// = LIBRARY +// ORBSVCS Notification +// +// = FILENAME +// Notify_Listener_Filter_Eval_Command.h +// +// = DESCRIPTION +// Defines the Command object for evaluating the listener's filter. +// +// = AUTHOR +// Pradeep Gore <pradeep@cs.wustl.edu> +// +// ============================================================================ + +#ifndef TAO_NOTIFY_LISTENER_FILTER_EVAL_COMMAND_H +#define TAO_NOTIFY_LISTENER_FILTER_EVAL_COMMAND_H + +#include "ace/pre.h" +#include "Notify_Command.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +class TAO_Notify_Event; +class TAO_Notify_EventListener; + +class TAO_Notify_Export TAO_Notify_Listener_Filter_Eval_Command : public TAO_Notify_Command +{ + // = TITLE + // TAO_Notify_Listener_Filter_Eval_Command + // + // = DESCRIPTION + // Listener filter evaluation command. + // + public: + TAO_Notify_Listener_Filter_Eval_Command (TAO_Notify_Event* event, TAO_Notify_EventListener* event_listener, CORBA::Boolean eval_parent); + // The event, listener, and hint to pass (see the listener interface for details) + + ~TAO_Notify_Listener_Filter_Eval_Command(); + + virtual int execute (TAO_Notify_Worker_Task* parent_task, CORBA::Environment& ACE_TRY_ENV); + // Command callback + + protected: + // = Data Members + TAO_Notify_Event* event_; + TAO_Notify_EventListener* event_listener_; + CORBA::Boolean eval_parent_; +}; + +#include "ace/post.h" +#endif /* TAO_NOTIFY_LISTENER_FILTER_EVAL_COMMAND_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Listeners.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listeners.h index cedcee4913c..41ae90cfbc4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Listeners.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listeners.h @@ -17,28 +17,76 @@ #ifndef TAO_NOTIFY_LISTENERS_H #define TAO_NOTIFY_LISTENERS_H + #include "ace/pre.h" +#include "tao/corba.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Notify_Types.h" +#include "notify_export.h" -class TAO_Notify_EventListener +class TAO_Notify_Event; +class TAO_Notify_EventType_List; + +class TAO_Notify_Export TAO_Notify_RefCounted +{ + // = TITLE + // TAO_Notify_RefCounted + // + // = DESCRIPTION + // Often used interface for ref. counting. + // + public: + virtual CORBA::ULong _incr_refcnt (void) = 0; + virtual CORBA::ULong _decr_refcnt (void) = 0; + // Increment and decrement the reference count. +}; + +/**************************************************************************************************/ + +class TAO_Notify_Export TAO_Notify_EventListener : virtual public TAO_Notify_RefCounted { // = TITLE // TAO_Notify_EventListener // // = DESCRIPTION - // An entities interested in receiving events can implement this interface + // All entities interested in receiving events can implement this interface // and subscribe with the Event Manager. During subscription, the Listener // must specify what kind of events it is interested in. // + public: virtual void dispatch_event (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV) = 0; // Callback methods to supply the event to the listener. + + virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean eval_parent, CORBA::Environment &ACE_TRY_ENV) = 0; + // Evaluates true if this event is acceptable by the listener. + // The <eval_parent> is a hint to the listener to help it determine if its wise to evaluate + // the parents filter too.This helps in implementing the "interfilter group operator" logic. + + virtual void shutdown (CORBA::Environment &ACE_TRY_ENV) = 0; + // Ask the listener to relinqish any bindings and prepare to be disposed. }; -class TAO_Notify_UpdateListener +/**************************************************************************************************/ + +class TAO_Notify_Export TAO_Notify_EventSource : virtual public TAO_Notify_RefCounted { + // = TITLE + // TAO_Notify_EventSource + // + // = DESCRIPTION + // The event source suppliers events to the Notify Manager. + // public: + virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV) = 0; + // Evaluates true if this event is acceptable by the Source. +}; + +class TAO_Notify_Export TAO_Notify_UpdateListener : virtual public TAO_Notify_RefCounted +{ // = TITLE // TAO_Notify_UpdateListener // @@ -47,6 +95,8 @@ class TAO_Notify_UpdateListener // change messages can implement this interface and register it with // the Event Manager to receive updates. // + + public: virtual void dispatch_update (TAO_Notify_EventType_List& added, TAO_Notify_EventType_List& removed, CORBA::Environment &ACE_TRY_ENV) = 0; // Callback method to supply updates. }; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.cpp new file mode 100644 index 00000000000..aa422a1d747 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.cpp @@ -0,0 +1,77 @@ +// $Id$ + +#include "orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "Notify_Lookup_Command.h" +#include "Notify_Event_Manager.h" +#include "Notify_Listener_Filter_Eval_Command.h" +#include "Notify_Worker_Task.h" +#include "Notify_Event.h" +#include "Notify_Event_Map.h" + +ACE_RCSID(Notify, Notify_Lookup_Command, "$Id$") + +TAO_Notify_Lookup_Command::TAO_Notify_Lookup_Command (TAO_Notify_Event* event) + :event_ (event) +{ + this->event_->_incr_refcnt (); +} + +TAO_Notify_Lookup_Command::~TAO_Notify_Lookup_Command () +{ + this->event_->_decr_refcnt (); +} + +int +TAO_Notify_Lookup_Command::execute (TAO_Notify_Worker_Task* parent_task, CORBA::Environment& ACE_TRY_ENV) +{ + this->parent_task_ = parent_task; + // There better be a next task and of type TAO_Notify_Worker_Task ! + ACE_ASSERT (parent_task->next () != 0); + this->next_task_ = ACE_static_cast (TAO_Notify_Worker_Task*, + parent_task->next()); + + // If the event is *not* the special event + // send it to the list that matches it. + // In any case send it to the default list. +#if 0 + ACE_DEBUG ((LM_DEBUG, "finding a match for event: %s, %s\n", + event->event_type ().event_type_.domain_name.in (), + event->event_type ().event_type_.type_name.in ())); +#endif + + TAO_Notify_Event_Map* event_map = + this->parent_task_->event_manager ()->event_map (); + + if (!this->event_->is_special_event_type ()) + { + TAO_Notify_EventListener_List* listener_list; + // find the subscription list for <event_type> + + if (event_map->find (this->event_->event_type (), + listener_list) == 0) + { + listener_list->for_each (this, ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + } + } + // Those subscribed for the default events get everything. + // if (this->default_subscription_list_->is_empty () == 0) + // @@ can't do this test - is_empty is not impl. + { + event_map->default_subscription_list ()->for_each (this, ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + } + + return 0; +} + +void +TAO_Notify_Lookup_Command::work (TAO_Notify_EventListener* event_listener, + CORBA::Environment &ACE_TRY_ENV) +{ + TAO_Notify_Listener_Filter_Eval_Command* mb = + new TAO_Notify_Listener_Filter_Eval_Command (this->event_, event_listener, 1); + // Notr the last parameter, we want the parent filter to be evaluated. + + this->next_task_->process_event (mb, ACE_TRY_ENV); +} diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.h new file mode 100644 index 00000000000..d7637726f01 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.h @@ -0,0 +1,63 @@ +/* -*- C++ -*- */ +// $Id$ +// +// ============================================================================ +// +// = LIBRARY +// ORBSVCS Notification +// +// = FILENAME +// Notify_Lookup_Command.h +// +// = DESCRIPTION +// Command object for looking up subscriptions for a given event. +// +// = AUTHOR +// Pradeep Gore <pradeep@cs.wustl.edu> +// +// ============================================================================ + +#ifndef TAO_NOTIFY_LOOKUP_COMMAND_H +#define TAO_NOTIFY_LOOKUP_COMMAND_H + +#include "ace/pre.h" +#include "orbsvcs/ESF/ESF_Worker.h" +#include "Notify_Command.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +class TAO_Notify_Event; +class TAO_Notify_EventListener; +class TAO_Notify_Worker_Task; + +class TAO_Notify_Export TAO_Notify_Lookup_Command : public TAO_Notify_Command, public TAO_ESF_Worker<TAO_Notify_EventListener> +{ + // = TITLE + // TAO_Notify_Lookup_Command + // + // = DESCRIPTION + // Command object for event subscription lookup in the event map. + // + public: + // = Initialization and termination code + TAO_Notify_Lookup_Command (TAO_Notify_Event* event); + ~TAO_Notify_Lookup_Command (); + + virtual int execute (TAO_Notify_Worker_Task* parent_task, CORBA::Environment&); + // Command callback + + // = TAO_ESF_Worker method + void work (TAO_Notify_EventListener* listener, CORBA::Environment &ACE_TRY_ENV); + protected: + // = Data member + TAO_Notify_Event* event_; + // The evnt we are processing + + TAO_Notify_Worker_Task* parent_task_; + TAO_Notify_Worker_Task* next_task_; +}; + +#include "ace/post.h" +#endif /* TAO_NOTIFY_LOOKUP_COMMAND_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_POA_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_POA_Factory.h new file mode 100644 index 00000000000..149941911bb --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_POA_Factory.h @@ -0,0 +1,83 @@ +/* -*- C++ -*- */ +// $Id$ +// +// ============================================================================ +// +// = LIBRARY +// ORBSVCS Notification +// +// = FILENAME +// Notify_POA_Factory.h +// +// = DESCRIPTION +// Factory interface for POA objects. +// +// = AUTHOR +// Pradeep Gore <pradeep@cs.wustl.edu> +// +// ============================================================================ + +#ifndef TAO_NOTIFY_POA_FACTORY_H +#define TAO_NOTIFY_POA_FACTORY_H + +#include "ace/pre.h" +#include "ace/Service_Object.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/corba.h" +#include "tao/POA.h" +#include "notify_export.h" + +class TAO_Notify_Export TAO_Notify_POA_Factory : public ACE_Service_Object +{ + // = TITLE + // TAO_Notify_POA_Factory + // + // = DESCRIPTION + // Interface for POA objects. + // + public: + // = POA creation methods. + virtual PortableServer::POA_ptr create_event_channel_POA (PortableServer::POA_ptr parent_poa, CORBA::Environment &ACE_TRY_ENV) = 0; + // Create the POA to activate Event Channels in. + + virtual PortableServer::POA_ptr create_supplier_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV) = 0; + // Create the POA to activate SA's in. + + virtual PortableServer::POA_ptr create_consumer_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV) = 0; + // Create the POA to activate CA's in. + + virtual PortableServer::POA_ptr create_proxy_pushconsumer_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV) = 0; + // Create the POA to activate proxy push consumers in. + + virtual PortableServer::POA_ptr create_proxy_pushsupplier_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV) = 0; + // Create the POA to activate proxy push suppliers in. + + // = Object activation and POA methods + virtual CORBA::Object_ptr activate_object_with_id (CORBA::Long id, PortableServer::POA_ptr poa,PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV) = 0; + // Converts <id> to an ObjectId and registers with the POA <poa>. + + virtual CORBA::Object_ptr activate_object (PortableServer::POA_ptr poa,PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV) = 0; + // Registers with the POA <poa>. + + virtual CORBA::Object_ptr servant_to_reference (PortableServer::POA_ptr poa,PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV) = 0; + // Registers with the POA <poa>. + + virtual CORBA::Object_ptr id_to_reference (CORBA::Long id, PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV) = 0; + // Look for the Object with id <id> in <poa>. + + virtual void destroy_POA (PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV) = 0; + // Destroy the <poa> + + virtual void deactivate_object (CORBA::Object_ptr obj, PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV) = 0; + // Deactivate the object. + + virtual void deactivate_object (PortableServer::Servant servant, PortableServer::POA_ptr, CORBA::Environment &ACE_TRY_ENV) = 0; + // Deactivate the object. +}; + +#include "ace/post.h" +#endif /* TAO_NOTIFY_POA_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.cpp index 12dfd2dd357..4bb02f0cf68 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.cpp @@ -3,50 +3,67 @@ #define TAO_NOTIFY_PROXYCONSUMER_T_C #include "Notify_ProxyConsumer_T.h" - #include "Notify_Event_Manager.h" #include "Notify_SupplierAdmin_i.h" -#include "ace/Auto_Ptr.h" +#include "Notify_Factory.h" +#include "Notify_Channel_Objects_Factory.h" + +ACE_RCSID(Notify, Notify_ProxyConsumer_T, "$Id$") template <class SERVANT_TYPE> -TAO_Notify_ProxyConsumer<SERVANT_TYPE>::TAO_Notify_ProxyConsumer (TAO_Notify_SupplierAdmin_i* supplieradmin, TAO_Notify_Resource_Manager* resource_manager) - :TAO_Notify_Proxy<SERVANT_TYPE> (resource_manager), - myadmin_ (supplieradmin) +TAO_Notify_ProxyConsumer<SERVANT_TYPE>::TAO_Notify_ProxyConsumer (TAO_Notify_SupplierAdmin_i* supplier_admin) + : supplier_admin_ (supplier_admin) { - event_manager_ = supplieradmin->get_event_manager (); + event_manager_ = supplier_admin->get_event_manager (); + supplier_admin_->_add_ref (); +} + +template <class SERVANT_TYPE> void +TAO_Notify_ProxyConsumer<SERVANT_TYPE>::init (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment& ACE_TRY_ENV) +{ + this->proxy_id_ = proxy_id; + + TAO_Notify_CO_Factory* cof = + TAO_Notify_Factory::get_channel_objects_factory (); + + this->lock_ = cof->create_proxy_consumer_lock (ACE_TRY_ENV); } // Implementation skeleton destructor template <class SERVANT_TYPE> TAO_Notify_ProxyConsumer<SERVANT_TYPE>::~TAO_Notify_ProxyConsumer (void) { - if (!is_destroyed_) - this->cleanup_i (); + ACE_DECLARE_NEW_CORBA_ENV; + + this->event_manager_->unregister_from_subscription_updates (this, + ACE_TRY_ENV); + delete this->lock_; - this->myadmin_->proxy_pushconsumer_destroyed (this->myID_); + this->supplier_admin_->proxy_pushconsumer_destroyed (this->proxy_id_); + supplier_admin_->_remove_ref (); } template <class SERVANT_TYPE> CORBA::Boolean -TAO_Notify_ProxyConsumer<SERVANT_TYPE>::check_filters_i (const TAO_Notify_Event& event, CORBA::Environment& ACE_TRY_ENV) +TAO_Notify_ProxyConsumer<SERVANT_TYPE>::evaluate_filter (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV) { // check if it passes the parent filter. CORBA::Boolean bval = - this->myadmin_->get_filter_admin ().match (event, - ACE_TRY_ENV); + this->supplier_admin_->get_filter_admin ().match (event, + ACE_TRY_ENV); ACE_CHECK_RETURN (0); - if (bval == 0) // If the filter did not match, don't send the event. - return bval; - - // Do we need to check our filter too. - if (myadmin_->MyOperator (ACE_TRY_ENV) == CosNotifyChannelAdmin::AND_OP) - { - bval = this->filter_admin_.match (event, - ACE_TRY_ENV); - ACE_CHECK_RETURN (0); - } - - return bval; + if (supplier_admin_->MyOperator (ACE_TRY_ENV) == CosNotifyChannelAdmin::AND_OP) + return (bval + && + this->filter_admin_.match (event, + ACE_TRY_ENV) + ); + else + return (bval + || + this->filter_admin_.match (event, + ACE_TRY_ENV) + ); } template <class SERVANT_TYPE> void @@ -56,16 +73,6 @@ TAO_Notify_ProxyConsumer<SERVANT_TYPE>::on_connected (CORBA::Environment &ACE_TR } template <class SERVANT_TYPE> void -TAO_Notify_ProxyConsumer<SERVANT_TYPE>::cleanup_i (CORBA::Environment& ACE_TRY_ENV) -{ - // cleanup here - this->is_destroyed_ = 1; - - this->event_manager_->unregister_from_subscription_updates (this, - ACE_TRY_ENV); -} - -template <class SERVANT_TYPE> void TAO_Notify_ProxyConsumer<SERVANT_TYPE>::offer_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC (( CORBA::SystemException, @@ -114,7 +121,7 @@ TAO_Notify_ProxyConsumer<SERVANT_TYPE>::MyAdmin (CORBA::Environment &ACE_TRY_ENV CORBA::SystemException )) { - return this->myadmin_->get_ref (ACE_TRY_ENV); + return this->supplier_admin_->get_ref (ACE_TRY_ENV); } #endif /* TAO_NOTIFY_PROXYCONSUMER_T_C */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.h index c0eb08d0e84..d7cb4d8efbf 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.h @@ -18,8 +18,14 @@ #ifndef TAO_NOTIFY_PROXYCONSUMER_T_H #define TAO_NOTIFY_PROXYCONSUMER_T_H #include "ace/pre.h" - #include "Notify_Proxy_T.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "Notify_Listeners.h" + class TAO_Notify_SupplierAdmin_i; #if defined(_MSC_VER) @@ -30,7 +36,7 @@ class TAO_Notify_SupplierAdmin_i; #endif /* _MSC_VER */ template <class SERVANT_TYPE> -class TAO_Notify_Export TAO_Notify_ProxyConsumer : public TAO_Notify_Proxy<SERVANT_TYPE> +class TAO_Notify_Export TAO_Notify_ProxyConsumer : public TAO_Notify_Proxy<SERVANT_TYPE>, virtual public TAO_Notify_EventSource { // = TITLE // TAO_Notify_ProxyConsumer @@ -40,19 +46,23 @@ class TAO_Notify_Export TAO_Notify_ProxyConsumer : public TAO_Notify_Proxy<SERVA // public: - TAO_Notify_ProxyConsumer (TAO_Notify_SupplierAdmin_i* supplieradmin, - TAO_Notify_Resource_Manager* resource_manager); + TAO_Notify_ProxyConsumer (TAO_Notify_SupplierAdmin_i* supplier_admin); // Constructor virtual ~TAO_Notify_ProxyConsumer (void); // Destructor - virtual CosNotifyChannelAdmin::SupplierAdmin_ptr MyAdmin ( - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + void init (CosNotifyChannelAdmin::ProxyID myID, CORBA::Environment &ACE_TRY_ENV); + // Init the Proxy. + + // = TAO_Notify_EventSource methods. + virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV); + // Evaluates true if this event is acceptable by the Source. + + virtual CosNotifyChannelAdmin::SupplierAdmin_ptr MyAdmin (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC (( + CORBA::SystemException + )); virtual CosNotification::EventTypeSeq * obtain_subscription_types ( CosNotifyChannelAdmin::ObtainInfoMode mode, @@ -74,17 +84,11 @@ virtual void offer_change ( protected: // = Helper methods - virtual void cleanup_i (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); - // Cleanup all resources used by this object. - - CORBA::Boolean check_filters_i (const TAO_Notify_Event& event, CORBA::Environment& ACE_TRY_ENV); - // Check filters. - void on_connected (CORBA::Environment &ACE_TRY_ENV); // Derived classes should call this when their suppliers connect. // = Data members - TAO_Notify_SupplierAdmin_i* myadmin_; + TAO_Notify_SupplierAdmin_i* supplier_admin_; // My parent supplier admin. }; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.cpp index 06e0cfcf893..21df54d3d6f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.cpp @@ -6,9 +6,11 @@ ACE_RCSID(Notify, Notify_ProxyPushConsumer_i, "$Id$") +typedef ACE_Reverse_Lock<ACE_Lock> TAO_Notify_Unlock; + // Implementation skeleton constructor -TAO_Notify_ProxyPushConsumer_i::TAO_Notify_ProxyPushConsumer_i (TAO_Notify_SupplierAdmin_i* supplieradmin, TAO_Notify_Resource_Manager* resource_manager) - : proxy_inherited (supplieradmin, resource_manager), +TAO_Notify_ProxyPushConsumer_i::TAO_Notify_ProxyPushConsumer_i (TAO_Notify_SupplierAdmin_i* supplier_admin) + : proxy_inherited (supplier_admin), notify_style_supplier_ (0) { } @@ -19,20 +21,16 @@ TAO_Notify_ProxyPushConsumer_i::~TAO_Notify_ProxyPushConsumer_i (void) } void -TAO_Notify_ProxyPushConsumer_i::cleanup_i (CORBA::Environment& ACE_TRY_ENV) -{ - proxy_inherited::cleanup_i (ACE_TRY_ENV); - this->cosec_push_supplier_ = CosEventComm::PushSupplier::_nil (); - this->notify_push_supplier_ = CosNotifyComm::PushSupplier::_nil (); -} - -void TAO_Notify_ProxyPushConsumer_i::connect_any_push_supplier (CosEventComm::PushSupplier_ptr push_supplier, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC (( CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected )) { + ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, + CORBA::INTERNAL ()); + ACE_CHECK; + if (this->is_connected_ == 1) ACE_THROW (CosEventChannelAdmin::AlreadyConnected ()); else @@ -50,16 +48,49 @@ TAO_Notify_ProxyPushConsumer_i::connect_any_push_supplier (CosEventComm::PushSup this->notify_style_supplier_ = 1; } - this->event_manager_->register_for_subscription_updates (this, - ACE_TRY_ENV); - this->is_connected_ = 1; } + + ACE_TRY + { + TAO_Notify_Unlock reverse_lock (*this->lock_); + + { + ACE_GUARD_THROW_EX (TAO_Notify_Unlock, ace_mon, reverse_lock, + CORBA::INTERNAL ()); + ACE_TRY_CHECK; + + this->event_manager_->register_for_subscription_updates (this, + ACE_TRY_ENV); + } + } + ACE_CATCHALL + { + this->cosec_push_supplier_ = + CosEventComm::PushSupplier::_nil (); + + this->notify_push_supplier_ = + CosNotifyComm::PushSupplier::_nil (); + + this->is_connected_ = 0; + + ACE_RE_THROW; + } + ACE_ENDTRY; } void TAO_Notify_ProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV) { + { + ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, + CORBA::INTERNAL ()); + ACE_CHECK; + + if (this->notify_style_supplier_ == 0) + return; // Our supplier doesn't support subscription_change. + } + ACE_TRY { this->notify_push_supplier_->subscription_change (added, removed, @@ -80,16 +111,23 @@ TAO_Notify_ProxyPushConsumer_i::push (const CORBA::Any & data, CORBA::Environmen CosEventComm::Disconnected )) { - if (this->is_connected_ == 0) - ACE_THROW (CosEventComm::Disconnected ()); + { + ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, + CORBA::INTERNAL ()); + ACE_CHECK; - TAO_Notify_Any notify_event (data); + if (this->is_connected_ == 0) + ACE_THROW (CosEventComm::Disconnected ()); + } - CORBA::Boolean bval = this->check_filters_i (notify_event, ACE_TRY_ENV); - ACE_CHECK; + CORBA::Any * data_copy; + ACE_NEW_THROW_EX (data_copy, CORBA::Any (data), CORBA::NO_MEMORY ()); + + TAO_Notify_Any* notify_event = new TAO_Notify_Any(data_copy); - if (bval == 1) - this->event_manager_->push (notify_event, ACE_TRY_ENV); + this->event_manager_->process_event (notify_event, this, ACE_TRY_ENV); + + notify_event->_decr_refcnt (); } void TAO_Notify_ProxyPushConsumer_i::disconnect_push_consumer ( @@ -99,19 +137,15 @@ void TAO_Notify_ProxyPushConsumer_i::disconnect_push_consumer ( CORBA::SystemException )) { - this->is_destroyed_ = 1; - // ask our parent to deactivate us. - this->myadmin_-> + this->supplier_admin_-> deactivate_proxy_pushconsumer (this, ACE_TRY_ENV); - - this->cleanup_i (ACE_TRY_ENV); } // = TAO_Notify_CosEC_ProxyPushConsumer_i -TAO_Notify_CosEC_ProxyPushConsumer_i::TAO_Notify_CosEC_ProxyPushConsumer_i (TAO_Notify_SupplierAdmin_i* supplieradmin, TAO_Notify_Resource_Manager* resource_manager) - :notify_proxy_ (supplieradmin, resource_manager) +TAO_Notify_CosEC_ProxyPushConsumer_i::TAO_Notify_CosEC_ProxyPushConsumer_i (TAO_Notify_SupplierAdmin_i* supplieradmin) + :notify_proxy_ (supplieradmin) { // No-Op. } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h index 992e3e09fea..dda47b67941 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h @@ -18,13 +18,17 @@ #ifndef TAO_NOTIFY_PROXYPUSHCONSUMER_I_H #define TAO_NOTIFY_PROXYPUSHCONSUMER_I_H -#include "ace/pre.h" +#include "ace/pre.h" #include "Notify_ProxyConsumer_T.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "orbsvcs/CosNotifyChannelAdminS.h" class TAO_Notify_SupplierAdmin_i; -class TAO_Notify_Resource_Manager; class TAO_Notify_Event_Manager; #if defined(_MSC_VER) @@ -34,7 +38,7 @@ class TAO_Notify_Event_Manager; #pragma warning(disable:4250) #endif /* _MSC_VER */ -class TAO_Notify_Export TAO_Notify_ProxyPushConsumer_i : public TAO_Notify_ProxyConsumer <POA_CosNotifyChannelAdmin::ProxyPushConsumer>, public PortableServer::RefCountServantBase +class TAO_Notify_Export TAO_Notify_ProxyPushConsumer_i : public TAO_Notify_ProxyConsumer <POA_CosNotifyChannelAdmin::ProxyPushConsumer> { // = TITLE // TAO_Notify_ProxyPushConsumer_i @@ -44,8 +48,7 @@ class TAO_Notify_Export TAO_Notify_ProxyPushConsumer_i : public TAO_Notify_Proxy // public: - TAO_Notify_ProxyPushConsumer_i (TAO_Notify_SupplierAdmin_i* supplieradmin, - TAO_Notify_Resource_Manager* resource_manager); + TAO_Notify_ProxyPushConsumer_i (TAO_Notify_SupplierAdmin_i* supplier_admin); // Constructor virtual ~TAO_Notify_ProxyPushConsumer_i (void); @@ -78,10 +81,7 @@ virtual void disconnect_push_consumer ( // = Helper methods virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV); - void cleanup_i (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); - // Cleanup all resources used by this object. - -// = Data members + // = Data members CORBA::Boolean notify_style_supplier_; // True if the supplier supports the NotifySubscribe interface. // If it does, we use the <notify_push_supplier_> else we use @@ -91,6 +91,7 @@ virtual void disconnect_push_consumer ( CosNotifyComm::PushSupplier_var notify_push_supplier_; // The supplier connected to us. + private: typedef TAO_Notify_ProxyConsumer <POA_CosNotifyChannelAdmin::ProxyPushConsumer> proxy_inherited; }; @@ -106,7 +107,7 @@ class TAO_Notify_Export TAO_Notify_CosEC_ProxyPushConsumer_i : public virtual PO // public: // = Initialization and termination methods. - TAO_Notify_CosEC_ProxyPushConsumer_i (TAO_Notify_SupplierAdmin_i* supplieradmin, TAO_Notify_Resource_Manager* resource_manager); + TAO_Notify_CosEC_ProxyPushConsumer_i (TAO_Notify_SupplierAdmin_i* supplieradmi); // Constructor. virtual ~TAO_Notify_CosEC_ProxyPushConsumer_i (void); @@ -130,6 +131,7 @@ public: CosEventChannelAdmin::AlreadyConnected)); // Connects a push supplier. protected: + // = Data Members TAO_Notify_ProxyPushConsumer_i notify_proxy_; // Proxy to delegate to. }; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.cpp index ca9f8f7b5f2..85c6a1ad099 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.cpp @@ -6,8 +6,10 @@ ACE_RCSID(Notify, Notify_ProxyPushSupplier_i, "$Id$") -TAO_Notify_ProxyPushSupplier_i::TAO_Notify_ProxyPushSupplier_i (TAO_Notify_ConsumerAdmin_i* consumeradmin, TAO_Notify_Resource_Manager* resource_manager) - :proxy_inherited (consumeradmin, resource_manager), +typedef ACE_Reverse_Lock<ACE_Lock> TAO_Notify_Unlock; + +TAO_Notify_ProxyPushSupplier_i::TAO_Notify_ProxyPushSupplier_i (TAO_Notify_ConsumerAdmin_i* consumer_admin) + :proxy_inherited (consumer_admin), notify_style_consumer_ (0) { } @@ -18,15 +20,6 @@ TAO_Notify_ProxyPushSupplier_i::~TAO_Notify_ProxyPushSupplier_i (void) } void -TAO_Notify_ProxyPushSupplier_i::cleanup_i (CORBA::Environment &ACE_TRY_ENV) -{ - proxy_inherited::cleanup_i (ACE_TRY_ENV); - - this->cosec_push_consumer_ = CosEventComm::PushConsumer::_nil (); - this->notify_push_consumer_ = CosNotifyComm::PushConsumer::_nil (); -} - -void TAO_Notify_ProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV) { ACE_TRY @@ -36,6 +29,7 @@ TAO_Notify_ProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event &event, CORBA } ACE_CATCHALL { + ACE_DEBUG ((LM_DEBUG, "Exception dispatching any event\n")); // misbehaving client, ignore for now. } ACE_ENDTRY; @@ -44,6 +38,12 @@ TAO_Notify_ProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event &event, CORBA void TAO_Notify_ProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV) { + { + ACE_GUARD (ACE_Lock, ace_mon, *this->lock_); + if (this->notify_style_consumer_ == 0) + return; // Our consumer doesn't support offer_change. + } + ACE_TRY { this->notify_push_consumer_->offer_change (added, removed, ACE_TRY_ENV); @@ -64,6 +64,10 @@ TAO_Notify_ProxyPushSupplier_i::connect_any_push_consumer (CosEventComm::PushCon CosEventChannelAdmin::TypeError )) { + ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, + CORBA::INTERNAL ()); + ACE_CHECK; + if (CORBA::is_nil (push_consumer)) ACE_THROW (CosEventChannelAdmin::TypeError ()); else if (this->is_connected_ == 1) @@ -83,43 +87,90 @@ TAO_Notify_ProxyPushSupplier_i::connect_any_push_consumer (CosEventComm::PushCon _duplicate (this->notify_push_consumer_.in ()); this->notify_style_consumer_ = 1; } - } + + this->is_connected_ = 1; + } // else ACE_TRY { - this->on_connected (ACE_TRY_ENV); - ACE_TRY_CHECK; + TAO_Notify_Unlock reverse_lock (*this->lock_); - this->is_connected_ = 1; + { + ACE_GUARD_THROW_EX (TAO_Notify_Unlock, ace_mon, reverse_lock, + CORBA::INTERNAL ()); + ACE_CHECK; + + this->on_connected (ACE_TRY_ENV); + ACE_TRY_CHECK; + } } ACE_CATCHALL { this->cosec_push_consumer_ = CosNotifyComm::PushConsumer::_nil (); this->notify_push_consumer_ = CosNotifyComm::PushConsumer::_nil (); + + this->is_connected_ = 0; ACE_RE_THROW; } ACE_ENDTRY; } void +TAO_Notify_ProxyPushSupplier_i::shutdown_i (CORBA::Environment &ACE_TRY_ENV) +{ + this->on_disconnected (ACE_TRY_ENV); + ACE_CHECK; + + // ask our parent to deactivate us. + this->consumer_admin_-> + deactivate_proxy_pushsupplier (this, ACE_TRY_ENV); +} + +void TAO_Notify_ProxyPushSupplier_i::disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC (( CORBA::SystemException )) { - this->is_destroyed_ = 1; + // unregister with CA + this->consumer_admin_->unregister_listener (this, ACE_TRY_ENV); + ACE_CHECK; - // ask our parent to deactivate us. - this->myadmin_-> - deactivate_proxy_pushsupplier (this, ACE_TRY_ENV); + this->shutdown_i (ACE_TRY_ENV); +} + +void +TAO_Notify_ProxyPushSupplier_i::shutdown (CORBA::Environment &ACE_TRY_ENV) +{ + // Tell the consumer that we're going away ... + // @@ Later, lookup a "notify_on_disconnect" option. + + { + ACE_GUARD (ACE_Lock, ace_mon, *this->lock_); + + if (this->is_connected_ == 0) + return; + } - this->cleanup_i (ACE_TRY_ENV); + this->shutdown_i (ACE_TRY_ENV); + ACE_CHECK; + + ACE_TRY + { + this->cosec_push_consumer_->disconnect_push_consumer (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCHALL + { + // ignore + } + ACE_ENDTRY; } // = TAO_Notify_CosEC_ProxyPushSupplier_i -TAO_Notify_CosEC_ProxyPushSupplier_i::TAO_Notify_CosEC_ProxyPushSupplier_i (TAO_Notify_ConsumerAdmin_i* consumeradmin, TAO_Notify_Resource_Manager* resource_manager) - :notify_proxy_ (consumeradmin, resource_manager) +TAO_Notify_CosEC_ProxyPushSupplier_i::TAO_Notify_CosEC_ProxyPushSupplier_i (TAO_Notify_ConsumerAdmin_i* consumer_admin) + :notify_proxy_ (consumer_admin) { // No-Op. } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h index 4f7ffa598b2..c3c6252d93c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h @@ -17,13 +17,17 @@ // ========================================================================== #ifndef TAO_NOTIFY_PROXYPUSHSUPPLIER_I_H #define TAO_NOTIFY_PROXYPUSHSUPPLIER_I_H -#include "ace/pre.h" +#include "ace/pre.h" #include "Notify_ProxySupplier_T.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "orbsvcs/CosNotifyChannelAdminS.h" class TAO_Notify_ConsumerAdmin_i; -class TAO_Notify_Resource_Manager; #if defined(_MSC_VER) #if (_MSC_VER >= 1200) @@ -32,7 +36,7 @@ class TAO_Notify_Resource_Manager; #pragma warning(disable:4250) #endif /* _MSC_VER */ -class TAO_Notify_Export TAO_Notify_ProxyPushSupplier_i : public TAO_Notify_ProxySupplier<POA_CosNotifyChannelAdmin::ProxyPushSupplier>, public PortableServer::RefCountServantBase +class TAO_Notify_Export TAO_Notify_ProxyPushSupplier_i : public TAO_Notify_ProxySupplier<POA_CosNotifyChannelAdmin::ProxyPushSupplier> { // = TITLE // TAO_Notify_ProxyPushSupplier_i @@ -42,8 +46,7 @@ class TAO_Notify_Export TAO_Notify_ProxyPushSupplier_i : public TAO_Notify_Proxy // public: - TAO_Notify_ProxyPushSupplier_i (TAO_Notify_ConsumerAdmin_i* consumeradmin, - TAO_Notify_Resource_Manager* resource_manager); + TAO_Notify_ProxyPushSupplier_i (TAO_Notify_ConsumerAdmin_i* consumeradmin); // Constructor virtual ~TAO_Notify_ProxyPushSupplier_i (void); @@ -67,27 +70,31 @@ virtual void disconnect_push_supplier ( CORBA::SystemException )); + virtual void shutdown (CORBA::Environment &ACE_TRY_ENV); + // Shutdown. + protected: + void shutdown_i (CORBA::Environment &ACE_TRY_ENV); + // Shutdown + virtual void dispatch_event_i (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV); - // Deliver the event to the consumer. + // Deliver the event to the consumer. virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV); - // Deliver the update to the consumer. - - // = Helper methods - virtual void cleanup_i (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); - // Cleanup all resources used by this object. + // Deliver the update to the consumer. - CORBA::Boolean notify_style_consumer_; + // = Data Members. + CORBA::Boolean notify_style_consumer_; // True if the consumer supports the NotifyPublish interface. // If it does, we use the <notify_push_consumer_> else <cosec_push_consumer_> - CosEventComm::PushConsumer_var cosec_push_consumer_; - CosNotifyComm::PushConsumer_var notify_push_consumer_; - // The consumer connected to us. + CosEventComm::PushConsumer_var cosec_push_consumer_; + CosNotifyComm::PushConsumer_var notify_push_consumer_; + // The consumer connected to us. - typedef TAO_Notify_ProxySupplier<POA_CosNotifyChannelAdmin::ProxyPushSupplier> - proxy_inherited; + private: + typedef TAO_Notify_ProxySupplier<POA_CosNotifyChannelAdmin::ProxyPushSupplier> + proxy_inherited; }; class TAO_Notify_Export TAO_Notify_CosEC_ProxyPushSupplier_i : public POA_CosEventChannelAdmin::ProxyPushSupplier, public virtual PortableServer::RefCountServantBase @@ -101,7 +108,7 @@ class TAO_Notify_Export TAO_Notify_CosEC_ProxyPushSupplier_i : public POA_CosEve // public: // = Initialization and termination methods. - TAO_Notify_CosEC_ProxyPushSupplier_i(TAO_Notify_ConsumerAdmin_i* consumeradmin, TAO_Notify_Resource_Manager* resource_manager); + TAO_Notify_CosEC_ProxyPushSupplier_i(TAO_Notify_ConsumerAdmin_i* consumeradmin); // Constructor. ~TAO_Notify_CosEC_ProxyPushSupplier_i (void); @@ -121,6 +128,7 @@ public: // Connects the <push_consumer> to the Event Channel. protected: + // = Data Members TAO_Notify_ProxyPushSupplier_i notify_proxy_; // The proxy that we delegate too. }; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp index 0c7411f72d6..9a73c5e1729 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp @@ -6,30 +6,37 @@ #include "Notify_ProxySupplier_T.h" #include "Notify_Event_Manager.h" #include "Notify_ConsumerAdmin_i.h" +#include "Notify_Factory.h" +#include "Notify_Channel_Objects_Factory.h" + +ACE_RCSID(Notify, Notify_ProxySupplier_T, "$Id$") template <class SERVANT_TYPE> -TAO_Notify_ProxySupplier<SERVANT_TYPE>::TAO_Notify_ProxySupplier (TAO_Notify_ConsumerAdmin_i* consumeradmin, TAO_Notify_Resource_Manager* resource_manager) - :TAO_Notify_Proxy<SERVANT_TYPE> (resource_manager), - myadmin_ (consumeradmin), - is_suspended_ (0) +TAO_Notify_ProxySupplier<SERVANT_TYPE>::TAO_Notify_ProxySupplier (TAO_Notify_ConsumerAdmin_i* consumer_admin) + :consumer_admin_ (consumer_admin), + is_suspended_ (0) { - event_manager_ = consumeradmin->get_event_manager (); + event_manager_ = consumer_admin->get_event_manager (); } -// Implementation skeleton destructor -template <class SERVANT_TYPE> -TAO_Notify_ProxySupplier<SERVANT_TYPE>::~TAO_Notify_ProxySupplier (void) +template <class SERVANT_TYPE> void +TAO_Notify_ProxySupplier<SERVANT_TYPE>::init (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment& ACE_TRY_ENV) { - if (!is_destroyed_) - this->cleanup_i (); + consumer_admin_->_add_ref (ACE_TRY_ENV); - this->myadmin_->proxy_pushsupplier_destroyed (this->myID_); + this->proxy_id_ = proxy_id; + + TAO_Notify_CO_Factory* cof = + TAO_Notify_Factory::get_channel_objects_factory (); + + this->lock_ = cof->create_proxy_supplier_lock (ACE_TRY_ENV); } -template <class SERVANT_TYPE> void -TAO_Notify_ProxySupplier<SERVANT_TYPE>::cleanup_i (CORBA::Environment& ACE_TRY_ENV) +// Implementation skeleton destructor +template <class SERVANT_TYPE> +TAO_Notify_ProxySupplier<SERVANT_TYPE>::~TAO_Notify_ProxySupplier (void) { - this->is_destroyed_ = 1; + ACE_DECLARE_NEW_CORBA_ENV; this->event_manager_->unregister_from_publication_updates (this, ACE_TRY_ENV); @@ -41,8 +48,39 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::cleanup_i (CORBA::Environment& ACE_TRY_E added.length (0); this->event_manager_->subscribe_for_events (this, - 0, added, removed, ACE_TRY_ENV); + + delete this->lock_; + + this->consumer_admin_->proxy_pushsupplier_destroyed (this->proxy_id_); + consumer_admin_->_remove_ref (ACE_TRY_ENV); +} + +template <class SERVANT_TYPE> CORBA::Boolean +TAO_Notify_ProxySupplier<SERVANT_TYPE>::evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean eval_parent, CORBA::Environment &ACE_TRY_ENV) +{ + if (eval_parent == 1) + { + CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator = + consumer_admin_->MyOperator (ACE_TRY_ENV); + // Inter-filter group operator. + + CORBA::Boolean bval = + this->consumer_admin_->get_filter_admin ().match (event, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + if ((bval == 1 && filter_operator == CosNotifyChannelAdmin::AND_OP) || + (bval == 0 && filter_operator == CosNotifyChannelAdmin::OR_OP)) + { + return this->filter_admin_.match (event, ACE_TRY_ENV); + } + else if (bval == 1 && filter_operator == CosNotifyChannelAdmin::OR_OP) + return 1; + else + return 0; + } + else + return this->filter_admin_.match (event, ACE_TRY_ENV); } template <class SERVANT_TYPE> void @@ -55,28 +93,12 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::dispatch_event (TAO_Notify_Event &event, return; } - // check if it passes the parent filter. - CORBA::Boolean bval = - this->myadmin_->get_filter_admin ().match (event, - ACE_TRY_ENV); - ACE_CHECK; - - if (bval == 0) // If the filter did not match, don't send the event. - return; - - // Do we need to check our filter too. - if (myadmin_->MyOperator (ACE_TRY_ENV) == CosNotifyChannelAdmin::AND_OP) + if (this->is_suspended_ == 1) { - bval = this->filter_admin_.match (event, - ACE_TRY_ENV); + ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, + CORBA::INTERNAL ()); ACE_CHECK; - if (bval == 0) // If the filter did not match, don't send the event. - return; - } - - if (this->is_suspended_ == 1) - { this->event_list_.enqueue_tail (event.clone ()); } else @@ -93,36 +115,73 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::subscription_change (const CosNotificati if (this->is_connected_ == 1) { this->event_manager_->subscribe_for_events (this, - &this->subscription_list_, added, removed, ACE_TRY_ENV); } - else // simply update our subscription list. - { - this->subscription_list_.insert_seq (added); - this->subscription_list_.remove_seq (removed); - } + + { + ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, + CORBA::INTERNAL ()); + ACE_CHECK; + + // simply update our subscription list. + this->subscription_list_.insert_seq (added); + this->subscription_list_.remove_seq (removed); + } } template <class SERVANT_TYPE> void TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_connected (CORBA::Environment &ACE_TRY_ENV) { // register with CA - this->myadmin_->register_listener (this, ACE_TRY_ENV); + this->consumer_admin_->register_listener (this, ACE_TRY_ENV); ACE_CHECK; - // subscribe it to our current subscriptions. - CosNotification::EventTypeSeq added (this->subscription_list_.size ()); + CosNotification::EventTypeSeq added; + CosNotification::EventTypeSeq removed (0); + removed.length (0); + + // subscribe it to our current subscriptions. + added.length (this->subscription_list_.size ()); this->subscription_list_.populate (added); - removed.length (0); this->event_manager_->subscribe_for_events (this, - 0, added, removed, ACE_TRY_ENV); ACE_CHECK; this->event_manager_->register_for_publication_updates (this, ACE_TRY_ENV); + ACE_CHECK; +} + +template <class SERVANT_TYPE> void +TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_disconnected (CORBA::Environment &ACE_TRY_ENV) +{ + ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, + CORBA::INTERNAL ()); + ACE_CHECK; + + if (this->is_connected_ == 0) + return; + + this->is_connected_ = 0; + + CosNotification::EventTypeSeq removed; + + CosNotification::EventTypeSeq added (0); + added.length (0); + + // unsubscribe it to our current subscriptions. + removed.length (this->subscription_list_.size ()); + + this->subscription_list_.populate (removed); + + this->event_manager_->subscribe_for_events (this, + added, removed, ACE_TRY_ENV); + ACE_CHECK; + + this->event_manager_->unregister_from_publication_updates (this, ACE_TRY_ENV); + ACE_CHECK; } template <class SERVANT_TYPE> void @@ -146,13 +205,19 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::resume_connection (CORBA::Environment &A { TAO_Notify_Event* event; - while (this->event_list_.dequeue_head (event) == 0) - { - this->dispatch_event_i (*event, ACE_TRY_ENV); - delete event; - } - this->is_suspended_ = 0; + + { + ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, + CORBA::INTERNAL ()); + ACE_CHECK; + + while (this->event_list_.dequeue_head (event) == 0) + { + this->dispatch_event_i (*event, ACE_TRY_ENV); + delete event; + } + } } template <class SERVANT_TYPE> CosNotifyChannelAdmin::ConsumerAdmin_ptr @@ -161,7 +226,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::MyAdmin (CORBA::Environment &ACE_TRY_ENV CORBA::SystemException )) { - return this->myadmin_->get_ref (ACE_TRY_ENV); + return this->consumer_admin_->get_ref (ACE_TRY_ENV); } template <class SERVANT_TYPE> CosNotifyFilter::MappingFilter_ptr diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.h index 0df2937cb9a..240f89ca5e3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.h @@ -19,6 +19,8 @@ #include "ace/pre.h" #include "Notify_Proxy_T.h" +#include "Notify_Collection.h" + class TAO_Notify_ConsumerAdmin_i; #if defined(_MSC_VER) @@ -29,7 +31,7 @@ class TAO_Notify_ConsumerAdmin_i; #endif /* _MSC_VER */ template <class SERVANT_TYPE> -class TAO_Notify_Export TAO_Notify_ProxySupplier : public TAO_Notify_Proxy <SERVANT_TYPE>, public TAO_Notify_EventListener +class TAO_Notify_Export TAO_Notify_ProxySupplier : public TAO_Notify_Proxy <SERVANT_TYPE>, virtual public TAO_Notify_EventListener { // = TITLE // TAO_Notify_ProxySupplier @@ -39,18 +41,21 @@ class TAO_Notify_Export TAO_Notify_ProxySupplier : public TAO_Notify_Proxy <SERV // public: - TAO_Notify_ProxySupplier (TAO_Notify_ConsumerAdmin_i* consumeradmin, - TAO_Notify_Resource_Manager* resource_manager); + TAO_Notify_ProxySupplier (TAO_Notify_ConsumerAdmin_i* consumeradmin); // Constructor virtual ~TAO_Notify_ProxySupplier (void); // Destructor + void init (CosNotifyChannelAdmin::ProxyID myID, CORBA::Environment &ACE_TRY_ENV); + // Init the Proxy. + // = Notify_Event_Listener methods virtual void dispatch_event (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV); + virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean eval_parent, CORBA::Environment &ACE_TRY_ENV); // = Interface methods -virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr MyAdmin ( + virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr MyAdmin ( CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC (( @@ -66,7 +71,7 @@ virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr MyAdmin ( CosNotifyChannelAdmin::NotConnected )); -virtual void resume_connection ( + virtual void resume_connection ( CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC (( @@ -75,14 +80,14 @@ virtual void resume_connection ( CosNotifyChannelAdmin::NotConnected )); -virtual CosNotifyFilter::MappingFilter_ptr priority_filter ( + virtual CosNotifyFilter::MappingFilter_ptr priority_filter ( CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC (( CORBA::SystemException )); -virtual void priority_filter ( + virtual void priority_filter ( CosNotifyFilter::MappingFilter_ptr priority_filter, CORBA::Environment &ACE_TRY_ENV ) @@ -90,14 +95,14 @@ virtual void priority_filter ( CORBA::SystemException )); -virtual CosNotifyFilter::MappingFilter_ptr lifetime_filter ( + virtual CosNotifyFilter::MappingFilter_ptr lifetime_filter ( CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC (( CORBA::SystemException )); -virtual void lifetime_filter ( + virtual void lifetime_filter ( CosNotifyFilter::MappingFilter_ptr lifetime_filter, CORBA::Environment &ACE_TRY_ENV ) @@ -105,7 +110,7 @@ virtual void lifetime_filter ( CORBA::SystemException )); -virtual CosNotification::EventTypeSeq * obtain_offered_types ( + virtual CosNotification::EventTypeSeq * obtain_offered_types ( CosNotifyChannelAdmin::ObtainInfoMode mode, CORBA::Environment &ACE_TRY_ENV ) @@ -113,7 +118,7 @@ virtual CosNotification::EventTypeSeq * obtain_offered_types ( CORBA::SystemException )); -virtual void subscription_change ( + virtual void subscription_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, CORBA::Environment &ACE_TRY_ENV @@ -124,20 +129,22 @@ virtual void subscription_change ( )); protected: -// = Helper methods - virtual void dispatch_event_i (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV) = 0; - virtual void cleanup_i (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); - // Cleanup all resources used by this object. + // = Helper methods + virtual void dispatch_event_i (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV) = 0; + // Derived classes should implement this. + + void on_connected (CORBA::Environment &ACE_TRY_ENV); + // Derived classes should call this when their consumers connect. - void on_connected (CORBA::Environment &ACE_TRY_ENV); - // Derived classes should call this when their consumers connect. + void on_disconnected (CORBA::Environment &ACE_TRY_ENV); + // Derived classes should call this when their consumers disconnect. - // = Data members - TAO_Notify_ConsumerAdmin_i* myadmin_; - // My parent consumer admin. + // = Data members + TAO_Notify_ConsumerAdmin_i* consumer_admin_; + // My parent consumer admin. - TAO_Notify_EventType_List subscription_list_; - // A list of event types that we are interested in. + TAO_Notify_EventType_List subscription_list_; + // A list of event types that we are interested in. CORBA::Boolean is_suspended_; // True if we are connected to a consumer and suspended. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.cpp index b7a7f68a4b7..d853fac682d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.cpp @@ -9,11 +9,11 @@ ACE_RCSID(Notify, Notify_Proxy_T, "$Id$") template <class SERVANT_TYPE> -TAO_Notify_Proxy<SERVANT_TYPE>::TAO_Notify_Proxy (TAO_Notify_Resource_Manager* resource_manager) - : resource_manager_ (resource_manager), - is_connected_ (0), - is_destroyed_ (0), - updates_on_ (1) +TAO_Notify_Proxy<SERVANT_TYPE>::TAO_Notify_Proxy (void) + :lock_ (0), + refcount_ (1), + is_connected_ (0), + updates_on_ (1) { // No-Op. } @@ -22,20 +22,40 @@ TAO_Notify_Proxy<SERVANT_TYPE>::TAO_Notify_Proxy (TAO_Notify_Resource_Manager* r template <class SERVANT_TYPE> TAO_Notify_Proxy<SERVANT_TYPE>::~TAO_Notify_Proxy (void) { - if (!is_destroyed_) - this->cleanup_i (); + ACE_DEBUG ((LM_DEBUG, "in ~TAO_Notify_Proxy\n")); +} + +template <class SERVANT_TYPE> CORBA::ULong +TAO_Notify_Proxy<SERVANT_TYPE>::_incr_refcnt (void) +{ + ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); + return this->refcount_++; +} + +template <class SERVANT_TYPE> CORBA::ULong +TAO_Notify_Proxy<SERVANT_TYPE>::_decr_refcnt (void) +{ + { + ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); + this->refcount_--; + if (this->refcount_ != 0) + return this->refcount_; + } + + delete this; + return 0; } template <class SERVANT_TYPE> void -TAO_Notify_Proxy<SERVANT_TYPE>::init (CosNotifyChannelAdmin::ProxyID myID, CORBA::Environment& /*ACE_TRY_ENV*/) +TAO_Notify_Proxy<SERVANT_TYPE>::_add_ref (CORBA_Environment &/*ACE_TRY_ENV*/) { - this->myID_ = myID; + this->_incr_refcnt (); } template <class SERVANT_TYPE> void -TAO_Notify_Proxy<SERVANT_TYPE>::cleanup_i (CORBA::Environment& /*ACE_TRY_ENV*/) +TAO_Notify_Proxy<SERVANT_TYPE>::_remove_ref (CORBA_Environment &/*ACE_TRY_ENV*/) { - this->is_destroyed_ = 1; + this->_decr_refcnt (); } template <class SERVANT_TYPE> void @@ -56,7 +76,7 @@ TAO_Notify_Proxy<SERVANT_TYPE>::MyType (CORBA::Environment &/*ACE_TRY_ENV*/) CORBA::SystemException )) { - return mytype_; + return proxy_type_; } template <class SERVANT_TYPE> void diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.h index cdeb44bf656..fe980a752aa 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.h @@ -30,7 +30,6 @@ #include "Notify_Listeners.h" #include "notify_export.h" -class TAO_Notify_Resource_Manager; class TAO_Notify_Event_Manager; #if defined(_MSC_VER) @@ -45,7 +44,7 @@ class TAO_Notify_Event_Manager; // compilers, but they deserve it! ;-) ;-) template <class SERVANT_TYPE> -class TAO_Notify_Export TAO_Notify_Proxy : public SERVANT_TYPE, public TAO_Notify_UpdateListener +class TAO_Notify_Export TAO_Notify_Proxy : public SERVANT_TYPE, virtual public TAO_Notify_UpdateListener, public PortableServer::RefCountServantBase { // = TITLE // TAO_Notify_Proxy @@ -57,14 +56,20 @@ class TAO_Notify_Export TAO_Notify_Proxy : public SERVANT_TYPE, public TAO_Notif // public: - TAO_Notify_Proxy (TAO_Notify_Resource_Manager* resource_manager); + TAO_Notify_Proxy (void); // Constructor virtual ~TAO_Notify_Proxy (void); // Destructor - void init (CosNotifyChannelAdmin::ProxyID myID, CORBA::Environment &ACE_TRY_ENV); - // Init the Proxy. + // = TAO_Notify_RefCounted methods + CORBA::ULong _incr_refcnt (void); + CORBA::ULong _decr_refcnt (void); + // Increment and decrement the reference count. + + // = The Servant methods + virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV); + virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV); // = Notify_Update_Listener methods virtual void dispatch_update (TAO_Notify_EventType_List& added_list, TAO_Notify_EventType_List& removed_list, CORBA::Environment &ACE_TRY_ENV); @@ -156,26 +161,22 @@ virtual void remove_all_filters ( virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV) = 0; // Derived types should implement this to deliver the update. -// = Helper methods - virtual void cleanup_i (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); - // Cleanup all resources used by this object. - // = Data members - CosNotifyChannelAdmin::ProxyType mytype_; + ACE_Lock* lock_; + // The locking strategy. + + CORBA::ULong refcount_; + // The reference count. + + CosNotifyChannelAdmin::ProxyType proxy_type_; // What type are we? TAO_Notify_Event_Manager* event_manager_; // Our event manager. - TAO_Notify_Resource_Manager* resource_manager_; - // The resource factory. - CORBA::Boolean is_connected_; // True if we are connected to a consumer. - CORBA::Boolean is_destroyed_; - // True if we are destroyed. - CORBA::Boolean updates_on_; // True by default, for subscription/publication updates. @@ -185,8 +186,8 @@ virtual void remove_all_filters ( TAO_Notify_FilterAdmin_i filter_admin_; // Handles the Filter admin methods. - CosNotifyChannelAdmin::ProxyID myID_; - // The ID assigned to the Proxy. + CosNotifyChannelAdmin::ProxyID proxy_id_; + // The ID assigned to this Proxy. }; #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Resource_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Resource_Manager.cpp deleted file mode 100644 index c8a5ce388a9..00000000000 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Resource_Manager.cpp +++ /dev/null @@ -1,429 +0,0 @@ -// $Id$ -#include "Notify_Resource_Manager.h" -#include "Notify_EventChannelFactory_i.h" -#include "Notify_EventChannel_i.h" -#include "Notify_FilterFactory_i.h" -#include "Notify_ConsumerAdmin_i.h" -#include "Notify_SupplierAdmin_i.h" -#include "Notify_StructuredProxyPushSupplier_i.h" -#include "Notify_SequenceProxyPushSupplier_i.h" -#include "Notify_ProxyPushSupplier_i.h" -#include "Notify_StructuredProxyPushConsumer_i.h" -#include "Notify_SequenceProxyPushConsumer_i.h" -#include "Notify_ProxyPushConsumer_i.h" - -#define EC_POA_NAME "EC_POA" -// The POA name in which all the EC's live. - -ACE_RCSID(Notify, Notify_Resource_Manager, "$Id$") - -TAO_Notify_Resource_Manager::TAO_Notify_Resource_Manager (PortableServer::POA_ptr default_POA) - :default_POA_ (PortableServer::POA::_duplicate (default_POA)) -{ -} - -TAO_Notify_Resource_Manager::~TAO_Notify_Resource_Manager () -{ - this->deactivate_object(this->default_filter_factory_.in (), - this->default_POA_.in (), - TAO_default_environment ()); - - default_POA_ = PortableServer::POA::_nil (); - this->default_filter_factory_ = CosNotifyFilter::FilterFactory::_nil (); -} - -TAO_Notify_Resource_Manager* -TAO_Notify_Resource_Manager::create (PortableServer::POA_ptr default_POA, CORBA::Environment &ACE_TRY_ENV) -{ - TAO_Notify_Resource_Manager* mgr; - ACE_NEW_THROW_EX (mgr, - TAO_Notify_Resource_Manager (default_POA), - CORBA::NO_MEMORY ()); - - ACE_TRY - { - mgr->init_i (ACE_TRY_ENV); - ACE_TRY_CHECK; - } - ACE_CATCHALL - { - delete mgr; - mgr = 0; - } - ACE_ENDTRY; - - return mgr; -} - -void -TAO_Notify_Resource_Manager::init_i (CORBA::Environment &ACE_TRY_ENV) -{ - this->default_filter_factory_ = - this->create_default_filter_factory_i (ACE_TRY_ENV); - ACE_CHECK; -} - -CosNotifyFilter::FilterFactory_ptr -TAO_Notify_Resource_Manager::create_default_filter_factory_i (CORBA::Environment& ACE_TRY_ENV) -{ - TAO_Notify_FilterFactory_i* filterfactory = - this->create_filter_factory (ACE_TRY_ENV); - ACE_CHECK_RETURN (CosNotifyFilter::FilterFactory::_nil ()); - - PortableServer::ServantBase_var filterfactory_var (filterfactory); - - // Init goes here. - // ACE_CHECK_RETURN (CosNotifyFilter::FilterFactory::_nil ()); - - CORBA::Object_var obj = this->activate_object (this->default_POA_.in (), - filterfactory, ACE_TRY_ENV); - ACE_CHECK_RETURN (CosNotifyFilter::FilterFactory::_nil ()); - - return CosNotifyFilter::FilterFactory::_narrow (obj.in ()); -} - -TAO_Notify_EventChannel_i* -TAO_Notify_Resource_Manager::create_event_channel (TAO_Notify_EventChannelFactory_i* parent, CORBA::Environment &ACE_TRY_ENV) -{ - TAO_Notify_EventChannel_i* channel; - ACE_NEW_THROW_EX (channel, - TAO_Notify_EventChannel_i (parent, this), - CORBA::NO_MEMORY ()); - return channel; -} - -TAO_Notify_ConsumerAdmin_i* -TAO_Notify_Resource_Manager::create_consumer_admin (TAO_Notify_EventChannel_i* event_channel, - CORBA::Environment &ACE_TRY_ENV) -{ - TAO_Notify_ConsumerAdmin_i* consumer_admin_i; - ACE_NEW_THROW_EX (consumer_admin_i, - TAO_Notify_ConsumerAdmin_i (event_channel, this), - CORBA::NO_MEMORY ()); - return consumer_admin_i; -} - -TAO_Notify_SupplierAdmin_i* -TAO_Notify_Resource_Manager::create_supplier_admin (TAO_Notify_EventChannel_i* event_channel, - CORBA::Environment &ACE_TRY_ENV) -{ - TAO_Notify_SupplierAdmin_i* supplier_admin_i; - - ACE_NEW_THROW_EX (supplier_admin_i, - TAO_Notify_SupplierAdmin_i (event_channel, this), - CORBA::NO_MEMORY ()); - return supplier_admin_i; -} - -PortableServer::POA_ptr -TAO_Notify_Resource_Manager::get_default_POA (void) -{ - return PortableServer::POA::_duplicate (this->default_POA_.in ()); -} - -CosNotifyFilter::FilterFactory_ptr -TAO_Notify_Resource_Manager::get_default_filter_factory (void) -{ - return CosNotifyFilter::FilterFactory:: - _duplicate (this->default_filter_factory_.in ()); -} - -TAO_Notify_FilterFactory_i* -TAO_Notify_Resource_Manager::create_filter_factory (CORBA::Environment &ACE_TRY_ENV) -{ - TAO_Notify_FilterFactory_i* filterfactory; - ACE_NEW_THROW_EX (filterfactory, - TAO_Notify_FilterFactory_i (), - CORBA::NO_MEMORY ()); - return filterfactory; -} - -TAO_Notify_Event_Manager* -TAO_Notify_Resource_Manager::create_event_manager (TAO_Notify_EventChannel_i* channel, CORBA::Environment &ACE_TRY_ENV) -{ - TAO_Notify_Event_Manager* event_manager; - ACE_NEW_THROW_EX (event_manager, - TAO_Notify_Event_Manager (channel), - CORBA::NO_MEMORY ()); - return event_manager; -} - -TAO_Notify_StructuredProxyPushSupplier_i* -TAO_Notify_Resource_Manager::create_struct_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV) -{ - TAO_Notify_StructuredProxyPushSupplier_i* proxy; - ACE_NEW_THROW_EX (proxy, - TAO_Notify_StructuredProxyPushSupplier_i (parent, this), - CORBA::NO_MEMORY ()); - return proxy; -} - -TAO_Notify_SequenceProxyPushSupplier_i* -TAO_Notify_Resource_Manager::create_seq_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV) -{ - TAO_Notify_SequenceProxyPushSupplier_i* proxy; - ACE_NEW_THROW_EX (proxy, - TAO_Notify_SequenceProxyPushSupplier_i (parent, this), - CORBA::NO_MEMORY ()); - return proxy; -} - -TAO_Notify_ProxyPushSupplier_i* -TAO_Notify_Resource_Manager::create_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV) -{ - TAO_Notify_ProxyPushSupplier_i* proxy; - ACE_NEW_THROW_EX (proxy, - TAO_Notify_ProxyPushSupplier_i (parent, this), - CORBA::NO_MEMORY ()); - return proxy; -} - -TAO_Notify_StructuredProxyPushConsumer_i* -TAO_Notify_Resource_Manager::create_struct_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV) -{ - TAO_Notify_StructuredProxyPushConsumer_i* proxy; - ACE_NEW_THROW_EX (proxy, - TAO_Notify_StructuredProxyPushConsumer_i (parent, this), - CORBA::NO_MEMORY ()); - return proxy; -} - -TAO_Notify_SequenceProxyPushConsumer_i* -TAO_Notify_Resource_Manager::create_seq_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV) -{ - TAO_Notify_SequenceProxyPushConsumer_i* proxy; - ACE_NEW_THROW_EX (proxy, - TAO_Notify_SequenceProxyPushConsumer_i (parent, this), - CORBA::NO_MEMORY ()); - return proxy; -} - -TAO_Notify_ProxyPushConsumer_i* -TAO_Notify_Resource_Manager::create_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV) -{ - TAO_Notify_ProxyPushConsumer_i* proxy; - ACE_NEW_THROW_EX (proxy, - TAO_Notify_ProxyPushConsumer_i (parent, this), - CORBA::NO_MEMORY ()); - return proxy; -} - -PortableServer::POA_ptr -TAO_Notify_Resource_Manager::create_event_channel_POA (PortableServer::POA_ptr parent_poa, CORBA::Environment &ACE_TRY_ENV) -{ - return this->create_generic_childPOA_i (EC_POA_NAME, - parent_poa, ACE_TRY_ENV); -} - - -PortableServer::POA_ptr -TAO_Notify_Resource_Manager::create_supplier_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV) -{ - char child_poa_name[BUFSIZ]; - - ACE_OS::sprintf (child_poa_name, "%d%s", new_poa_id, "SA"); - - return this->create_generic_childPOA_i (child_poa_name, parent_poa, - ACE_TRY_ENV); -} - -PortableServer::POA_ptr -TAO_Notify_Resource_Manager::create_consumer_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV) -{ - char child_poa_name[BUFSIZ]; - - ACE_OS::sprintf (child_poa_name, "%d%s", new_poa_id, "CA"); - - return this->create_generic_childPOA_i (child_poa_name, - parent_poa, ACE_TRY_ENV); -} - -PortableServer::POA_ptr -TAO_Notify_Resource_Manager::create_proxy_pushconsumer_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV) -{ - char child_poa_name[BUFSIZ]; - - ACE_OS::sprintf (child_poa_name, "%d%s", new_poa_id, "PPC"); - - return this->create_generic_childPOA_i (child_poa_name, - parent_poa, ACE_TRY_ENV); -} - -PortableServer::POA_ptr -TAO_Notify_Resource_Manager::create_proxy_pushsupplier_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV) -{ - char child_poa_name[BUFSIZ]; - - ACE_OS::sprintf (child_poa_name, "%d%s", new_poa_id, "PPS"); - - return this->create_generic_childPOA_i (child_poa_name, - parent_poa, ACE_TRY_ENV); -} - -PortableServer::POA_ptr -TAO_Notify_Resource_Manager::create_generic_childPOA_i (const char* child_poa_name, PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV) -{ - // @@ Pradeep: if the Notification service is ever going to be - // persistent or fault tolerant you may need to create this stuff - // with the persistent policy too, probably you can handle that - // using a different 'Resource_Manager' that overrides this - // method. Just a thought... - - // Create a UNIQUE_ID and USER_ID policy because we want the POA - // to detect duplicates for us. - PortableServer::IdUniquenessPolicy_var idpolicy = - poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID, - ACE_TRY_ENV); - ACE_CHECK_RETURN (PortableServer::POA::_nil()); - - PortableServer::IdAssignmentPolicy_var assignpolicy = - poa->create_id_assignment_policy (PortableServer::USER_ID, - ACE_TRY_ENV); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); - - PortableServer::POAManager_var manager = - poa->the_POAManager (ACE_TRY_ENV); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); - - // Create a PolicyList - CORBA::PolicyList policy_list; - policy_list.length (2); - policy_list [0] = - PortableServer::IdUniquenessPolicy::_duplicate (idpolicy.in ()); - policy_list [1] = - PortableServer::IdAssignmentPolicy::_duplicate (assignpolicy.in ()); - - // @@ Pradeep: is it possible to use a more meaningful name? - - // Create the child POA. - PortableServer::POA_var poa_ret = poa->create_POA (child_poa_name, - manager.in (), - policy_list, - ACE_TRY_ENV); - ACE_CHECK_RETURN (PortableServer::POA::_nil()); - - idpolicy->destroy (ACE_TRY_ENV); - ACE_CHECK_RETURN (PortableServer::POA::_nil()); - - assignpolicy->destroy (); - ACE_CHECK_RETURN (PortableServer::POA::_nil()); - - return poa_ret._retn (); -} - -PortableServer::ObjectId * -TAO_Notify_Resource_Manager::long_to_ObjectId (const CORBA::Long id) -{ - // Modified code from string_to_ObjectId .. - // - - CORBA::ULong buffer_size = 4; - - // Create the buffer for the Id - CORBA::Octet *buffer = PortableServer::ObjectId::allocbuf (buffer_size); - - // Copy the contents - ACE_OS::memcpy (buffer, (char*)&id, buffer_size); - - // @@ Pradeep: TAO guarantees that Long is 4 bytes wide, but the - // standard only guarantees that it is at least 4 bytes wide. You - // may want to think about that.... - - // Create and return a new ID - PortableServer::ObjectId *obj_id = 0; - ACE_NEW_RETURN (obj_id, - PortableServer::ObjectId (buffer_size, - buffer_size, - buffer, - 1), - 0); - - return obj_id; -} - -CORBA::Object_ptr -TAO_Notify_Resource_Manager::activate_object_with_id (CORBA::Long id, PortableServer::POA_ptr poa, PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV) -{ - // Convert CORBA::Long to ObjectId - PortableServer::ObjectId_var oid = - this->long_to_ObjectId (id); - - poa->activate_object_with_id (oid.in (), - servant, - ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); - - return poa->id_to_reference (oid.in (), - ACE_TRY_ENV); -} - -CORBA::Object_ptr -TAO_Notify_Resource_Manager::activate_object (PortableServer::POA_ptr poa, PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV) -{ - PortableServer::ObjectId_var oid = poa->activate_object (servant, ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); - - return poa->id_to_reference (oid.in (), ACE_TRY_ENV); -} - -CORBA::Object_ptr -TAO_Notify_Resource_Manager::servant_to_reference (PortableServer::POA_ptr poa, PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV) -{ - PortableServer::ObjectId_var oid = poa->servant_to_id (servant, ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); - - return poa->id_to_reference (oid.in (), ACE_TRY_ENV); -} - -CORBA::Object_ptr -TAO_Notify_Resource_Manager::id_to_reference (CORBA::Long id, PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV) -{ - // Convert CORBA::Long to ObjectId - PortableServer::ObjectId_var oid = - this->long_to_ObjectId (id); - - return poa->id_to_reference (oid.in (), - ACE_TRY_ENV); -} - -void -TAO_Notify_Resource_Manager::destroy_POA (PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV) -{ - if (!CORBA::is_nil (poa)) - poa->destroy (1,0,ACE_TRY_ENV); - // The <wait_for_completion> flag causes a deadlock when destroying the POA - // because we are involved in an upcall. - // TODO:I have to think about what the implications of not waiting are. -} - -void -TAO_Notify_Resource_Manager::deactivate_object (CORBA::Object_ptr obj, PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV) -{ - if (CORBA::is_nil (poa) || CORBA::is_nil (obj)) - return; - - PortableServer::ObjectId_var id = - poa->reference_to_id (obj, ACE_TRY_ENV); - ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); - ACE_CHECK; -} - -void -TAO_Notify_Resource_Manager::deactivate_object (PortableServer::Servant servant, PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV) -{ - if (CORBA::is_nil (poa) || servant == 0) - return; - - PortableServer::ObjectId_var id = - poa->servant_to_id (servant, ACE_TRY_ENV); - ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); - ACE_CHECK; -} - -CORBA::Boolean -TAO_Notify_Resource_Manager::default_subscription_enabled (void) -{ - return 1; // @@ true for now, make this a user option -} diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Resource_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Resource_Manager.h deleted file mode 100644 index 95b60b0a765..00000000000 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Resource_Manager.h +++ /dev/null @@ -1,187 +0,0 @@ -// $Id$ -// ========================================================================== -// -// = LIBRARY -// Orbsvcs -// -// = FILENAME -// Notify_Resource_Manager.h -// -// = DESCRIPTION -// Resource Manager for the Notify Service implementation. -// -// = AUTHOR -// Pradeep Gore <pradeep@cs.wustl.edu> -// -// ========================================================================== -#ifndef TAO_NOTIFY_RESOURCE_MANAGER -#define TAO_NOTIFY_RESOURCE_MANAGER -#include "ace/pre.h" - -#include "tao/POA.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "Notify_ID_Pool_T.h" -#include "notify_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -class TAO_Notify_EventChannelFactory_i; -class TAO_Notify_EventChannel_i; -class TAO_Notify_FilterFactory_i; -class TAO_Notify_ConsumerAdmin_i; -class TAO_Notify_SupplierAdmin_i; -class TAO_Notify_StructuredProxyPushSupplier_i; -class TAO_Notify_SequenceProxyPushSupplier_i; -class TAO_Notify_ProxyPushSupplier_i; -class TAO_Notify_StructuredProxyPushConsumer_i; -class TAO_Notify_SequenceProxyPushConsumer_i; -class TAO_Notify_ProxyPushConsumer_i; -class TAO_Notify_Event_Manager; - -class TAO_Notify_Export TAO_Notify_Resource_Manager -{ - // = TITLE - // Notify_Resource_Factory - // - // = DESCRIPTION - // This is class to control all the resources needed by all the other - // classes. - // - // @@ Pradeep: this is a class a factory? Or is it a manager for - // resource created by a factory? The interfaces should be quite - // different, and it is hard to turn a manager into a Service - // Object (but factories are much easier). If you check the - // design of the RTEC and the new CosEC you will notice that the - // Event_Channel class plays the manager role and the factory is a - // separate entity. Your idea of separating the manager from the - // Event_Channel is probably the "Right Thing" but you should also - // decouple the factory and manager roles. - // - // Later: The class is also a Service Object that will configure the - // service on startup. - - public: - - TAO_Notify_Resource_Manager (PortableServer::POA_ptr default_POA); - // Constructor. - - ~TAO_Notify_Resource_Manager (); - // Destructor. - - // = Factory method - static TAO_Notify_Resource_Manager* create (PortableServer::POA_ptr default_POA, CORBA::Environment &ACE_TRY_ENV); - // Factory method to create the Resource Factory Manager. - // @@ Pradeep: how is that possible? I still have to know the class - // to create it, right? - // This allows other specializations of the Resource Factory to be created - // via a common interface. - - // = Accessors - PortableServer::POA_ptr get_default_POA (void); - // Returns the default POA. - - CosNotifyFilter::FilterFactory_ptr get_default_filter_factory (void); - // Returns the default filter factory. - - // = Creation methods - TAO_Notify_EventChannel_i* create_event_channel (TAO_Notify_EventChannelFactory_i* parent, CORBA::Environment &ACE_TRY_ENV); - // Create an Event Channel. - - TAO_Notify_ConsumerAdmin_i* create_consumer_admin (TAO_Notify_EventChannel_i* channel, CORBA::Environment &ACE_TRY_ENV); - // Create a Consumer Admin. - - TAO_Notify_SupplierAdmin_i* create_supplier_admin (TAO_Notify_EventChannel_i* channel, CORBA::Environment &ACE_TRY_ENV); - // Create a Supplier Admin. - - TAO_Notify_FilterFactory_i* create_filter_factory (CORBA::Environment &ACE_TRY_ENV); - // Create the Filter Factory. - - TAO_Notify_Event_Manager* create_event_manager (TAO_Notify_EventChannel_i* channel, CORBA::Environment &ACE_TRY_ENV); - // Create an event manager. - - TAO_Notify_StructuredProxyPushSupplier_i* create_struct_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV); - // Create a Structured ProxyPushSupplier. - - TAO_Notify_SequenceProxyPushSupplier_i* create_seq_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV); - // Create a Sequence ProxyPushSupplier. - - TAO_Notify_ProxyPushSupplier_i* create_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV); - // Create a ProxyPushSupplier. - - TAO_Notify_StructuredProxyPushConsumer_i* create_struct_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV); - // Create a Structured ProxyPushConsumer. - - TAO_Notify_SequenceProxyPushConsumer_i* create_seq_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV); - // Create a Sequence ProxyPushConsumer. - - TAO_Notify_ProxyPushConsumer_i* create_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV); - // Create a ProxyPushConsumer. - - PortableServer::POA_ptr create_event_channel_POA (PortableServer::POA_ptr parent_poa, CORBA::Environment &ACE_TRY_ENV); - // Create the POA to activate Event Channels in. - - PortableServer::POA_ptr create_supplier_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV); - // Create the POA to activate SA's in. - - PortableServer::POA_ptr create_consumer_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV); - // Create the POA to activate CA's in. - - PortableServer::POA_ptr create_proxy_pushconsumer_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV); - // Create the POA to activate proxy push consumers in. - - PortableServer::POA_ptr create_proxy_pushsupplier_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV); - // Create the POA to activate proxy push suppliers in. - - // = Object activation and POA methods - CORBA::Object_ptr activate_object_with_id (CORBA::Long id, PortableServer::POA_ptr poa,PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV); - // Converts <id> to an ObjectId and registers with the POA <poa>. - - CORBA::Object_ptr activate_object (PortableServer::POA_ptr poa,PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV); - // Registers with the POA <poa>. - - CORBA::Object_ptr servant_to_reference (PortableServer::POA_ptr poa,PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV); - // Registers with the POA <poa>. - - CORBA::Object_ptr id_to_reference (CORBA::Long id, PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV); - // Look for the Object with id <id> in <poa>. - - void destroy_POA (PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); - // Destroy the <poa> - - void deactivate_object (CORBA::Object_ptr obj, PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); - // Deactivate the object. - - void deactivate_object (PortableServer::Servant servant, PortableServer::POA_ptr, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); - // Deactivate the object. - - // = Options - CORBA::Boolean default_subscription_enabled (void); - // True if new born event listeners should be subscribed for all the events. - - protected: - // = Helper methods - void init_i (CORBA::Environment &ACE_TRY_ENV); - // Initialize. - - PortableServer::ObjectId* long_to_ObjectId (const CORBA::Long id); - // Converts a CORBA::Long to an ObjectId - - PortableServer::POA_ptr create_generic_childPOA_i (const char* child_poa_name, PortableServer::POA_ptr parent_poa, CORBA::Environment &ACE_TRY_ENV); - // Create the POA with the most generic policies required of our POA's. - - CosNotifyFilter::FilterFactory_ptr create_default_filter_factory_i (CORBA::Environment& ACE_TRY_ENV); - // Create the filter factory used by all ECs. - - // = Data Members - PortableServer::POA_var default_POA_; - // The default POA to use. - - CosNotifyFilter::FilterFactory_var default_filter_factory_; - // The default filter factory. - // We create and own this. -}; - -#include "ace/post.h" -#endif /* TAO_NOTIFY_RESOURCE_MANAGER */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.cpp index 290bb3817d6..f15f22e46d7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.cpp @@ -7,21 +7,15 @@ ACE_RCSID(Notify, Notify_SequenceProxyPushConsumer_i, "$Id$") -TAO_Notify_SequenceProxyPushConsumer_i::TAO_Notify_SequenceProxyPushConsumer_i (TAO_Notify_SupplierAdmin_i* supplieradmin, TAO_Notify_Resource_Manager* resource_manager) - : sequence_proxy_inherited(supplieradmin, resource_manager) -{ -} +typedef ACE_Reverse_Lock<ACE_Lock> TAO_Notify_Unlock; -TAO_Notify_SequenceProxyPushConsumer_i::~TAO_Notify_SequenceProxyPushConsumer_i (void) +TAO_Notify_SequenceProxyPushConsumer_i::TAO_Notify_SequenceProxyPushConsumer_i (TAO_Notify_SupplierAdmin_i* supplier_admin) + : proxy_inherited (supplier_admin) { } -void -TAO_Notify_SequenceProxyPushConsumer_i::cleanup_i (CORBA::Environment& ACE_TRY_ENV) +TAO_Notify_SequenceProxyPushConsumer_i::~TAO_Notify_SequenceProxyPushConsumer_i (void) { - sequence_proxy_inherited::cleanup_i (ACE_TRY_ENV); - - this->is_destroyed_ = 1; } void @@ -35,16 +29,38 @@ TAO_Notify_SequenceProxyPushConsumer_i::connect_sequence_push_supplier (CosNotif // safe, i know you are post-poning the thread safety issues, but it // is not that easy! + ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, + CORBA::INTERNAL ()); + ACE_CHECK; + if (this->is_connected_ == 1) ACE_THROW (CosEventChannelAdmin::AlreadyConnected ()); else this->push_supplier_ = CosNotifyComm::SequencePushSupplier::_duplicate (push_supplier); - this->event_manager_->register_for_subscription_updates (this, ACE_TRY_ENV); - ACE_CHECK; - this->is_connected_ = 1; + + ACE_TRY + { + TAO_Notify_Unlock reverse_lock (*this->lock_); + + { + ACE_GUARD_THROW_EX (TAO_Notify_Unlock, ace_mon, reverse_lock, + CORBA::INTERNAL ()); + ACE_CHECK; + + this->event_manager_->register_for_subscription_updates (this, ACE_TRY_ENV); + ACE_TRY_CHECK; + } + } + ACE_CATCHALL + { + this->push_supplier_ = CosNotifyComm::SequencePushSupplier::_nil (); + this->is_connected_ = 0; + ACE_RE_THROW; + } + ACE_ENDTRY; } void @@ -70,19 +86,27 @@ TAO_Notify_SequenceProxyPushConsumer_i::push_structured_events (const CosNotific CosEventComm::Disconnected )) { - if (this->is_connected_ == 0) - ACE_THROW (CosEventComm::Disconnected ()); + { + ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, + CORBA::INTERNAL ()); + ACE_CHECK; + + if (this->is_connected_ == 0) + ACE_THROW (CosEventComm::Disconnected ()); + } + CosNotification::StructuredEvent *notification_copy; for (CORBA::ULong i = 0; i < notifications.length (); ++i) { - TAO_Notify_StructuredEvent notify_event (notifications[i]); + ACE_NEW_THROW_EX (notification_copy, + CosNotification::StructuredEvent (notifications[i]), + CORBA::NO_MEMORY ()); - CORBA::Boolean bval = - this->check_filters_i (notify_event, ACE_TRY_ENV); - ACE_CHECK; + TAO_Notify_StructuredEvent* notify_event = + new TAO_Notify_StructuredEvent(notification_copy); - if (bval == 1) - this->event_manager_->push (notify_event, ACE_TRY_ENV); + this->event_manager_->process_event (notify_event, this, ACE_TRY_ENV); + notify_event->_decr_refcnt (); } } @@ -92,13 +116,9 @@ TAO_Notify_SequenceProxyPushConsumer_i::disconnect_sequence_push_consumer (CORBA CORBA::SystemException )) { - this->is_destroyed_ = 1; - // ask our parent to deaactivate us. - this->myadmin_-> + this->supplier_admin_-> deactivate_proxy_pushconsumer (this, ACE_TRY_ENV); - - this->cleanup_i (ACE_TRY_ENV); } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.h index ee0cd388d88..0ae006072e4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.h @@ -25,7 +25,6 @@ #include "orbsvcs/CosNotifyChannelAdminS.h" class TAO_Notify_SupplierAdmin_i; -class TAO_Notify_Resource_Manager; #if defined(_MSC_VER) #if (_MSC_VER >= 1200) @@ -34,7 +33,7 @@ class TAO_Notify_Resource_Manager; #pragma warning(disable:4250) #endif /* _MSC_VER */ -class TAO_Notify_Export TAO_Notify_SequenceProxyPushConsumer_i : public TAO_Notify_ProxyConsumer <POA_CosNotifyChannelAdmin::SequenceProxyPushConsumer>, public PortableServer::RefCountServantBase +class TAO_Notify_Export TAO_Notify_SequenceProxyPushConsumer_i : public TAO_Notify_ProxyConsumer <POA_CosNotifyChannelAdmin::SequenceProxyPushConsumer> { // = TITLE // TAO_Notify_SequenceProxyPushConsumer_i @@ -44,7 +43,7 @@ class TAO_Notify_Export TAO_Notify_SequenceProxyPushConsumer_i : public TAO_Noti // public: - TAO_Notify_SequenceProxyPushConsumer_i (TAO_Notify_SupplierAdmin_i* consumeradmin, TAO_Notify_Resource_Manager* resource_manager); + TAO_Notify_SequenceProxyPushConsumer_i (TAO_Notify_SupplierAdmin_i* supplier_admin); // Constructor virtual ~TAO_Notify_SequenceProxyPushConsumer_i (void); @@ -77,19 +76,16 @@ public: )); protected: + // = Helper methods virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV); // Sends updates to the supplier. - // = Helper methods - void cleanup_i (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); - // Cleanup all resources used by this object. - // = Data members CosNotifyComm::SequencePushSupplier_ptr push_supplier_; // The supplier that we're connected to. - typedef TAO_Notify_ProxyConsumer <POA_CosNotifyChannelAdmin::SequenceProxyPushConsumer> - sequence_proxy_inherited; +private: + typedef TAO_Notify_ProxyConsumer <POA_CosNotifyChannelAdmin::SequenceProxyPushConsumer> proxy_inherited; }; #if defined(_MSC_VER) && (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.cpp index 5fb74e80a36..450ac08e61d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.cpp @@ -6,21 +6,15 @@ ACE_RCSID(Notify, Notify_SequenceProxyPushSupplier_i, "$Id$") -TAO_Notify_SequenceProxyPushSupplier_i::TAO_Notify_SequenceProxyPushSupplier_i (TAO_Notify_ConsumerAdmin_i* consumeradmin, TAO_Notify_Resource_Manager* resource_manager) - :sequence_proxy_inherited (consumeradmin, resource_manager) -{ -} +typedef ACE_Reverse_Lock<ACE_Lock> TAO_Notify_Unlock; -TAO_Notify_SequenceProxyPushSupplier_i::~TAO_Notify_SequenceProxyPushSupplier_i (void) +TAO_Notify_SequenceProxyPushSupplier_i::TAO_Notify_SequenceProxyPushSupplier_i (TAO_Notify_ConsumerAdmin_i* consumer_admin) + :proxy_inherited (consumer_admin) { } -void -TAO_Notify_SequenceProxyPushSupplier_i::cleanup_i (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SequenceProxyPushSupplier_i::~TAO_Notify_SequenceProxyPushSupplier_i (void) { - sequence_proxy_inherited::cleanup_i (ACE_TRY_ENV); - - this->push_consumer_ = CosNotifyComm::SequencePushConsumer::_nil (); } void @@ -31,6 +25,10 @@ TAO_Notify_SequenceProxyPushSupplier_i::connect_sequence_push_consumer (CosNotif CosEventChannelAdmin::TypeError )) { + ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, + CORBA::INTERNAL ()); + ACE_CHECK; + if (CORBA::is_nil (push_consumer)) ACE_THROW (CosEventChannelAdmin::TypeError ()); else if (this->is_connected_ == 1) @@ -39,14 +37,22 @@ TAO_Notify_SequenceProxyPushSupplier_i::connect_sequence_push_consumer (CosNotif { this->push_consumer_ = CosNotifyComm::SequencePushConsumer::_duplicate (push_consumer); + + this->is_connected_ = 1; } ACE_TRY { - this->on_connected (ACE_TRY_ENV); - ACE_TRY_CHECK; + TAO_Notify_Unlock reverse_lock (*this->lock_); - this->is_connected_ = 1; + { + ACE_GUARD_THROW_EX (TAO_Notify_Unlock, ace_mon, reverse_lock, + CORBA::INTERNAL ()); + ACE_CHECK; + + this->on_connected (ACE_TRY_ENV); + ACE_TRY_CHECK; + } } ACE_CATCHALL { @@ -82,19 +88,46 @@ TAO_Notify_SequenceProxyPushSupplier_i::dispatch_update_i (CosNotification::Even } void -TAO_Notify_SequenceProxyPushSupplier_i::disconnect_sequence_push_supplier( - CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SequenceProxyPushSupplier_i::disconnect_sequence_push_supplier(CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC (( CORBA::SystemException )) { - this->is_destroyed_ = 1; + this->on_disconnected (ACE_TRY_ENV); + ACE_CHECK; // ask our parent to deactivate us. - this->myadmin_-> + this->consumer_admin_-> deactivate_proxy_pushsupplier (this, ACE_TRY_ENV); +} + - this->cleanup_i (ACE_TRY_ENV); +void +TAO_Notify_SequenceProxyPushSupplier_i::shutdown (CORBA::Environment &ACE_TRY_ENV) +{ + // Tell the consumer that we're going away ... + // @@ Later, lookup a "notify_on_disconnect" option. + + { + ACE_GUARD (ACE_Lock, ace_mon, *this->lock_); + + if (this->is_connected_ == 0) + return; + } + + this->disconnect_sequence_push_supplier (ACE_TRY_ENV); + ACE_CHECK; + + ACE_TRY + { + this->push_consumer_->disconnect_sequence_push_consumer (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCHALL + { + // ignore + } + ACE_ENDTRY; } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.h index 38143b18d90..2bdc1d164e0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.h @@ -23,7 +23,6 @@ #include "orbsvcs/CosNotifyChannelAdminS.h" class TAO_Notify_ConsumerAdmin_i; -class TAO_Notify_Resource_Manager; #if defined(_MSC_VER) #if (_MSC_VER >= 1200) @@ -32,7 +31,7 @@ class TAO_Notify_Resource_Manager; #pragma warning(disable:4250) #endif /* _MSC_VER */ -class TAO_Notify_Export TAO_Notify_SequenceProxyPushSupplier_i : public TAO_Notify_ProxySupplier<POA_CosNotifyChannelAdmin::SequenceProxyPushSupplier>, public PortableServer::RefCountServantBase +class TAO_Notify_Export TAO_Notify_SequenceProxyPushSupplier_i : public TAO_Notify_ProxySupplier<POA_CosNotifyChannelAdmin::SequenceProxyPushSupplier> { // = TITLE // TAO_Notify_SequenceProxyPushSupplier_i @@ -42,7 +41,7 @@ class TAO_Notify_Export TAO_Notify_SequenceProxyPushSupplier_i : public TAO_Noti // public: - TAO_Notify_SequenceProxyPushSupplier_i (TAO_Notify_ConsumerAdmin_i* consumeradmin, TAO_Notify_Resource_Manager* resource_manager); + TAO_Notify_SequenceProxyPushSupplier_i (TAO_Notify_ConsumerAdmin_i* consumer_admin); // Constructor virtual ~TAO_Notify_SequenceProxyPushSupplier_i (void); @@ -66,6 +65,10 @@ class TAO_Notify_Export TAO_Notify_SequenceProxyPushSupplier_i : public TAO_Noti CORBA::SystemException )); + + virtual void shutdown (CORBA::Environment &ACE_TRY_ENV); + // Shutdown. + // @@ Pradeep: please setup your editor to start 'protected', // 'public' and 'private' on the first column @@ -76,15 +79,12 @@ class TAO_Notify_Export TAO_Notify_SequenceProxyPushSupplier_i : public TAO_Noti virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV); // Deliver the update to the consumer. - // = Helper methods - virtual void cleanup_i (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); - // Cleanup all resources used by this object. - CosNotifyComm::SequencePushConsumer_var push_consumer_; // The consumer that we're connect to. + private: typedef TAO_Notify_ProxySupplier<POA_CosNotifyChannelAdmin::SequenceProxyPushSupplier> - sequence_proxy_inherited; + proxy_inherited; }; #if defined(_MSC_VER) && (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.cpp new file mode 100644 index 00000000000..07d4194c5ae --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.cpp @@ -0,0 +1,47 @@ +// $Id$ + +#include "Notify_Source_Filter_Eval_Command.h" +#include "Notify_Listeners.h" +#include "Notify_Lookup_Command.h" +#include "Notify_Worker_Task.h" +#include "Notify_Event.h" + +ACE_RCSID(Notify, Notify_Source_Filter_Eval_Command, "$Id$") + +TAO_Notify_Source_Filter_Eval_Command::TAO_Notify_Source_Filter_Eval_Command (TAO_Notify_Event* event, TAO_Notify_EventSource* event_source) + :event_ (event), + event_source_ (event_source) +{ + this->event_source_->_incr_refcnt (); + this->event_->_incr_refcnt (); +} + +TAO_Notify_Source_Filter_Eval_Command::~TAO_Notify_Source_Filter_Eval_Command () +{ + this->event_source_->_decr_refcnt (); + this->event_->_decr_refcnt (); +} + +int +TAO_Notify_Source_Filter_Eval_Command::execute (TAO_Notify_Worker_Task* parent_task, + CORBA::Environment& ACE_TRY_ENV) +{ + CORBA::Boolean result = + this->event_source_->evaluate_filter (*this->event_, ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + if (result == 1) + { + TAO_Notify_Lookup_Command* lookup = + new TAO_Notify_Lookup_Command (this->event_); + + ACE_ASSERT (parent_task->next () != 0); + + TAO_Notify_Worker_Task* next_task = + ACE_static_cast (TAO_Notify_Worker_Task*, parent_task->next()); + + return next_task->process_event (lookup, ACE_TRY_ENV); + } + + return -1; +} diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.h new file mode 100644 index 00000000000..78b37977a09 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.h @@ -0,0 +1,59 @@ +/* -*- C++ -*- */ +// $Id$ +// +// ============================================================================ +// +// = LIBRARY +// ORBSVCS Notification +// +// = FILENAME +// Notify_Source_Filter_Eval_Command.h +// +// = DESCRIPTION +// Command object for evaluating source filter. +// +// = AUTHOR +// Pradeep Gore <pradeep@cs.wustl.edu> +// +// ============================================================================ + +#ifndef TAO_NOTIFY_SOURCE_FILTER_EVAL_COMMAND_H +#define TAO_NOTIFY_SOURCE_FILTER_EVAL_COMMAND_H + +#include "ace/pre.h" +#include "Notify_Command.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "notify_export.h" + +class TAO_Notify_Event; +class TAO_Notify_EventSource; +class TAO_Notify_Worker_Task; + +class TAO_Notify_Export TAO_Notify_Source_Filter_Eval_Command : public TAO_Notify_Command +{ + // = TITLE + // TAO_Notify_Source_Filter_Eval_Command + // + // = DESCRIPTION + // Command object for evaluating event source's filter. + // +public: + // = Initialization and termination code + TAO_Notify_Source_Filter_Eval_Command (TAO_Notify_Event* event, TAO_Notify_EventSource* event_source); + ~TAO_Notify_Source_Filter_Eval_Command (); + + virtual int execute (TAO_Notify_Worker_Task* parent_task, CORBA::Environment& ACE_TRY_ENV); + // Command callback + +protected: + // = Data Members + TAO_Notify_Event* event_; + TAO_Notify_EventSource* event_source_; +}; + +#include "ace/post.h" +#endif /* TAO_NOTIFY_SOURCE_FILTER_EVAL_COMMAND_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.cpp index 1a36a4dc2bd..279d1102be9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.cpp @@ -7,21 +7,15 @@ ACE_RCSID(Notify, Notify_StructuredProxyPushConsumer_i, "$Id$") -TAO_Notify_StructuredProxyPushConsumer_i::TAO_Notify_StructuredProxyPushConsumer_i (TAO_Notify_SupplierAdmin_i* supplieradmin, TAO_Notify_Resource_Manager* resource_manager) - :structured_proxy_inherited (supplieradmin, resource_manager) -{ -} +typedef ACE_Reverse_Lock<ACE_Lock> TAO_Notify_Unlock; -TAO_Notify_StructuredProxyPushConsumer_i::~TAO_Notify_StructuredProxyPushConsumer_i (void) +TAO_Notify_StructuredProxyPushConsumer_i::TAO_Notify_StructuredProxyPushConsumer_i (TAO_Notify_SupplierAdmin_i* supplier_admin) + :proxy_inherited (supplier_admin) { } -void -TAO_Notify_StructuredProxyPushConsumer_i::cleanup_i (CORBA::Environment& ACE_TRY_ENV) +TAO_Notify_StructuredProxyPushConsumer_i::~TAO_Notify_StructuredProxyPushConsumer_i (void) { - structured_proxy_inherited::cleanup_i (ACE_TRY_ENV); - - this->is_destroyed_ = 1; } void @@ -31,16 +25,39 @@ TAO_Notify_StructuredProxyPushConsumer_i::connect_structured_push_supplier (CosN CosEventChannelAdmin::AlreadyConnected )) { + ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, + CORBA::INTERNAL ()); + ACE_CHECK; + if (this->is_connected_ == 1) ACE_THROW (CosEventChannelAdmin::AlreadyConnected ()); else this->push_supplier_ = CosNotifyComm::StructuredPushSupplier::_duplicate (push_supplier); - this->event_manager_->register_for_subscription_updates (this, ACE_TRY_ENV); - ACE_CHECK; - this->is_connected_ = 1; + + ACE_TRY + { + TAO_Notify_Unlock reverse_lock (*this->lock_); + + { + ACE_GUARD_THROW_EX (TAO_Notify_Unlock, ace_mon, reverse_lock, + CORBA::INTERNAL ()); + ACE_CHECK; + + this->event_manager_->register_for_subscription_updates (this, ACE_TRY_ENV); + ACE_TRY_CHECK; + } + } + ACE_CATCHALL + { + this->push_supplier_ = + CosNotifyComm::StructuredPushSupplier::_nil (); + + this->is_connected_ = 1; + } + ACE_ENDTRY; } void @@ -66,16 +83,26 @@ TAO_Notify_StructuredProxyPushConsumer_i::push_structured_event (const CosNotifi CosEventComm::Disconnected )) { - if (this->is_connected_ == 0) - ACE_THROW (CosEventComm::Disconnected ()); + { + ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, + CORBA::INTERNAL ()); + ACE_CHECK; - TAO_Notify_StructuredEvent notify_event (notification); + if (this->is_connected_ == 0) + ACE_THROW (CosEventComm::Disconnected ()); + } - CORBA::Boolean bval = this->check_filters_i (notify_event, ACE_TRY_ENV); - ACE_CHECK; + CosNotification::StructuredEvent *notification_copy; + ACE_NEW_THROW_EX (notification_copy, + CosNotification::StructuredEvent (notification), + CORBA::NO_MEMORY ()); + + TAO_Notify_StructuredEvent* notify_event = + new TAO_Notify_StructuredEvent (notification_copy); - if (bval == 1) - this->event_manager_->push (notify_event, ACE_TRY_ENV); + this->event_manager_->process_event (notify_event, this, ACE_TRY_ENV); + + notify_event->_decr_refcnt (); } void @@ -84,13 +111,9 @@ TAO_Notify_StructuredProxyPushConsumer_i::disconnect_structured_push_consumer (C CORBA::SystemException )) { - this->is_destroyed_ = 1; - // ask our parent to deaactivate us. - this->myadmin_-> + this->supplier_admin_-> deactivate_proxy_pushconsumer (this, ACE_TRY_ENV); - - this->cleanup_i (ACE_TRY_ENV); } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h index 192ec369fe5..9f0a12e3cad 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h @@ -19,13 +19,18 @@ #ifndef TAO_NOTIFY_STRUCTUREDPROXYPUSHCONSUMER_I_H #define TAO_NOTIFY_STRUCTUREDPROXYPUSHCONSUMER_I_H + #include "ace/pre.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ #include "Notify_ProxyConsumer_T.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "notify_export.h" class TAO_Notify_SupplierAdmin_i; -class TAO_Notify_Resource_Manager; #if defined(_MSC_VER) #if (_MSC_VER >= 1200) @@ -34,7 +39,7 @@ class TAO_Notify_Resource_Manager; #pragma warning(disable:4250) #endif /* _MSC_VER */ -class TAO_Notify_Export TAO_Notify_StructuredProxyPushConsumer_i : public TAO_Notify_ProxyConsumer <POA_CosNotifyChannelAdmin::StructuredProxyPushConsumer>, public PortableServer::RefCountServantBase +class TAO_Notify_Export TAO_Notify_StructuredProxyPushConsumer_i : public TAO_Notify_ProxyConsumer <POA_CosNotifyChannelAdmin::StructuredProxyPushConsumer> { // = TITLE // TAO_Notify_StructuredProxyPushConsumer_i @@ -44,7 +49,7 @@ class TAO_Notify_Export TAO_Notify_StructuredProxyPushConsumer_i : public TAO_No // public: - TAO_Notify_StructuredProxyPushConsumer_i (TAO_Notify_SupplierAdmin_i* consumeradmin, TAO_Notify_Resource_Manager* resource_manager); + TAO_Notify_StructuredProxyPushConsumer_i (TAO_Notify_SupplierAdmin_i* supplier_admin); // Constructor virtual ~TAO_Notify_StructuredProxyPushConsumer_i (void); @@ -81,15 +86,13 @@ protected: virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV); // dispatch updates to the supplier. - void cleanup_i (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); - // Cleanup all resources used by this object. - // = Data members CosNotifyComm::StructuredPushSupplier_var push_supplier_; // The supplier that we're connected to. +private: typedef TAO_Notify_ProxyConsumer <POA_CosNotifyChannelAdmin::StructuredProxyPushConsumer> - structured_proxy_inherited; + proxy_inherited; }; #if defined(_MSC_VER) && (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.cpp index a948d54e989..8139bf32594 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.cpp @@ -6,21 +6,15 @@ ACE_RCSID(Notify, Notify_StructuredProxyPushSupplier_i, "$Id$") -TAO_Notify_StructuredProxyPushSupplier_i::TAO_Notify_StructuredProxyPushSupplier_i (TAO_Notify_ConsumerAdmin_i* consumeradmin, TAO_Notify_Resource_Manager* resource_manager) - :structured_proxy_inherited (consumeradmin, resource_manager) -{ -} +typedef ACE_Reverse_Lock<ACE_Lock> TAO_Notify_Unlock; -TAO_Notify_StructuredProxyPushSupplier_i::~TAO_Notify_StructuredProxyPushSupplier_i (void) +TAO_Notify_StructuredProxyPushSupplier_i::TAO_Notify_StructuredProxyPushSupplier_i (TAO_Notify_ConsumerAdmin_i* consumeradmin) + :proxy_inherited (consumeradmin) { } -void -TAO_Notify_StructuredProxyPushSupplier_i::cleanup_i (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_StructuredProxyPushSupplier_i::~TAO_Notify_StructuredProxyPushSupplier_i (void) { - structured_proxy_inherited::cleanup_i (ACE_TRY_ENV); - - this->push_consumer_ = CosNotifyComm::StructuredPushConsumer::_nil (); } void @@ -31,28 +25,46 @@ TAO_Notify_StructuredProxyPushSupplier_i::connect_structured_push_consumer (CosN CosEventChannelAdmin::TypeError )) { + ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, + CORBA::INTERNAL ()); + ACE_CHECK; + if (CORBA::is_nil (push_consumer)) ACE_THROW (CosEventChannelAdmin::TypeError ()); - else if (this->is_connected_ == 1) - ACE_THROW (CosEventChannelAdmin::AlreadyConnected ()); else { - this->push_consumer_ = - CosNotifyComm::StructuredPushConsumer::_duplicate (push_consumer); + if (this->is_connected_ == 1) + ACE_THROW (CosEventChannelAdmin::AlreadyConnected ()); + else + { + this->push_consumer_ = + CosNotifyComm::StructuredPushConsumer::_duplicate (push_consumer); + } + + this->is_connected_ = 1; } ACE_TRY { - this->on_connected (ACE_TRY_ENV); - ACE_TRY_CHECK; + TAO_Notify_Unlock reverse_lock (*this->lock_); - this->is_connected_ = 1; + { + ACE_GUARD_THROW_EX (TAO_Notify_Unlock, ace_mon, reverse_lock, + CORBA::INTERNAL ()); + ACE_CHECK; + + this->on_connected (ACE_TRY_ENV); + ACE_TRY_CHECK; + } } ACE_CATCHALL { - this->push_consumer_ = - CosNotifyComm::StructuredPushConsumer::_nil (); - ACE_RE_THROW; + this->push_consumer_ = + CosNotifyComm::StructuredPushConsumer::_nil (); + + this->is_connected_ = 0; + + ACE_RE_THROW; } ACE_ENDTRY; } @@ -67,6 +79,7 @@ TAO_Notify_StructuredProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event &ev } ACE_CATCHALL { + ACE_DEBUG ((LM_DEBUG, "Exception dispatching structured event\n")); // misbehaving client, ignore for now. } ACE_ENDTRY; @@ -80,27 +93,65 @@ TAO_Notify_StructuredProxyPushSupplier_i::dispatch_update_i (CosNotification::Ev this->push_consumer_->offer_change (added, removed, ACE_TRY_ENV); ACE_TRY_CHECK; } - ACE_CATCHALL + ACE_CATCHANY { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "call to offer_change failed\n"); // misbehaving client, ignore for now. } ACE_ENDTRY; } void -TAO_Notify_StructuredProxyPushSupplier_i::disconnect_structured_push_supplier( - CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_StructuredProxyPushSupplier_i::shutdown_i (CORBA::Environment &ACE_TRY_ENV) +{ + this->on_disconnected (ACE_TRY_ENV); + ACE_CHECK; + + // ask our parent to deactivate us. + this->consumer_admin_-> + deactivate_proxy_pushsupplier (this, ACE_TRY_ENV); +} + +void +TAO_Notify_StructuredProxyPushSupplier_i::disconnect_structured_push_supplier(CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC (( CORBA::SystemException )) { - this->is_destroyed_ = 1; + // unregister with CA + this->consumer_admin_->unregister_listener (this, ACE_TRY_ENV); + ACE_CHECK; - // ask our parent to deactivate us. - this->myadmin_-> - deactivate_proxy_pushsupplier (this, ACE_TRY_ENV); + this->shutdown_i (ACE_TRY_ENV); +} + +void +TAO_Notify_StructuredProxyPushSupplier_i::shutdown (CORBA::Environment &ACE_TRY_ENV) +{ + // Tell the consumer that we're going away ... + // @@ Later, lookup a "notify_on_disconnect" option. + + { + ACE_GUARD (ACE_Lock, ace_mon, *this->lock_); - this->cleanup_i (ACE_TRY_ENV); + if (this->is_connected_ == 0) + return; + } + + this->shutdown_i (ACE_TRY_ENV); + ACE_CHECK; + + ACE_TRY + { + this->push_consumer_->disconnect_structured_push_consumer (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCHALL + { + // ignore + } + ACE_ENDTRY; } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h index f074a25113f..f3d62fb03b0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h @@ -17,13 +17,17 @@ // ========================================================================== #ifndef TAO_NOTIFY_STRUCTUREDPROXYPUSHSUPPLIER_I_H #define TAO_NOTIFY_STRUCTUREDPROXYPUSHSUPPLIER_I_H + #include "ace/pre.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ #include "Notify_ProxySupplier_T.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" class TAO_Notify_ConsumerAdmin_i; -class TAO_Notify_Resource_Manager; #if defined(_MSC_VER) #if (_MSC_VER >= 1200) @@ -32,7 +36,7 @@ class TAO_Notify_Resource_Manager; #pragma warning(disable:4250) #endif /* _MSC_VER */ -class TAO_Notify_Export TAO_Notify_StructuredProxyPushSupplier_i : public TAO_Notify_ProxySupplier<POA_CosNotifyChannelAdmin::StructuredProxyPushSupplier>, public PortableServer::RefCountServantBase +class TAO_Notify_Export TAO_Notify_StructuredProxyPushSupplier_i : public TAO_Notify_ProxySupplier<POA_CosNotifyChannelAdmin::StructuredProxyPushSupplier> { // = TITLE // TAO_Notify_StructuredProxyPushSupplier_i @@ -42,7 +46,7 @@ class TAO_Notify_Export TAO_Notify_StructuredProxyPushSupplier_i : public TAO_No // public: - TAO_Notify_StructuredProxyPushSupplier_i (TAO_Notify_ConsumerAdmin_i* consumeradmin, TAO_Notify_Resource_Manager* resource_manager); + TAO_Notify_StructuredProxyPushSupplier_i (TAO_Notify_ConsumerAdmin_i* consumer_admin); // Constructor virtual ~TAO_Notify_StructuredProxyPushSupplier_i (void); @@ -65,22 +69,27 @@ class TAO_Notify_Export TAO_Notify_StructuredProxyPushSupplier_i : public TAO_No CORBA::SystemException )); + virtual void shutdown (CORBA::Environment &ACE_TRY_ENV); + // Shutdown. + protected: // = Helper methods + void shutdown_i (CORBA::Environment &ACE_TRY_ENV); + // Shutdown + virtual void dispatch_event_i (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV); // Deliver the event to the consumer. virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV); // Deliver the update to the consumer. - virtual void cleanup_i (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); - // Cleanup all resources used by this object. - - CosNotifyComm::StructuredPushConsumer_var push_consumer_; - // The consumer that we're connect to. + // = Data Members + CosNotifyComm::StructuredPushConsumer_var push_consumer_; + // The consumer that we're connect to. - typedef TAO_Notify_ProxySupplier<POA_CosNotifyChannelAdmin::StructuredProxyPushSupplier> - structured_proxy_inherited; + private: + typedef TAO_Notify_ProxySupplier<POA_CosNotifyChannelAdmin::StructuredProxyPushSupplier> + proxy_inherited; }; #if defined(_MSC_VER) && (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp index 5e8bb28d633..bbe309849cb 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp @@ -6,53 +6,72 @@ #include "Notify_StructuredProxyPushConsumer_i.h" #include "Notify_SequenceProxyPushConsumer_i.h" #include "Notify_EventChannel_i.h" -#include "Notify_Resource_Manager.h" +#include "Notify_Channel_Objects_Factory.h" +#include "Notify_POA_Factory.h" +#include "Notify_Factory.h" #include "Notify_Event_Manager.h" ACE_RCSID(Notify, Notify_SupplierAdmin_i, "$Id$") // Implementation skeleton constructor -TAO_Notify_SupplierAdmin_i::TAO_Notify_SupplierAdmin_i (TAO_Notify_EventChannel_i* myChannel, TAO_Notify_Resource_Manager* resource_manager) - :my_channel_ (myChannel), - resource_manager_ (resource_manager), - is_destroyed_ (0) +TAO_Notify_SupplierAdmin_i::TAO_Notify_SupplierAdmin_i (TAO_Notify_EventChannel_i* event_channel) + :event_channel_ (event_channel), + channel_objects_factory_ (0), + poa_factory_ (0), + lock_ (0), + destory_child_POAs_ (0) { - //No-Op. + event_channel_->_add_ref (); // we don't want our parent to go away! } // Implementation skeleton destructor -TAO_Notify_SupplierAdmin_i::~TAO_Notify_SupplierAdmin_i (void) +TAO_Notify_SupplierAdmin_i::~TAO_Notify_SupplierAdmin_i () { - /*ACE_DEBUG ((LM_DEBUG,"in SA dtor\n"));*/ - this->cleanup_i (); + ACE_DEBUG ((LM_DEBUG,"in SA dtor\n")); + // Cleanup all resources.. + + ACE_DECLARE_NEW_CORBA_ENV; + + delete this->lock_; - this->my_channel_->supplier_admin_destroyed (this->myID_); + this->event_channel_->supplier_admin_destroyed (this->my_id_); + event_channel_->_remove_ref (); } void TAO_Notify_SupplierAdmin_i::proxy_pushconsumer_destroyed (CosNotifyChannelAdmin::ProxyID proxyID) { + ACE_GUARD (ACE_Lock, ace_mon, *this->lock_); + this->proxy_pushconsumer_ids_.put (proxyID); } void -TAO_Notify_SupplierAdmin_i::init (CosNotifyChannelAdmin::AdminID myID, - CosNotifyChannelAdmin::InterFilterGroupOperator myOperator, +TAO_Notify_SupplierAdmin_i::init (CosNotifyChannelAdmin::AdminID my_id, + CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator, PortableServer::POA_ptr my_POA, CORBA::Environment &ACE_TRY_ENV) { this->my_POA_ = PortableServer::POA::_duplicate (my_POA); - this->proxy_pushconsumer_POA_ = this->resource_manager_-> - create_proxy_pushconsumer_POA (this->my_POA_.in (), myID, + this->channel_objects_factory_ = + TAO_Notify_Factory::get_channel_objects_factory (); + + this->poa_factory_ = TAO_Notify_Factory::get_poa_factory (); + + this->lock_ = this->channel_objects_factory_-> + create_supplier_admin_lock (ACE_TRY_ENV); + ACE_CHECK; + + this->proxy_pushconsumer_POA_ = this->poa_factory_-> + create_proxy_pushconsumer_POA (this->my_POA_.in (), my_id, ACE_TRY_ENV); ACE_CHECK; - myID_ = myID; - myOperator_ = myOperator; + my_id_ = my_id; + filter_operator_ = filter_operator; } - CosNotifyChannelAdmin::SupplierAdmin_ptr TAO_Notify_SupplierAdmin_i::get_ref (CORBA::Environment &ACE_TRY_ENV) { @@ -60,7 +79,7 @@ TAO_Notify_SupplierAdmin_i::get_ref (CORBA::Environment &ACE_TRY_ENV) // notice that this is a very expensive operation, you may want to // cache the result if it is invoked very often... - CORBA::Object_var obj = this->resource_manager_-> + CORBA::Object_var obj = this->poa_factory_-> servant_to_reference (this->my_POA_.in (), this, ACE_TRY_ENV); ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ()); @@ -73,7 +92,7 @@ TAO_Notify_SupplierAdmin_i::get_ref (CORBA::Environment &ACE_TRY_ENV) TAO_Notify_Event_Manager* TAO_Notify_SupplierAdmin_i::get_event_manager (void) { - return this->my_channel_->get_event_manager (); + return this->event_channel_->get_event_manager (); } TAO_Notify_FilterAdmin_i& @@ -83,17 +102,9 @@ TAO_Notify_SupplierAdmin_i::get_filter_admin (void) } void -TAO_Notify_SupplierAdmin_i::cleanup_i (CORBA::Environment &/*ACE_TRY_ENV*/) -{ - // Cleanup all resources.. - this->proxy_pushconsumer_POA_ = PortableServer::POA::_nil (); - this->my_POA_ = PortableServer::POA::_nil (); -} - -void TAO_Notify_SupplierAdmin_i::deactivate_proxy_pushconsumer (PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV) { - this->resource_manager_-> + this->poa_factory_-> deactivate_object (servant, this->proxy_pushconsumer_POA_.in (), ACE_TRY_ENV); } @@ -104,7 +115,7 @@ TAO_Notify_SupplierAdmin_i::MyID (CORBA::Environment &/*ACE_TRY_ENV*/) CORBA::SystemException )) { - return myID_; + return my_id_; } CosNotifyChannelAdmin::EventChannel_ptr @@ -113,7 +124,7 @@ TAO_Notify_SupplierAdmin_i::MyChannel (CORBA::Environment &ACE_TRY_ENV) CORBA::SystemException )) { - return my_channel_->get_ref (ACE_TRY_ENV); + return event_channel_->get_ref (ACE_TRY_ENV); } CosNotifyChannelAdmin::InterFilterGroupOperator @@ -122,22 +133,7 @@ TAO_Notify_SupplierAdmin_i::MyOperator (CORBA::Environment &/*ACE_TRY_ENV*/) CORBA::SystemException )) { - // Pradeep: we don't use intercaps for field names, but '_' to - // separate words, and they are all lowercase.... - return myOperator_; -} - -CosNotifyChannelAdmin::ProxyIDSeq* -TAO_Notify_SupplierAdmin_i::pull_consumers (CORBA::Environment& ACE_TRY_ENV) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - // @@ Pradeep: there is no rush to implement pull, but look at the - // code in the new CosEC, we may need to start thinking about pull, - // and how can we reduce duplicated code for both pull and push - // models. - ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); + return filter_operator_; } CosNotifyChannelAdmin::ProxyIDSeq* @@ -146,6 +142,10 @@ TAO_Notify_SupplierAdmin_i::push_consumers (CORBA::Environment &ACE_TRY_ENV) CORBA::SystemException )) { + ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, + CORBA::INTERNAL ()); + ACE_CHECK_RETURN (0); + return this->proxy_pushconsumer_ids_.get_sequence (ACE_TRY_ENV); } @@ -157,32 +157,20 @@ TAO_Notify_SupplierAdmin_i::get_proxy_consumer (CosNotifyChannelAdmin::ProxyID p )) { CORBA::Object_var obj = - this->resource_manager_->id_to_reference (proxy_id, - proxy_pushconsumer_POA_.in (), - ACE_TRY_ENV); + this->poa_factory_->id_to_reference (proxy_id, + proxy_pushconsumer_POA_.in (), + ACE_TRY_ENV); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxyConsumer::_nil ()); return CosNotifyChannelAdmin::ProxyConsumer::_narrow (obj.in ()); } -CosNotifyChannelAdmin::ProxyConsumer_ptr -TAO_Notify_SupplierAdmin_i::obtain_notification_pull_consumer (CosNotifyChannelAdmin::ClientType /*ctype*/, CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/, CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyChannelAdmin::AdminLimitExceeded - )) -{ - ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), - CosNotifyChannelAdmin::ProxyConsumer::_nil ()); -} - - CORBA::Object_ptr TAO_Notify_SupplierAdmin_i::obtain_sequence_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV) { TAO_Notify_SequenceProxyPushConsumer_i* seq_proxy_pushconsumer = - this->resource_manager_->create_seq_proxy_pushconsumer (this, - ACE_TRY_ENV); + this->channel_objects_factory_->create_seq_proxy_pushconsumer (this, + ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::Object::_nil ()); PortableServer::ServantBase_var proxy_pushconsumer_var (seq_proxy_pushconsumer); @@ -190,7 +178,7 @@ TAO_Notify_SupplierAdmin_i::obtain_sequence_proxy_pushconsumer_i (CosNotifyChann seq_proxy_pushconsumer->init (proxy_id, ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::Object::_nil ()); - return this->resource_manager_-> + return this->poa_factory_-> activate_object_with_id (proxy_id, this->proxy_pushconsumer_POA_.in (), seq_proxy_pushconsumer, @@ -201,8 +189,8 @@ CORBA::Object_ptr TAO_Notify_SupplierAdmin_i::obtain_struct_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV) { TAO_Notify_StructuredProxyPushConsumer_i* struct_proxy_pushconsumer = - this->resource_manager_->create_struct_proxy_pushconsumer (this, - ACE_TRY_ENV); + this->channel_objects_factory_->create_struct_proxy_pushconsumer (this, + ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::Object::_nil ()); PortableServer::ServantBase_var proxy_pushconsumer_var (struct_proxy_pushconsumer); @@ -210,7 +198,7 @@ TAO_Notify_SupplierAdmin_i::obtain_struct_proxy_pushconsumer_i (CosNotifyChannel struct_proxy_pushconsumer->init (proxy_id, ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::Object::_nil ()); - return this->resource_manager_-> + return this->poa_factory_-> activate_object_with_id (proxy_id, this->proxy_pushconsumer_POA_.in (), struct_proxy_pushconsumer, @@ -221,7 +209,8 @@ CORBA::Object_ptr TAO_Notify_SupplierAdmin_i::obtain_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV) { TAO_Notify_ProxyPushConsumer_i* proxy_pushconsumer = - this->resource_manager_->create_proxy_pushconsumer (this, ACE_TRY_ENV); + this->channel_objects_factory_->create_proxy_pushconsumer (this, + ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::Object::_nil ()); PortableServer::ServantBase_var proxy_pushconsumer_var (proxy_pushconsumer); @@ -229,7 +218,7 @@ TAO_Notify_SupplierAdmin_i::obtain_proxy_pushconsumer_i (CosNotifyChannelAdmin:: proxy_pushconsumer->init (proxy_id, ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::Object::_nil ()); - return this->resource_manager_-> + return this->poa_factory_-> activate_object_with_id (proxy_id, this->proxy_pushconsumer_POA_.in (), proxy_pushconsumer, @@ -245,38 +234,44 @@ TAO_Notify_SupplierAdmin_i::obtain_notification_push_consumer (CosNotifyChannelA { CORBA::Object_var obj; - proxy_id = this->proxy_pushconsumer_ids_.get (); + { + ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, + CORBA::INTERNAL ()); + ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxyConsumer::_nil ()); - switch (ctype) - { - case CosNotifyChannelAdmin::ANY_EVENT: - { - obj = this->obtain_proxy_pushconsumer_i (proxy_id, ACE_TRY_ENV); - ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxyConsumer::_nil ()); - } - break; - case CosNotifyChannelAdmin::STRUCTURED_EVENT: - { - obj = this->obtain_struct_proxy_pushconsumer_i (proxy_id, - ACE_TRY_ENV); - ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxyConsumer::_nil ()); - } - break; + proxy_id = this->proxy_pushconsumer_ids_.get (); - case CosNotifyChannelAdmin::SEQUENCE_EVENT: + switch (ctype) { - obj = this->obtain_sequence_proxy_pushconsumer_i (proxy_id, + case CosNotifyChannelAdmin::ANY_EVENT: + { + obj = this->obtain_proxy_pushconsumer_i (proxy_id, ACE_TRY_ENV); + ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxyConsumer::_nil ()); + } + break; + case CosNotifyChannelAdmin::STRUCTURED_EVENT: + { + obj = this->obtain_struct_proxy_pushconsumer_i (proxy_id, ACE_TRY_ENV); - ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxyConsumer::_nil ()); - } - break; + ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxyConsumer::_nil ()); + } + break; - default: - ACE_THROW_RETURN (CORBA::BAD_PARAM (), - CosNotifyChannelAdmin::ProxyConsumer::_nil ()); - } + case CosNotifyChannelAdmin::SEQUENCE_EVENT: + { + obj = this->obtain_sequence_proxy_pushconsumer_i (proxy_id, + ACE_TRY_ENV); + ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxyConsumer::_nil ()); + } + break; + + default: + ACE_THROW_RETURN (CORBA::BAD_PARAM (), + CosNotifyChannelAdmin::ProxyConsumer::_nil ()); + } - this->proxy_pushconsumer_ids_.next (); + this->proxy_pushconsumer_ids_.next (); + } return CosNotifyChannelAdmin::ProxyConsumer::_narrow (obj.in (), ACE_TRY_ENV); @@ -286,15 +281,15 @@ void TAO_Notify_SupplierAdmin_i::destroy (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->is_destroyed_ = 1; - - this->resource_manager_->destroy_POA (this->proxy_pushconsumer_POA_.in (), - ACE_TRY_ENV); + this->destory_child_POAs_ = 1; + if (this->destory_child_POAs_ == 1) + this->poa_factory_->destroy_POA (this->proxy_pushconsumer_POA_.in (), + ACE_TRY_ENV); ACE_CHECK; // deactivate ourselves - this->resource_manager_->deactivate_object (this, this->my_POA_.in (), - ACE_TRY_ENV); + this->poa_factory_->deactivate_object (this, this->my_POA_.in (), + ACE_TRY_ENV); } CosNotification::QoSProperties* @@ -393,7 +388,7 @@ TAO_Notify_SupplierAdmin_i::obtain_push_consumer (CORBA::Environment& ACE_TRY_EN TAO_Notify_CosEC_ProxyPushConsumer_i* cosec_proxy; ACE_NEW_THROW_EX (cosec_proxy, - TAO_Notify_CosEC_ProxyPushConsumer_i (this, this->resource_manager_), + TAO_Notify_CosEC_ProxyPushConsumer_i (this), CORBA::NO_MEMORY ()); PortableServer::ServantBase_var proxy_var (cosec_proxy); @@ -402,15 +397,40 @@ TAO_Notify_SupplierAdmin_i::obtain_push_consumer (CORBA::Environment& ACE_TRY_EN ACE_CHECK_RETURN (CosEventChannelAdmin::ProxyPushConsumer::_nil ()); PortableServer::POA_var def_poa = - this->resource_manager_->get_default_POA (); + this->event_channel_->get_default_POA (); - CORBA::Object_var obj = this->resource_manager_-> + CORBA::Object_var obj = this->poa_factory_-> activate_object (def_poa.in (), cosec_proxy, ACE_TRY_ENV); ACE_CHECK_RETURN (CosEventChannelAdmin::ProxyPushConsumer::_nil ()); return CosEventChannelAdmin::ProxyPushConsumer::_narrow (obj.in ()); } +// = Pull Methods. +CosNotifyChannelAdmin::ProxyIDSeq* +TAO_Notify_SupplierAdmin_i::pull_consumers (CORBA::Environment& ACE_TRY_ENV) + ACE_THROW_SPEC (( + CORBA::SystemException + )) +{ + // @@ Pradeep: there is no rush to implement pull, but look at the + // code in the new CosEC, we may need to start thinking about pull, + // and how can we reduce duplicated code for both pull and push + // models. + ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); +} + +CosNotifyChannelAdmin::ProxyConsumer_ptr +TAO_Notify_SupplierAdmin_i::obtain_notification_pull_consumer (CosNotifyChannelAdmin::ClientType /*ctype*/, CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC (( + CORBA::SystemException, + CosNotifyChannelAdmin::AdminLimitExceeded + )) +{ + ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), + CosNotifyChannelAdmin::ProxyConsumer::_nil ()); +} + CosEventChannelAdmin::ProxyPullConsumer_ptr TAO_Notify_SupplierAdmin_i::obtain_pull_consumer (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC (( diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.h index d6d00463d82..2d0adaf19d0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.h @@ -30,7 +30,8 @@ #include "Notify_FilterAdmin_i.h" class TAO_Notify_EventChannel_i; -class TAO_Notify_Resource_Manager; +class TAO_Notify_CO_Factory; +class TAO_Notify_POA_Factory; class TAO_Notify_Event_Manager; #if defined(_MSC_VER) @@ -53,12 +54,11 @@ public: // @@ Pradeep: you may want to drop the _i suffix, it buys you // nothing.. - TAO_Notify_SupplierAdmin_i (TAO_Notify_EventChannel_i* myChannel, - TAO_Notify_Resource_Manager* resource_manager); + TAO_Notify_SupplierAdmin_i (TAO_Notify_EventChannel_i* event_channel); // Constructor - // <myChannel> is this objects parent. + // <event_channel> is this objects parent. - virtual ~TAO_Notify_SupplierAdmin_i (void); + virtual ~TAO_Notify_SupplierAdmin_i (); // Destructor void init (CosNotifyChannelAdmin::AdminID myID, @@ -251,13 +251,6 @@ virtual CosEventChannelAdmin::ProxyPullConsumer_ptr obtain_pull_consumer ( protected: // = Helper methods - // @@ Pradeep: you don't need to provide default values for - // private, protected or implementation methods. In fact it is a - // good idea *not* to provide the default value. That way you make - // sure that you are passing it around. - void cleanup_i (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); - // Cleanup all resources used by this object. - CORBA::Object_ptr obtain_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV); // Obtain a proxy pushconsumer object @@ -267,17 +260,26 @@ protected: CORBA::Object_ptr obtain_sequence_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV); // Obtain a sequence pushconsumer object - // = Data members - TAO_Notify_EventChannel_i* my_channel_; + // = Data members + TAO_Notify_EventChannel_i* event_channel_; // The channel to which we belong. - TAO_Notify_Resource_Manager* resource_manager_; - // The resource factory that we use. + TAO_Notify_CO_Factory* channel_objects_factory_; + // The factory for channel objects. + + TAO_Notify_POA_Factory* poa_factory_; + // The factory for POA based containers. + + ACE_Lock* lock_; + // The locking strategy. - CosNotifyChannelAdmin::InterFilterGroupOperator myOperator_; + CORBA::Boolean destory_child_POAs_; + // Flag to tell if the child poa's should be destroyed. + + CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator_; // The inter filter operator to use. - CosNotifyChannelAdmin::AdminID myID_; + CosNotifyChannelAdmin::AdminID my_id_; // My ID. PortableServer::POA_var my_POA_; @@ -292,13 +294,6 @@ protected: CosNotifyChannelAdmin::ProxyIDSeq> proxy_pushconsumer_ids_; // Id generator for proxy push consumers. - CORBA::Boolean is_destroyed_; - // Are we dead? - // @@ Pradeep: you may want to explain why such a flag is needed. I - // assume it is set when the a request to destroy the object - // arrives, but you must perform some cleanup, meanwhile any new - // requests are rejected, right? - TAO_Notify_QoSAdmin_i qos_admin_; // Handle QoS admin methods. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.cpp new file mode 100644 index 00000000000..8f27dba7914 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.cpp @@ -0,0 +1,31 @@ +// $Id$ + +#include "Notify_Update_Dispatch_Command.h" +#include "Notify_Collection.h" +#include "Notify_Listeners.h" +#include "Notify_Event.h" + +ACE_RCSID(Notify, Notify_Update_Dispatch_Command, "$Id$") + +TAO_Notify_Update_Dispatch_Command::TAO_Notify_Update_Dispatch_Command (TAO_Notify_UpdateListener* update_listener, TAO_Notify_EventType_List& added, TAO_Notify_EventType_List& removed) + :update_listener_ (update_listener), + added_ (added), + removed_ (removed) +{ + update_listener_->_incr_refcnt (); +} + +TAO_Notify_Update_Dispatch_Command::~TAO_Notify_Update_Dispatch_Command () +{ + update_listener_->_decr_refcnt (); +} + +int +TAO_Notify_Update_Dispatch_Command::execute (TAO_Notify_Worker_Task* /*parent_task*/, CORBA::Environment& ACE_TRY_ENV) +{ + this->update_listener_->dispatch_update (this->added_, this->removed_, + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + return 0; +} diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.h new file mode 100644 index 00000000000..6ae6a7216fd --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.h @@ -0,0 +1,61 @@ +/* -*- C++ -*- */ +// $Id$ +// +// ============================================================================ +// +// = LIBRARY +// ORBSVCS Notification +// +// = FILENAME +// Notify_Update_Dispatch_Command.h +// +// = DESCRIPTION +// +// +// = AUTHOR +// Pradeep Gore <pradeep@cs.wustl.edu> +// +// ============================================================================ + +#ifndef TAO_NOTIFY_UPDATE_DISPATCH_COMMAND_H +#define TAO_NOTIFY_UPDATE_DISPATCH_COMMAND_H +#include "ace/pre.h" +#include "Notify_Command.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "notify_export.h" +#include "tao/corba.h" +#include "Notify_Collection.h" + +class TAO_Notify_UpdateListener; + +class TAO_Notify_Export TAO_Notify_Update_Dispatch_Command : public TAO_Notify_Command +{ + // = TITLE + // TAO_Notify_Update_Dispatch_Command + // + // = DESCRIPTION + // + // + public: + // = Initialization and termination code + TAO_Notify_Update_Dispatch_Command (TAO_Notify_UpdateListener* listener, TAO_Notify_EventType_List& added, TAO_Notify_EventType_List& removed); + ~TAO_Notify_Update_Dispatch_Command (); + + virtual int execute (TAO_Notify_Worker_Task* parent_task, CORBA::Environment& ACE_TRY_ENV); + // Command callback + +protected: + // = Data Members + TAO_Notify_UpdateListener* update_listener_; + TAO_Notify_EventType_List added_; + TAO_Notify_EventType_List removed_; +}; + +/********************************************************************/ + +#include "ace/post.h" +#endif /* TAO_NOTIFY_UPDATE_DISPATCH_COMMAND_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.cpp new file mode 100644 index 00000000000..b9ee44296a1 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.cpp @@ -0,0 +1,136 @@ +// $Id$ + +#include "Notify_Worker_Task.h" +#include "Notify_Command.h" + +ACE_RCSID(Notify, Notify_Worker_Task, "$Id$") + +TAO_Notify_Worker_Task::TAO_Notify_Worker_Task (TAO_Notify_Event_Manager* event_manager, CORBA::Boolean activate_object) + :event_manager_ (event_manager), + activate_object_ (activate_object) +{ +} + +TAO_Notify_Event_Manager* +TAO_Notify_Worker_Task::event_manager (void) +{ + return this->event_manager_; +} + +int +TAO_Notify_Worker_Task::open (void* /*args*/) +{ + if (this->activate_object_ == 0) + return 1; + + // Make us an Active Object. + if (this->activate (THR_NEW_LWP) == -1) + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("%p\n"), + ACE_TEXT ("activate failed")), -1); + else + return 0; +} + +void +TAO_Notify_Worker_Task::shutdown (CORBA::Environment& /*ACE_TRY_ENV*/) +{ + // Put a shutdown message in the task queue and wait here till all + // threads exit. + this->close (0); +} + +int +TAO_Notify_Worker_Task::close (u_long) +{ + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) close of worker\n"))); + + TAO_Notify_Shutdown_Command * mb = new TAO_Notify_Shutdown_Command (); + + ACE_DECLARE_NEW_CORBA_ENV; + this->process_event (mb, ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + return this->wait (); +} + +int +TAO_Notify_Worker_Task::process_event (TAO_Notify_Command *mb, CORBA::Environment& ACE_TRY_ENV, ACE_Time_Value *tv) +{ + // If this task is passive, execute the command here itself. + // @@ Create Reactive_Worker and MT_Worker + if (this->activate_object_ == 0) + { + int result = mb->execute (this, ACE_TRY_ENV); + ACE_Message_Block::release (mb); + return result; + } + else + // Simply enqueue the Command into the end of the queue. + return this->msg_queue ()->enqueue_prio (mb, tv); +} + +int +TAO_Notify_Worker_Task::svc (void) +{ + int done = 0; + while (!done) + { + ACE_TRY_NEW_ENV + { + ACE_Message_Block *mb; + if (this->getq (mb) == -1) + if (ACE_OS::last_error () == ESHUTDOWN) + return 0; + else + ACE_ERROR ((LM_ERROR, + "EC (%P|%t) getq error in Dispatching Queue\n")); + + TAO_Notify_Command *command = + ACE_dynamic_cast(TAO_Notify_Command*, mb); + + if (command == 0) + { + ACE_Message_Block::release (mb); + continue; + } + + int result = command->execute (this, ACE_TRY_ENV); + ACE_TRY_CHECK; + + ACE_Message_Block::release (mb); + + if (result == -1) + done = 1; + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "EC (%P|%t) exception in dispatching queue"); + } + ACE_ENDTRY; + } + return 0; +} + +/**************************************************************************/ + +int +TAO_Notify_Shutdown_Command::execute (TAO_Notify_Worker_Task* parent_task, + CORBA::Environment& ACE_TRY_ENV) +{ + if (parent_task->next()) // if there are other tasks, tell them!. + { + TAO_Notify_Worker_Task* next_task = + ACE_static_cast (TAO_Notify_Worker_Task*, parent_task->next()); + + TAO_Notify_Shutdown_Command * mb = new TAO_Notify_Shutdown_Command (); + // ACE_Message_Block::duplicate (this); // increment our ref count. + // @@ investigate crash due to duplicate. + + next_task->process_event (mb, ACE_TRY_ENV); + } + + return -1; +} +/**************************************************************************/ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.h new file mode 100644 index 00000000000..8a495f27b0d --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.h @@ -0,0 +1,94 @@ +/* -*- C++ -*- */ +// $Id$ +// +// ============================================================================ +// +// = LIBRARY +// ORBSVCS Notification +// +// = FILENAME +// Notify_Worker_Task.h +// +// = DESCRIPTION +// Worker task used by the event processor. +// +// = AUTHOR +// Pradeep Gore <pradeep@cs.wustl.edu> +// +// ============================================================================ + +#ifndef TAO_NOTIFY_WORKER_TASK_H +#define TAO_NOTIFY_WORKER_TASK_H + +#include "ace/pre.h" +#include "ace/Task.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/corba.h" +#include "Notify_Command.h" +#include "notify_export.h" + +class TAO_Notify_Event_Manager; + +class TAO_Notify_Export TAO_Notify_Worker_Task : public ACE_Task<ACE_SYNCH> +{ + // = TITLE + // TAO_Notify_Worker_Task + // + // = DESCRIPTION + // A worker task that we use for various event processing jobs. + // Also see TAO_Notify_Command - This task executes Notify_Command objects. + // +public: + // = Initialization and termination code + TAO_Notify_Worker_Task (TAO_Notify_Event_Manager* event_manager, CORBA::Boolean activate_object); + // Constructor. + + virtual int open (void *args); + // Activate the task if <active_object_> is set. + + virtual int svc (void); + // svc command objects stored in the message queue. + + void shutdown (CORBA::Environment& ACE_TRY_ENV); + // shutdown this task. + + virtual int process_event (TAO_Notify_Command *mb, CORBA::Environment& ACE_TRY_ENV, ACE_Time_Value *tv = 0); + // Allows the producer to pass messages to the <Message_Block>. + + TAO_Notify_Event_Manager* event_manager (void); + // access manager. + + protected: + virtual int close (u_long); + // Close hook. + + TAO_Notify_Event_Manager* event_manager_; + // The Event Manager using us. + + CORBA::Boolean activate_object_; + // Is this an active object. +}; + +//**************************************************************************************** + +class TAO_Notify_Export TAO_Notify_Shutdown_Command : public TAO_Notify_Command +{ + // = TITLE + // TAO_Notify_Shutdown_Command + // + // = DESCRIPTION + // Shutdown command to shutdown the task. + // + public: + virtual int execute (TAO_Notify_Worker_Task* parent_task, CORBA::Environment&); + // Returns -1. This signals worker threads to finish servicing requests. +}; + +//**************************************************************************************** + +#include "ace/pre.h" +#endif /* TAO_NOTIFY_WORKER_TASK_H */ |