diff options
42 files changed, 120 insertions, 180 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index ab62f355bbc..31ede5e89ca 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,75 @@ +Wed Jul 02 22:10:59 2003 Pradeep Gore <pradeep@oomworks.com> + + * orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp: + * orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h: + * orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp: + * orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp: + * orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h: + * orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp: + * orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h: + * orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp: + * orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp: + * orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp: + * orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h: + * orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp: + * orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h: + * orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp: + * orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp: + * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp: + * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h: + * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp: + * orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp: + * orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h: + * orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp: + * orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp: + * orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h: + * orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp: + * orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h: + * orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp: + * orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp: + * orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp: + * orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h: + * orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp: + * orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h: + * orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp: + * orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp: + + Fixed the build warnings of derived class method "hides virtual + function" in the base class, on SunCC and BCB compiler. + All the <connect> methods in the derived classes have been + changed to <_connect> and all calls to these methods have also + been renamed. + + * orbsvcs/examples/Notify/Consumer_Client.cpp: + * orbsvcs/examples/Notify/Consumer_Client.h: + * orbsvcs/examples/Notify/Supplier_Client.cpp: + * orbsvcs/examples/Notify/Supplier_Client.h: + + For the same reason as above, the <init> method has been + renamed to <initialize>. + + * orbsvcs/tests/Notify/lib/Activation_Manager.cpp: + + Initialized the member pointer <barrier_> in the constructor. + The pointer is "delete"ed in the destructor. If it is left + uninitialized, we will get an exception when the + Activation_Manager is destroyed without calling the + <activate_suppliers> method (where <barrier_> is initialized). + + * orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp: + + Corrected a comment on line 141. + + * orbsvcs/tests/Notify/lib/Driver.cpp: + + Added a wait for the <worker_> thread manager before exit. + This is required to make sure we do not exit the main thread + before the spawned threads in the <worker_> task have finished. + + * orbsvcs/examples/Notify/Lanes.dsp: + This file was checked in by mistake. It is not required so I + have removed it. + Thu Jul 3 00:59:24 UTC 2003 Don Hinton <dhinton@dresystems.com> * tao/Any_Array_Impl_T.cpp: diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp index 800c56bd755..a1b7f716bf7 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp @@ -54,7 +54,7 @@ TAO_NS_Consumer_Client::parse_args (int argc, char *argv[]) } void -TAO_NS_Consumer_Client::init (ACE_ENV_SINGLE_ARG_DECL) +TAO_NS_Consumer_Client::initialize (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "(%P, %t)Initializing Consumer Client with lane priority = %d, event type = (%s)\n" , this->lane_priority_, this->event_type_.c_str ())); @@ -193,7 +193,7 @@ TAO_NS_Consumer_Client::svc (void) this->orb_objects_.current_->the_priority (0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->init (ACE_ENV_SINGLE_ARG_PARAMETER); //Init the Client + this->initialize (ACE_ENV_SINGLE_ARG_PARAMETER); //Init the Client ACE_TRY_CHECK; this->run (ACE_ENV_SINGLE_ARG_PARAMETER); diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h index 30ab4e0f7a5..ef483c0c8e4 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h +++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h @@ -36,7 +36,7 @@ public: ~TAO_NS_Consumer_Client (); /// Init - void init (ACE_ENV_SINGLE_ARG_DECL); + void initialize (ACE_ENV_SINGLE_ARG_DECL); /// Run void run (ACE_ENV_SINGLE_ARG_DECL); diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Lanes.dsp b/TAO/orbsvcs/examples/Notify/Lanes/Lanes.dsp deleted file mode 100644 index df57ca1ccdd..00000000000 --- a/TAO/orbsvcs/examples/Notify/Lanes/Lanes.dsp +++ /dev/null @@ -1,129 +0,0 @@ -# Microsoft Developer Studio Project File - Name="Lanes" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=Lanes - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE run the tool that generated this project file and specify the
-!MESSAGE nmake output type. You can then use the following command:
-!MESSAGE
-!MESSAGE NMAKE /f "Lanes.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "Lanes.mak" CFG="Lanes - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "Lanes - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Lanes - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "Lanes - Win32 Release"
-
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release\Lanes"
-# PROP Target_Dir ""
-# ADD CPP /nologo /W3 /GX /O2 /MD /GR /D NDEBUG /D WIN32 /D _CONSOLE /FD /c
-# SUBTRACT CPP /YX
-# ADD RSC /l 0x409 /d NDEBUG
-BSC32=bscmake.exe
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO /nologo /version:1.0 /subsystem:console /pdb:"Release\Consumer_Client.pdb" /machine:I386 /out:"Release\Consumer_Client.exe"
-
-!ELSEIF "$(CFG)" == "Lanes - Win32 Debug"
-
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir "Debug\Lanes"
-# PROP Target_Dir ""
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /MDd /GR /Gy /D _DEBUG /D WIN32 /D _CONSOLE /FD /c
-# SUBTRACT CPP /YX
-# ADD RSC /l 0x409 /d _DEBUG
-BSC32=bscmake.exe
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO /nologo /version:1.0 /subsystem:console /pdb:".\Consumer_Client.pdb" /debug /machine:I386 /out:".\Consumer_Client.exe"
-
-!ENDIF
-
-# Begin Target
-
-# Name "Lanes - Win32 Release"
-# Name "Lanes - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;cxx;c"
-# Begin Source File
-
-SOURCE=.\Consumer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Consumer_Client.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Supplier.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Supplier_Client.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hh"
-# Begin Source File
-
-SOURCE=.\Consumer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Consumer_Client.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Supplier.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Supplier_Client.h
-# End Source File
-# End Group
-# Begin Group "Inline Files"
-
-# PROP Default_Filter "i;inl"
-# Begin Source File
-
-SOURCE=.\Consumer.inl
-# End Source File
-# Begin Source File
-
-SOURCE=.\Consumer_Client.inl
-# End Source File
-# Begin Source File
-
-SOURCE=.\Supplier.inl
-# End Source File
-# Begin Source File
-
-SOURCE=.\Supplier_Client.inl
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp index 8efe70a0d86..a45542a3944 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp @@ -60,7 +60,7 @@ TAO_NS_Supplier_Client::parse_args (int argc, char *argv[]) } void -TAO_NS_Supplier_Client::init (ACE_ENV_SINGLE_ARG_DECL) +TAO_NS_Supplier_Client::initialize (ACE_ENV_SINGLE_ARG_DECL) { PortableServer::POAManager_var poa_manager = this->orb_objects_.root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -193,7 +193,7 @@ TAO_NS_Supplier_Client::svc (void) this->orb_objects_.current_->the_priority (0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->init (ACE_ENV_SINGLE_ARG_PARAMETER); //Init the Client + this->initialize (ACE_ENV_SINGLE_ARG_PARAMETER); //Init the Client ACE_TRY_CHECK; this->run (ACE_ENV_SINGLE_ARG_PARAMETER); diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h index 904e4d5f4fd..f8b0c8a247e 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h @@ -35,7 +35,7 @@ public: ~TAO_NS_Supplier_Client (); /// Init - void init (ACE_ENV_SINGLE_ARG_DECL); + void initialize (ACE_ENV_SINGLE_ARG_DECL); /// Run void run (ACE_ENV_SINGLE_ARG_DECL); diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp index 81d70263070..12e081ef8fd 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp @@ -20,7 +20,7 @@ Notify_Structured_Push_Consumer::Notify_Structured_Push_Consumer ( void -Notify_Structured_Push_Consumer::connect ( +Notify_Structured_Push_Consumer::_connect ( CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h index 6978902cbe9..ad530a83978 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h @@ -30,7 +30,7 @@ public: unsigned int expected, CORBA::Boolean& done); - void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin + void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp index 19a0fc56626..3992a28f441 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp @@ -102,7 +102,7 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER); ACE_CHECK; - consumer_1->connect (admin ACE_ENV_ARG_PARAMETER); + consumer_1->_connect (admin ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp index e75a94c8802..341c0632829 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp @@ -22,7 +22,7 @@ Notify_Sequence_Push_Consumer::Notify_Sequence_Push_Consumer ( void -Notify_Sequence_Push_Consumer::connect ( +Notify_Sequence_Push_Consumer::_connect ( CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h index ce4e713071b..8e5839a77ea 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h @@ -30,7 +30,7 @@ public: unsigned int high, CORBA::Boolean& done); - void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin + void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp index 68da6b2c1f2..8e79f73b8a4 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp @@ -21,7 +21,7 @@ Notify_Structured_Push_Consumer::Notify_Structured_Push_Consumer ( void -Notify_Structured_Push_Consumer::connect ( +Notify_Structured_Push_Consumer::_connect ( CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h index 8497b2cf84c..1e119072d5f 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h @@ -31,7 +31,7 @@ public: CORBA::Long max_events_per_consumer, CORBA::Boolean& done); - void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin + void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp index 0d80d0c0a55..e0cdbedf9cd 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp @@ -139,7 +139,7 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER); ACE_CHECK; - consumer_1->connect (admin ACE_ENV_ARG_PARAMETER); + consumer_1->_connect (admin ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp index 4463a44ebcb..f7d72462486 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp @@ -136,7 +136,7 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER); ACE_CHECK; - consumer_1->connect (admin ACE_ENV_ARG_PARAMETER); + consumer_1->_connect (admin ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp index 3b0a09ad481..0f70325d816 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp @@ -20,7 +20,7 @@ Notify_Sequence_Push_Consumer::Notify_Sequence_Push_Consumer ( void -Notify_Sequence_Push_Consumer::connect ( +Notify_Sequence_Push_Consumer::_connect ( CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h index f90c939165b..3a68a1cef1d 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h @@ -29,7 +29,7 @@ public: unsigned int expected_count, CORBA::Boolean& done); - void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin + void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp index 1d30ed1dff2..e4a7360ec1c 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp @@ -20,7 +20,7 @@ Notify_Structured_Push_Consumer::Notify_Structured_Push_Consumer ( void -Notify_Structured_Push_Consumer::connect ( +Notify_Structured_Push_Consumer::_connect ( CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h index ea1f0685096..76e95b9b8ee 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h @@ -30,7 +30,7 @@ public: unsigned int expected, CORBA::Boolean& done); - void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin + void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp index a815bdf4d98..4a875155f0d 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp @@ -138,7 +138,7 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER); ACE_CHECK; - consumer_1->connect (admin ACE_ENV_ARG_PARAMETER); + consumer_1->_connect (admin ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp index 5e287fb54bc..935bb554722 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp @@ -131,7 +131,7 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER); ACE_CHECK; - consumer_1->connect (admin ACE_ENV_ARG_PARAMETER); + consumer_1->_connect (admin ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp index fc88076aa65..bd4cbb0b55d 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp @@ -20,7 +20,7 @@ Notify_Sequence_Push_Consumer::Notify_Sequence_Push_Consumer ( void -Notify_Sequence_Push_Consumer::connect ( +Notify_Sequence_Push_Consumer::_connect ( CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h index 457e9bd6ed2..fabac9f966e 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h @@ -29,7 +29,7 @@ public: unsigned int high, CORBA::Boolean& done); - void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin + void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp index 3bf63653c06..c4357fb4351 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp @@ -129,7 +129,7 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER); ACE_CHECK; - consumer_1->connect (admin ACE_ENV_ARG_PARAMETER); + consumer_1->_connect (admin ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp index 7c7781c1c4e..b54d544a6b3 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp @@ -27,7 +27,7 @@ Notify_Sequence_Push_Consumer::~Notify_Sequence_Push_Consumer () void -Notify_Sequence_Push_Consumer::connect ( +Notify_Sequence_Push_Consumer::_connect ( CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h index bf6f6d1c565..a34296fa34c 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h @@ -32,7 +32,7 @@ public: ~Notify_Sequence_Push_Consumer (); - void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin + void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp index 439d70d78d7..14a39144cdc 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp @@ -133,7 +133,7 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, consumer_1->init(client->root_poa () ACE_ENV_ARG_PARAMETER); ACE_CHECK; - consumer_1->connect (admin ACE_ENV_ARG_PARAMETER); + consumer_1->_connect (admin ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp index 4ba4e4630de..8b7fdf0457b 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp @@ -10,7 +10,7 @@ Notify_Push_Consumer::Notify_Push_Consumer (const char* name) } void -Notify_Push_Consumer::connect ( +Notify_Push_Consumer::_connect ( CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin, CosNotifyChannelAdmin::EventChannel_ptr notify_channel, CORBA::Boolean isFilter diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h index 8d3aef6e2ea..b95a57849f1 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h @@ -26,7 +26,7 @@ class Notify_Push_Consumer: public TAO_Notify_StructuredPushConsumer public: Notify_Push_Consumer (const char* name); - void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin, + void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin, CosNotifyChannelAdmin::EventChannel_ptr ec, CORBA::Boolean isFilter ACE_ENV_ARG_DECL) diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp index c8e49d441d5..f80adfe683f 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp @@ -2,7 +2,7 @@ #include "Notify_Push_Supplier.h" void -Notify_Push_Supplier::connect ( +Notify_Push_Supplier::_connect ( CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin, CosNotifyChannelAdmin::EventChannel_ptr notify_channel, CORBA::Boolean isFilter @@ -63,5 +63,3 @@ Notify_Push_Supplier::connect ( // give ownership to POA this->_remove_ref (); } - - diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h index 1032edab777..864f07a23a9 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h @@ -8,7 +8,7 @@ class Notify_Push_Supplier: public TAO_Notify_StructuredPushSupplier { public: - void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin, + void _connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin, CosNotifyChannelAdmin::EventChannel_ptr notify_channel, CORBA::Boolean isFilter ACE_ENV_ARG_DECL) diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp index 8f1e608bb01..67cd1747dda 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp @@ -94,7 +94,7 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, consumer->init (client->root_poa () ACE_ENV_ARG_PARAMETER); ACE_CHECK; - consumer->connect (admin, ec, isFilter ACE_ENV_ARG_PARAMETER); + consumer->_connect (admin, ec, isFilter ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp index c98f53b292a..829bc0b9b08 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp @@ -215,7 +215,7 @@ static void create_supplier (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, supplier->init (poa ACE_ENV_ARG_PARAMETER); ACE_CHECK; - supplier->connect (admin, ec, isFilter ACE_ENV_ARG_PARAMETER); + supplier->_connect (admin, ec, isFilter ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp index b505e4493a3..e58a78768ee 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp @@ -9,12 +9,13 @@ ACE_RCSID(lib, TAO_Activation_Manager, "$id$") #include "Name.h" TAO_NS_Activation_Manager::TAO_NS_Activation_Manager (void) - : active_suppliers_ (0) - , active_consumers_ (0) - , active_done_ (lock_) - , ior_output_file_ (0) - , started_ (0) - , started_condition_ (lock_) + : barrier_ (0) + , active_suppliers_ (0) + , active_consumers_ (0) + , active_done_ (lock_) + , ior_output_file_ (0) + , started_ (0) + , started_condition_ (lock_) { LOOKUP_MANAGER->_register (this); } diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp index 6777c70dfcd..f919e7fcd34 100644 --- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp @@ -138,7 +138,7 @@ TAO_NS_ConsumerAdmin_Command::init (ACE_Arg_Shifter& arg_shifter) TAO_NS_Options_Parser options_parser; options_parser.execute (this->added_, this->removed_, arg_shifter); } - else if (arg_shifter.cur_arg_strncasecmp ("-Set_QoS") == 0) // -Set_QoS ec_name [Qos Options] + else if (arg_shifter.cur_arg_strncasecmp ("-Set_QoS") == 0) // -Set_QoS admin_name [Qos Options] { this->command_ = SET_QOS; diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp index c38a5879666..a311a480f9e 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp @@ -249,6 +249,7 @@ TAO_NS_Driver::run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) // Wait till we're done. this->orb_run_worker_.thr_mgr ()->wait (); + this->worker_.thr_mgr ()->wait (); } void diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp index 49a78fb4e8f..c1774a579e3 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp @@ -21,7 +21,7 @@ Notify_Sequence_Push_Consumer::~Notify_Sequence_Push_Consumer () void -Notify_Sequence_Push_Consumer::connect ( +Notify_Sequence_Push_Consumer::_connect ( CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -68,5 +68,3 @@ Notify_Sequence_Push_Consumer::push_structured_events( this->done_ = 1; } } - - diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h index 862a537a7a2..9444f8ac373 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h @@ -29,7 +29,7 @@ public: ~Notify_Sequence_Push_Consumer (); - void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin + void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp index 99ac35ba1c0..b51a61124a5 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp @@ -21,7 +21,7 @@ Notify_Structured_Push_Consumer::~Notify_Structured_Push_Consumer () void -Notify_Structured_Push_Consumer::connect ( +Notify_Structured_Push_Consumer::_connect ( CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -61,4 +61,3 @@ Notify_Structured_Push_Consumer::push_structured_event( this->done_ = 1; } } - diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h index 5de466136cc..87aa71542bd 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h @@ -30,7 +30,7 @@ public: CORBA::Boolean& done); ~Notify_Structured_Push_Consumer (); - void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin + void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp index de5dd9d4583..2407775055c 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp @@ -144,7 +144,7 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, consumer->init (client->root_poa () ACE_ENV_ARG_PARAMETER); ACE_CHECK; - consumer->connect (admin ACE_ENV_ARG_PARAMETER); + consumer->_connect (admin ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp index 5d3d44902e6..bf2a70205bb 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp @@ -142,7 +142,7 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, consumer->init (client->root_poa () ACE_ENV_ARG_PARAMETER); ACE_CHECK; - consumer->connect (admin ACE_ENV_ARG_PARAMETER); + consumer->_connect (admin ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } |