diff options
3 files changed, 17 insertions, 6 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index f6fdfab0b20..54a9af552ad 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,13 @@ +Fri Mar 25 11:58:40 2005 Chad Elliott <elliott_c@ociweb.com> + + * orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp: + * orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp: + + Committing Paul Calabrese's change from TAO 1.4a. + + Alter this test to properly count the events received in the + consumer (instead of counting batches). + Fri Mar 25 12:35:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * tao/Pollable.pidl: @@ -110,10 +120,10 @@ Tue Mar 22 15:42:00 2005 Gary Maxey <gary.maxey@hp.com> Tue Mar 22 10:00:32 2005 J.T. Conklin <jtc@acorntoolworks.com> - * orbsvcs/orbsvcs/RTCORBAEvent.mpc: + * orbsvcs/orbsvcs/RTCORBAEvent.mpc: - Removed stray inheritance from naming, removed idlflags - definition (as there are no IDL files for this project). + Removed stray inheritance from naming, removed idlflags + definition (as there are no IDL files for this project). Mon Mar 21 09:28:35 2005 Chad Elliott <elliott_c@ociweb.com> 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 2fca8cb2f91..88ea7c9c8e9 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 @@ -60,11 +60,12 @@ Notify_Sequence_Push_Consumer::_connect ( void Notify_Sequence_Push_Consumer::push_structured_events( - const CosNotification::EventBatch& /*events*/ + const CosNotification::EventBatch& events ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC ((CORBA::SystemException)) { - if (++this->count_ == this->expected_) + this->count_ += events.length(); + if (this->count_ == this->expected_) { this->done_ = 1; } 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 1ff4cb087c0..280f57077eb 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp @@ -138,7 +138,7 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, ACE_NEW_THROW_EX (consumer, Notify_Sequence_Push_Consumer ( name, - expected, + expected * batch_size, (i + 1 == consumers ? done : dummy)), CORBA::NO_MEMORY ()); |