diff options
Diffstat (limited to 'orbsvcs/examples/Notify')
39 files changed, 168 insertions, 887 deletions
diff --git a/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp b/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp index d126b46b3e5..b6805dd64d5 100644 --- a/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp +++ b/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp @@ -13,9 +13,8 @@ # include <sstream> #endif -#include "ace/OS.h" - #include "tao/corba.h" +#include "ace/OS_NS_unistd.h" #include "orbsvcs/CosNotificationC.h" #include "orbsvcs/CosNotifyChannelAdminC.h" diff --git a/orbsvcs/examples/Notify/Federation/Agent/Makefile.am b/orbsvcs/examples/Notify/Federation/Agent/Makefile.am deleted file mode 100644 index 69fedf1bf52..00000000000 --- a/orbsvcs/examples/Notify/Federation/Agent/Makefile.am +++ /dev/null @@ -1,73 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.Agent.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS = agent - -agent_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/protocols \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(srcdir)/.. \ - -DTAO_HAS_TYPED_EVENT_CHANNEL - -agent_SOURCES = \ - Agent.cpp - -agent_LDFLAGS = \ - -L../Gate/. - -agent_LDADD = \ - $(top_builddir)/orbsvcs/examples/Notify/Federation/Gate/libGate.la \ - $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ - $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/protocols/ace/RMCast/libACE_RMCast.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO -endif BUILD_THREADS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp b/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp index 26fda764b86..0d4cef2fab4 100644 --- a/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp +++ b/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp @@ -1,29 +1,19 @@ -// file : Gate.cpp // author : Boris Kolpackov <boris@dre.vanderbilt.edu> -// cvs-id : $Id$ +// $Id$ #include "Gate.h" #include "ace/Truncate.h" -/* -#include <iostream> - -using std::cerr; -using std::endl; -*/ - using namespace CORBA; using namespace CosNotifyComm; using namespace CosNotification; using namespace CosNotifyChannelAdmin; -Gate:: -~Gate () +Gate::~Gate () { // Stop tracker thread. - // { - Lock l (mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); stop_ = true; } @@ -125,7 +115,7 @@ tracker () // Check for cancellation request. // { - Lock l (mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); if (stop_) return; @@ -249,15 +239,14 @@ push_structured_event (StructuredEvent const& e) } -void Gate:: -disconnect_structured_push_consumer (void) +void +Gate::disconnect_structured_push_consumer (void) { // We don't care. } -void Gate:: -offer_change (EventTypeSeq const&, - EventTypeSeq const&) +void +Gate::offer_change (EventTypeSeq const&, EventTypeSeq const&) { // We don't care. } diff --git a/orbsvcs/examples/Notify/Federation/Gate/Gate.h b/orbsvcs/examples/Notify/Federation/Gate/Gate.h index 891bb16d0f9..01b69e9b5c8 100644 --- a/orbsvcs/examples/Notify/Federation/Gate/Gate.h +++ b/orbsvcs/examples/Notify/Federation/Gate/Gate.h @@ -5,7 +5,6 @@ #ifndef GATE_H #define GATE_H -#include "ace/OS.h" #include "ace/INET_Addr.h" #include "ace/UUID.h" @@ -75,11 +74,8 @@ private: ACE_RMCast::Socket socket_; CORBA::String_var id_; - typedef TAO_SYNCH_MUTEX Mutex; - typedef ACE_Guard<Mutex> Lock; - bool stop_; - Mutex mutex_; + TAO_SYNCH_MUTEX mutex_; ACE_Thread_Manager thread_mgr_; }; diff --git a/orbsvcs/examples/Notify/Federation/Gate/Makefile.am b/orbsvcs/examples/Notify/Federation/Gate/Makefile.am deleted file mode 100644 index c9e9ededc1a..00000000000 --- a/orbsvcs/examples/Notify/Federation/Gate/Makefile.am +++ /dev/null @@ -1,53 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.Gate.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS -if !BUILD_ACE_FOR_TAO - -noinst_LTLIBRARIES = libGate.la - -libGate_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/protocols \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_HAS_TYPED_EVENT_CHANNEL \ - -DGATE_BUILD_DLL - -libGate_la_SOURCES = \ - Gate.cpp - -noinst_HEADERS = \ - Export.h \ - Gate.h - -endif !BUILD_ACE_FOR_TAO -endif BUILD_THREADS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/orbsvcs/examples/Notify/Federation/Makefile.am b/orbsvcs/examples/Notify/Federation/Makefile.am deleted file mode 100644 index 3e06864939a..00000000000 --- a/orbsvcs/examples/Notify/Federation/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -SUBDIRS = \ - Gate \ - Agent \ - SpaceCraft - diff --git a/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am b/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am deleted file mode 100644 index fe50bea6e61..00000000000 --- a/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am +++ /dev/null @@ -1,73 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.SpaceCraft.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS = craft - -craft_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/protocols \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(srcdir)/.. \ - -DTAO_HAS_TYPED_EVENT_CHANNEL - -craft_SOURCES = \ - SpaceCraft.cpp - -craft_LDFLAGS = \ - -L../Gate/. - -craft_LDADD = \ - $(top_builddir)/orbsvcs/examples/Notify/Federation/Gate/libGate.la \ - $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ - $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/protocols/ace/RMCast/libACE_RMCast.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO -endif BUILD_THREADS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp b/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp index a09cdc3bc50..df68aecdf2d 100644 --- a/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp +++ b/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp @@ -2,9 +2,6 @@ // author : Boris Kolpackov <boris@dre.vanderbilt.edu> // cvs-id : $Id$ - -#include "ace/OS.h" - #include "tao/corba.h" #include "orbsvcs/CosNotificationC.h" diff --git a/orbsvcs/examples/Notify/Filter/Filter.cpp b/orbsvcs/examples/Notify/Filter/Filter.cpp index 04a7df4e395..db8e31cc3ea 100644 --- a/orbsvcs/examples/Notify/Filter/Filter.cpp +++ b/orbsvcs/examples/Notify/Filter/Filter.cpp @@ -2,7 +2,7 @@ #include "Filter.h" -ACE_RCSID(Filter, Filter, "$Id$") + #define NOTIFY_FACTORY_NAME "NotifyEventChannelFactory" #define NAMING_SERVICE_NAME "NameService" diff --git a/orbsvcs/examples/Notify/Filter/Filter.h b/orbsvcs/examples/Notify/Filter/Filter.h index 8de305adf58..927827fc028 100644 --- a/orbsvcs/examples/Notify/Filter/Filter.h +++ b/orbsvcs/examples/Notify/Filter/Filter.h @@ -1,17 +1,17 @@ /* -*- C++ -*- */ -// $Id$ -// ========================================================================== -// -// = FILENAME -// Filter.h -// -// = DESCRIPTION -// Class to demo structured event filtering. -// -// = AUTHOR -// Pradeep Gore <pradeep@cs.wustl.edu> -// -// ========================================================================== +//============================================================================= +/** + * @file Filter.h + * + * $Id$ + * + * Class to demo structured event filtering. + * + * + * @author Pradeep Gore <pradeep@cs.wustl.edu> + */ +//============================================================================= + #ifndef NOTIFY_FILTER_CLIENT_H #define NOTIFY_FILTER_CLIENT_H @@ -24,104 +24,107 @@ class Filter_StructuredPushConsumer; class Filter_StructuredPushSupplier; +/** + * @class FilterClient + * + * @brief Filter Client + * + * Client example that shows how to do Structured Event filtering + * in the Notification Service. + */ class FilterClient { - // = TITLE - // Filter Client - // = DESCRIPTION - // Client example that shows how to do Structured Event filtering - // in the Notification Service. public: // = Initialization and Termination + /// Constructor FilterClient (void); - // Constructor + /// Destructor ~FilterClient (); - // Destructor + /// Init the Client. void init (int argc, ACE_TCHAR *argv []); - // Init the Client. + /// Run the demo. void run (void); - // Run the demo. + /// Consumer calls done, We're done. void done (void); - // Consumer calls done, We're done. protected: + /// Initializes the ORB. void init_ORB (int argc, ACE_TCHAR *argv []); - // Initializes the ORB. + /// Try to get hold of a running naming service. void resolve_naming_service (void); - // Try to get hold of a running naming service. + /// Try to resolve the Notify factory from the Naming service. void resolve_Notify_factory (void); - // Try to resolve the Notify factory from the Naming service. + /// Create an EC. void create_EC (void); - // Create an EC. + /// Create the Supplier Admin. void create_supplieradmin(void); - // Create the Supplier Admin. + /// Create the Consumer Admin. void create_consumeradmin (void); - // Create the Consumer Admin. + /// Create and initialize the consumers. void create_consumers (void); - // Create and initialize the consumers. + /// create and initialize the suppliers. void create_suppliers (void); - // create and initialize the suppliers. + /// send the events. void send_events (void); - // send the events. // = Data Members + /// Reference to the root poa. PortableServer::POA_var root_poa_; - // Reference to the root poa. + /// The ORB that we use. CORBA::ORB_var orb_; - // The ORB that we use. + /// Handle to the name service. CosNaming::NamingContext_var naming_context_; - // Handle to the name service. + /// Channel factory. CosNotifyChannelAdmin::EventChannelFactory_var notify_factory_; - // Channel factory. + /// The one channel that we create using the factory. CosNotifyChannelAdmin::EventChannel_var ec_; - // The one channel that we create using the factory. + /// The group operator between admin-proxy's. CosNotifyChannelAdmin::InterFilterGroupOperator ifgop_; - // The group operator between admin-proxy's. + /// Initial qos specified to the factory when creating the EC. CosNotification::QoSProperties initial_qos_; - // Initial qos specified to the factory when creating the EC. + /// Initial admin props specified to the factory when creating the EC. CosNotification::AdminProperties initial_admin_; - // Initial admin props specified to the factory when creating the EC. + /// The consumer admin used by consumers. CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin_; - // The consumer admin used by consumers. + /// The supplier admin used by suppliers. CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_; - // The supplier admin used by suppliers. + /// Consumer #1 Filter_StructuredPushConsumer* consumer_1; - // Consumer #1 + /// Consumer #2 Filter_StructuredPushConsumer* consumer_2; - // Consumer #2 + /// Supplier #1 Filter_StructuredPushSupplier* supplier_1; - // Supplier #1 + /// Supplier #2 Filter_StructuredPushSupplier* supplier_2; - // Supplier #2 + /// Set this flag to exit the run loop. CORBA::Boolean done_; - // Set this flag to exit the run loop. }; /*****************************************************************/ @@ -137,34 +140,34 @@ class Filter_StructuredPushConsumer public: // = Initialization and Termination code + /// Constructor. Filter_StructuredPushConsumer (FilterClient* filter, const char *my_name); - // Constructor. + /// Connect the Consumer to the EventChannel. + /// Creates a new proxy supplier and connects to it. void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin); - // Connect the Consumer to the EventChannel. - // Creates a new proxy supplier and connects to it. + /// Disconnect from the supplier. virtual void disconnect (void); - // Disconnect from the supplier. protected: // = Data members + /// The callback for <done> FilterClient* filter_; - // The callback for <done> + /// The name of this consumer. ACE_CString my_name_; - // The name of this consumer. + /// The proxy that we are connected to. CosNotifyChannelAdmin::StructuredProxyPushSupplier_var proxy_supplier_; - // The proxy that we are connected to. + /// The proxy_supplier id. CosNotifyChannelAdmin::ProxyID proxy_supplier_id_; - // The proxy_supplier id. // = Methods + /// Destructor virtual ~Filter_StructuredPushConsumer (void); - // Destructor // = NotifyPublish method virtual void offer_change ( @@ -194,33 +197,33 @@ class Filter_StructuredPushSupplier // public: // = Initialization and Termination code + /// Constructor. Filter_StructuredPushSupplier (const char* my_name); - // Constructor. + /// Connect the Supplier to the EventChannel. + /// Creates a new proxy supplier and connects to it. void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin); - // Connect the Supplier to the EventChannel. - // Creates a new proxy supplier and connects to it. + /// Disconnect from the supplier. void disconnect (void); - // Disconnect from the supplier. + /// Send one event. virtual void send_event (const CosNotification::StructuredEvent& event); - // Send one event. protected: // = Data members + /// The name of this consumer. ACE_CString my_name_; - // The name of this consumer. + /// The proxy that we are connected to. CosNotifyChannelAdmin::StructuredProxyPushConsumer_var proxy_consumer_; - // The proxy that we are connected to. + /// This supplier's id. CosNotifyChannelAdmin::ProxyID proxy_consumer_id_; - // This supplier's id. // = Protected Methods + /// Destructor virtual ~Filter_StructuredPushSupplier (); - // Destructor // = NotifySubscribe virtual void subscription_change ( diff --git a/orbsvcs/examples/Notify/Filter/Makefile.am b/orbsvcs/examples/Notify/Filter/Makefile.am deleted file mode 100644 index 4c43de60f24..00000000000 --- a/orbsvcs/examples/Notify/Filter/Makefile.am +++ /dev/null @@ -1,56 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.Notify_Filter.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = Filter - -Filter_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_HAS_TYPED_EVENT_CHANNEL - -Filter_SOURCES = \ - Filter.cpp \ - main.cpp \ - Filter.h - -Filter_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/orbsvcs/examples/Notify/Filter/run_test.pl b/orbsvcs/examples/Notify/Filter/run_test.pl index 36f7c0ae45d..e5e8bbe4240 100755 --- a/orbsvcs/examples/Notify/Filter/run_test.pl +++ b/orbsvcs/examples/Notify/Filter/run_test.pl @@ -35,14 +35,14 @@ $nfs->DeleteFile ($nsiorfile); $flt->DeleteFile ($nsiorfile); $nfs->DeleteFile ($nfsiorfile); -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", " -o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service", +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", " -o $ns_nsiorfile"); $Notify_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile -IORoutput $nfs_nfsiorfile "; -$FLT = $flt->CreateProcess ("Filter", +$FLT = $flt->CreateProcess ("Filter", " -o $ns_nsiorfile"); $Filter_Args = "-ORBInitRef NameService=file://$flt_nsiorfile -ORBDebugLevel $debug_level"; diff --git a/orbsvcs/examples/Notify/Lanes/Consumer.cpp b/orbsvcs/examples/Notify/Lanes/Consumer.cpp index 02e5c007748..37aea1702ba 100644 --- a/orbsvcs/examples/Notify/Lanes/Consumer.cpp +++ b/orbsvcs/examples/Notify/Lanes/Consumer.cpp @@ -2,11 +2,6 @@ #include "Consumer.h" -ACE_RCSID (Notify, - TAO_Notify_Lanes_Consumer, - "$Id$") - - TAO_Notify_Lanes_Consumer::TAO_Notify_Lanes_Consumer (TAO_Notify_ORB_Objects& orb_objects) : orb_objects_ (orb_objects) { diff --git a/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp b/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp index e66ba23fa80..8697daeebd0 100644 --- a/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp +++ b/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp @@ -10,7 +10,7 @@ #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" -ACE_RCSID (Notify, TAO_Notify_Lanes_Consumer_Client, "$Id$") + TAO_Notify_Lanes_Consumer_Client::TAO_Notify_Lanes_Consumer_Client (TAO_Notify_ORB_Objects& orb_objects) : orb_objects_ (orb_objects) diff --git a/orbsvcs/examples/Notify/Lanes/Makefile.am b/orbsvcs/examples/Notify/Lanes/Makefile.am deleted file mode 100644 index 881d31d0ce2..00000000000 --- a/orbsvcs/examples/Notify/Lanes/Makefile.am +++ /dev/null @@ -1,138 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Notify_Lanes_Consumer.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += Consumer - -Consumer_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ - -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ - -DTAO_HAS_TYPED_EVENT_CHANNEL - -Consumer_SOURCES = \ - Consumer.cpp \ - Consumer_Client.cpp \ - ORB_Objects.cpp \ - ORB_Run_Task.cpp \ - Consumer.h \ - Consumer_Client.h \ - ORB_Objects.h \ - ORB_Run_Task.h - -Consumer_LDFLAGS = \ - -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib - -Consumer_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RT_Notification.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ - $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.Notify_Lanes_Supplier.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += Supplier - -Supplier_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_HAS_TYPED_EVENT_CHANNEL - -Supplier_SOURCES = \ - ORB_Objects.cpp \ - ORB_Run_Task.cpp \ - Supplier.cpp \ - Supplier_Client.cpp \ - ORB_Objects.h \ - ORB_Run_Task.h \ - Supplier.h \ - Supplier_Client.h - -Supplier_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RT_Notification.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ - $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp b/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp index 420ece6b765..43f68e43eaa 100644 --- a/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp +++ b/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp @@ -2,7 +2,7 @@ #include "ORB_Objects.h" -ACE_RCSID (Notify, TAO_Notify_ORB_Objects, "$Id$") + TAO_Notify_ORB_Objects::TAO_Notify_ORB_Objects (void) { diff --git a/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp b/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp index 0b181bdf553..f2344182273 100644 --- a/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp +++ b/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp @@ -2,7 +2,7 @@ #include "ORB_Run_Task.h" -ACE_RCSID (Notify, TAO_Notify_ORB_Run_Task, "$Id$") + TAO_Notify_ORB_Run_Task::TAO_Notify_ORB_Run_Task (TAO_Notify_ORB_Objects& orb_objects) : orb_objects_ (orb_objects) diff --git a/orbsvcs/examples/Notify/Lanes/Supplier.cpp b/orbsvcs/examples/Notify/Lanes/Supplier.cpp index 5210b534d17..f453c3944e2 100644 --- a/orbsvcs/examples/Notify/Lanes/Supplier.cpp +++ b/orbsvcs/examples/Notify/Lanes/Supplier.cpp @@ -2,7 +2,7 @@ #include "Supplier.h" -ACE_RCSID (Notify, TAO_Notify_Lanes_Supplier, "$Id$") + #include "tao/ORB_Core.h" diff --git a/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp b/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp index 9c2e44e458d..85245d221e3 100644 --- a/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp +++ b/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp @@ -11,7 +11,7 @@ #include "orbsvcs/CosNamingC.h" #include "ace/OS_NS_errno.h" -ACE_RCSID (Notify, TAO_Notify_Lanes_Supplier_Client, "$Id$") + TAO_Notify_Lanes_Supplier_Client::TAO_Notify_Lanes_Supplier_Client (TAO_Notify_ORB_Objects& orb_objects) : orb_objects_ (orb_objects) diff --git a/orbsvcs/examples/Notify/Lanes/client.conf b/orbsvcs/examples/Notify/Lanes/client.conf index 52878238bc7..99af790bcbc 100644 --- a/orbsvcs/examples/Notify/Lanes/client.conf +++ b/orbsvcs/examples/Notify/Lanes/client.conf @@ -1 +1,3 @@ +# $Id$ + static RT_ORB_Loader "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy SYSTEM -ORBPriorityMapping continuous"
\ No newline at end of file diff --git a/orbsvcs/examples/Notify/Lanes/notify.conf b/orbsvcs/examples/Notify/Lanes/notify.conf index 9aa94294430..a9deadec1b1 100644 --- a/orbsvcs/examples/Notify/Lanes/notify.conf +++ b/orbsvcs/examples/Notify/Lanes/notify.conf @@ -1,3 +1,5 @@ +# $Id$ + dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous" dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () "" diff --git a/orbsvcs/examples/Notify/Lanes/run_test.pl b/orbsvcs/examples/Notify/Lanes/run_test.pl index e87cc47f979..0a3dd08dc4a 100755 --- a/orbsvcs/examples/Notify/Lanes/run_test.pl +++ b/orbsvcs/examples/Notify/Lanes/run_test.pl @@ -57,10 +57,10 @@ $nfs->DeleteFile ($nfsiorfile); $sup->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", " -o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service"); +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification"); $Notify_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile -IORoutput $nfs_nfsiorfile -ORBSvcConf $nfs_nfsconf "; $SUP = $sup->CreateProcess ("Supplier"); diff --git a/orbsvcs/examples/Notify/MC/Makefile.am b/orbsvcs/examples/Notify/MC/Makefile.am deleted file mode 100644 index c470e23b51f..00000000000 --- a/orbsvcs/examples/Notify/MC/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -SUBDIRS = \ - monitor - diff --git a/orbsvcs/examples/Notify/MC/monitor/Makefile.am b/orbsvcs/examples/Notify/MC/monitor/Makefile.am deleted file mode 100644 index 901ccf95216..00000000000 --- a/orbsvcs/examples/Notify/MC/monitor/Makefile.am +++ /dev/null @@ -1,58 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.mc_monitor_example.am - -if BUILD_EXCEPTIONS -if !BUILD_WINCE - -noinst_PROGRAMS = monitor - -monitor_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs - -monitor_SOURCES = \ - monitor.cpp - -monitor_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_MC.la \ - $(TAO_BUILDDIR)/tao/libTAO_Monitor.la \ - $(ACE_BUILDDIR)/ace/Monitor_Control/libACE_Monitor_Control.la \ - $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ - $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_WINCE -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/orbsvcs/examples/Notify/Makefile.am b/orbsvcs/examples/Notify/Makefile.am deleted file mode 100644 index 08daacd1689..00000000000 --- a/orbsvcs/examples/Notify/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -SUBDIRS = \ - Federation \ - Filter \ - Lanes \ - MC \ - Subscribe \ - ThreadPool - diff --git a/orbsvcs/examples/Notify/Subscribe/Makefile.am b/orbsvcs/examples/Notify/Subscribe/Makefile.am deleted file mode 100644 index 835ab5316c6..00000000000 --- a/orbsvcs/examples/Notify/Subscribe/Makefile.am +++ /dev/null @@ -1,56 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.Notify_Subscribe.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = Subscribe - -Subscribe_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_HAS_TYPED_EVENT_CHANNEL - -Subscribe_SOURCES = \ - Subscribe.cpp \ - main.cpp \ - Subscribe.h - -Subscribe_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp b/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp index 8fc4757099a..527c1eb5c0d 100644 --- a/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp +++ b/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp @@ -1,7 +1,7 @@ /* -*- C++ -*- $Id$ */ #include "Subscribe.h" -ACE_RCSID(Notify, Subscribe, "$Id$") + #define NOTIFY_FACTORY_NAME "NotifyEventChannelFactory" #define NAMING_SERVICE_NAME "NameService" diff --git a/orbsvcs/examples/Notify/Subscribe/Subscribe.h b/orbsvcs/examples/Notify/Subscribe/Subscribe.h index 2b07367a90e..d7d53791135 100644 --- a/orbsvcs/examples/Notify/Subscribe/Subscribe.h +++ b/orbsvcs/examples/Notify/Subscribe/Subscribe.h @@ -1,17 +1,17 @@ /* -*- C++ -*- */ -// $Id$ -// ========================================================================== -// -// = FILENAME -// Subscribe.h -// -// = DESCRIPTION -// Class to demo structured event subscription. -// -// = AUTHOR -// Pradeep Gore <pradeep@cs.wustl.edu> -// -// ========================================================================== +//============================================================================= +/** + * @file Subscribe.h + * + * $Id$ + * + * Class to demo structured event subscription. + * + * + * @author Pradeep Gore <pradeep@cs.wustl.edu> + */ +//============================================================================= + #ifndef NOTIFY_SUBSCRIBE_CLIENT_H #define NOTIFY_SUBSCRIBE_CLIENT_H @@ -23,85 +23,88 @@ class Subscribe_StructuredPushConsumer; class Subscribe_StructuredPushSupplier; +/** + * @class Subscribe + * + * @brief Subscribe + * + * Shows how consumers subscribe for events. + */ class Subscribe { - // = TITLE - // Subscribe - // = DESCRIPTION - // Shows how consumers subscribe for events. public: // = Initialization and Termination Subscribe (void); ~Subscribe (); + /// Init the Client. void init (int argc, ACE_TCHAR *argv []); - // Init the Client. + /// Run the demo. void run (void); - // Run the demo. + /// Called when all events we are waiting for have occured. void done (void); - // Called when all events we are waiting for have occured. protected: + /// Initializes the ORB. void init_ORB (int argc, ACE_TCHAR *argv []); - // Initializes the ORB. + /// Try to get hold of a running naming service. void resolve_naming_service (void); - // Try to get hold of a running naming service. + /// Try to resolve the Notify factory from the Naming service. void resolve_Notify_factory (void); - // Try to resolve the Notify factory from the Naming service. + /// Create an EC. void create_EC (void); - // Create an EC. + /// Create the Supplier Admin. void create_supplieradmin(void); - // Create the Supplier Admin. + /// Create the Consumer Admin. void create_consumeradmin (void); - // Create the Consumer Admin. + /// Create and initialize the consumers. void create_consumers (void); - // Create and initialize the consumers. + /// create and initialize the suppliers. void create_suppliers (void); - // create and initialize the suppliers. + /// send the events. void send_events (void); - // send the events. // = Data Members + /// Reference to the root poa. PortableServer::POA_var root_poa_; - // Reference to the root poa. + /// The ORB that we use. CORBA::ORB_var orb_; - // The ORB that we use. + /// Handle to the name service. CosNaming::NamingContext_var naming_context_; - // Handle to the name service. + /// Channel factory. CosNotifyChannelAdmin::EventChannelFactory_var notify_factory_; - // Channel factory. + /// The one channel that we create using the factory. CosNotifyChannelAdmin::EventChannel_var ec_; - // The one channel that we create using the factory. + /// The group operator between admin-proxy's. CosNotifyChannelAdmin::InterFilterGroupOperator ifgop_; - // The group operator between admin-proxy's. + /// Initial qos specified to the factory when creating the EC. CosNotification::QoSProperties initial_qos_; - // Initial qos specified to the factory when creating the EC. + /// Initial admin props specified to the factory when creating the EC. CosNotification::AdminProperties initial_admin_; - // Initial admin props specified to the factory when creating the EC. + /// The consumer admin used by consumers. CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin_; - // The consumer admin used by consumers. + /// The supplier admin used by suppliers. CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_; - // The supplier admin used by suppliers. Subscribe_StructuredPushConsumer* consumer_1_; Subscribe_StructuredPushConsumer* consumer_2_; @@ -109,8 +112,8 @@ class Subscribe Subscribe_StructuredPushSupplier* supplier_1_; Subscribe_StructuredPushSupplier* supplier_2_; + /// Set this flag to exit the run loop. CORBA::Boolean done_; - // Set this flag to exit the run loop. }; /*****************************************************************/ @@ -126,35 +129,35 @@ class Subscribe_StructuredPushConsumer public: // = Initialization and Termination code + /// Constructor. Subscribe_StructuredPushConsumer (Subscribe* subscribe); - // Constructor. + /// Connect the Consumer to the EventChannel. + /// Creates a new proxy supplier and connects to it. void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin); - // Connect the Consumer to the EventChannel. - // Creates a new proxy supplier and connects to it. + /// Disconnect from the supplier. virtual void disconnect (void); - // Disconnect from the supplier. + /// Accessor for the Proxy that we're connected to. CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr get_proxy_supplier (void); - // Accessor for the Proxy that we're connected to. // public data member for evaluating the results of subscription. CosNotification::EventTypeSeq expected_subscription_; protected: // = Data members + /// The proxy that we are connected to. CosNotifyChannelAdmin::StructuredProxyPushSupplier_var proxy_supplier_; - // The proxy that we are connected to. + /// The proxy_supplier id. CosNotifyChannelAdmin::ProxyID proxy_supplier_id_; - // The proxy_supplier id. + /// callback <done> Subscribe* subscribe_; - // callback <done> // = Methods + /// Destructor virtual ~Subscribe_StructuredPushConsumer (void); - // Destructor // = NotifyPublish method virtual void offer_change ( @@ -184,30 +187,30 @@ class Subscribe_StructuredPushSupplier // public: // = Initialization and Termination code + /// Constructor. Subscribe_StructuredPushSupplier (void); - // Constructor. + /// Connect the Supplier to the EventChannel. + /// Creates a new proxy consumer and connects to it. void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin); - // Connect the Supplier to the EventChannel. - // Creates a new proxy consumer and connects to it. + /// Disconnect from the supplier. void disconnect (void); - // Disconnect from the supplier. + /// Send one event. virtual void send_event (const CosNotification::StructuredEvent& event); - // Send one event. protected: // = Data members + /// The proxy that we are connected to. CosNotifyChannelAdmin::StructuredProxyPushConsumer_var proxy_consumer_; - // The proxy that we are connected to. + /// This supplier's id. CosNotifyChannelAdmin::ProxyID proxy_consumer_id_; - // This supplier's id. // = Protected Methods + /// Destructor virtual ~Subscribe_StructuredPushSupplier (); - // Destructor // = NotifySubscribe virtual void subscription_change ( diff --git a/orbsvcs/examples/Notify/Subscribe/run_test.pl b/orbsvcs/examples/Notify/Subscribe/run_test.pl index 28f694b5206..121fd68fd9f 100755 --- a/orbsvcs/examples/Notify/Subscribe/run_test.pl +++ b/orbsvcs/examples/Notify/Subscribe/run_test.pl @@ -38,13 +38,13 @@ $nfs->DeleteFile ($nsiorfile); $sub->DeleteFile ($nsiorfile); $nfs->DeleteFile ($nfsiorfile); -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", " -o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service"); +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification"); $Notify_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile -IORoutput $nfs_nfsiorfile "; -$SUB = $sub->CreateProcess ("Subscribe"); +$SUB = $sub->CreateProcess ("Subscribe"); $Subscribe_Args = "-ORBInitRef NameService=file://$sub_nsiorfile -ORBDebugLevel $debug_level"; $NS_status = $NS->Spawn (); diff --git a/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp b/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp index 9e06af2c97a..767c4c94bb9 100644 --- a/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp +++ b/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp @@ -2,10 +2,6 @@ #include "Consumer.h" -ACE_RCSID (Notify, - TAO_Notify_ThreadPool_Consumer, - "$Id$") - #include "tao/debug.h" #include "ace/High_Res_Timer.h" diff --git a/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp b/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp index 26a3a3779cb..0a72f5c06fe 100644 --- a/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp +++ b/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp @@ -10,7 +10,7 @@ #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" -ACE_RCSID (Notify, TAO_Notify_ThreadPool_Consumer_Client, "$Id$") + TAO_Notify_ThreadPool_Consumer_Client::TAO_Notify_ThreadPool_Consumer_Client (TAO_Notify_ORB_Objects& orb_objects) : orb_objects_ (orb_objects) diff --git a/orbsvcs/examples/Notify/ThreadPool/Makefile.am b/orbsvcs/examples/Notify/ThreadPool/Makefile.am deleted file mode 100644 index a88aa5f43aa..00000000000 --- a/orbsvcs/examples/Notify/ThreadPool/Makefile.am +++ /dev/null @@ -1,152 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Notify_ThreadPool_Consumer.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += Consumer - -Consumer_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ - -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ - -DTAO_HAS_TYPED_EVENT_CHANNEL - -Consumer_SOURCES = \ - Consumer.cpp \ - Consumer_Client.cpp \ - ORB_Objects.cpp \ - ORB_Run_Task.cpp \ - Consumer.h \ - Consumer_Client.h \ - ORB_Objects.h \ - ORB_Run_Task.h - -Consumer_LDFLAGS = \ - -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib - -Consumer_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RT_Notification.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ - $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.Notify_ThreadPool_Supplier.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += Supplier - -Supplier_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ - -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ - -DTAO_HAS_TYPED_EVENT_CHANNEL - -Supplier_SOURCES = \ - ORB_Objects.cpp \ - ORB_Run_Task.cpp \ - Supplier.cpp \ - Supplier_Client.cpp \ - ORB_Objects.h \ - ORB_Run_Task.h \ - Supplier.h \ - Supplier_Client.h - -Supplier_LDFLAGS = \ - -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib - -Supplier_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RT_Notification.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ - $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp b/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp index 420ece6b765..43f68e43eaa 100644 --- a/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp +++ b/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp @@ -2,7 +2,7 @@ #include "ORB_Objects.h" -ACE_RCSID (Notify, TAO_Notify_ORB_Objects, "$Id$") + TAO_Notify_ORB_Objects::TAO_Notify_ORB_Objects (void) { diff --git a/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp b/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp index 0b181bdf553..f2344182273 100644 --- a/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp +++ b/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp @@ -2,7 +2,7 @@ #include "ORB_Run_Task.h" -ACE_RCSID (Notify, TAO_Notify_ORB_Run_Task, "$Id$") + TAO_Notify_ORB_Run_Task::TAO_Notify_ORB_Run_Task (TAO_Notify_ORB_Objects& orb_objects) : orb_objects_ (orb_objects) diff --git a/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp b/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp index 44fa82370f5..e24c683536f 100644 --- a/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp +++ b/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp @@ -2,7 +2,7 @@ #include "Supplier.h" -ACE_RCSID (Notify, TAO_Notify_ThreadPool_Supplier, "$Id$") + #include "tao/ORB_Core.h" diff --git a/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp b/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp index 83bc0304d81..9720725fb57 100644 --- a/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp +++ b/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp @@ -11,7 +11,7 @@ #include "orbsvcs/CosNamingC.h" #include "ace/OS_NS_errno.h" -ACE_RCSID (Notify, TAO_Notify_ThreadPool_Supplier_Client, "$Id$") + TAO_Notify_ThreadPool_Supplier_Client::TAO_Notify_ThreadPool_Supplier_Client (TAO_Notify_ORB_Objects& orb_objects) : orb_objects_ (orb_objects) diff --git a/orbsvcs/examples/Notify/ThreadPool/client.conf b/orbsvcs/examples/Notify/ThreadPool/client.conf index 52878238bc7..99af790bcbc 100644 --- a/orbsvcs/examples/Notify/ThreadPool/client.conf +++ b/orbsvcs/examples/Notify/ThreadPool/client.conf @@ -1 +1,3 @@ +# $Id$ + static RT_ORB_Loader "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy SYSTEM -ORBPriorityMapping continuous"
\ No newline at end of file diff --git a/orbsvcs/examples/Notify/ThreadPool/notify.conf b/orbsvcs/examples/Notify/ThreadPool/notify.conf index 80a46e01105..2478d4dde00 100644 --- a/orbsvcs/examples/Notify/ThreadPool/notify.conf +++ b/orbsvcs/examples/Notify/ThreadPool/notify.conf @@ -1,3 +1,5 @@ +# $Id$ + dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy SYSTEM -ORBPriorityMapping continuous" ##dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () "" dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () "" diff --git a/orbsvcs/examples/Notify/ThreadPool/run_test.pl b/orbsvcs/examples/Notify/ThreadPool/run_test.pl index 61f862dab37..ae2714106e6 100755 --- a/orbsvcs/examples/Notify/ThreadPool/run_test.pl +++ b/orbsvcs/examples/Notify/ThreadPool/run_test.pl @@ -63,10 +63,10 @@ $nfs->DeleteFile ($nfsiorfile); $sup->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", " -o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service"); +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification"); $Notify_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile -IORoutput $nfs_nfsiorfile -ORBSvcConf $nfs_nfsconf -ORBDebugLevel $debug"; $SUP = $sup->CreateProcess ("Supplier"); |