ChangeLogTag: Wed Jul 16 16:28:47 2003 Pradeep Gore <pradeep@oomworks.com>

9 files changed, 60 insertions, 52 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 47a1140e319..3dfce8f106c 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,34 @@
+Wed Jul 16 16:28:47 2003  Pradeep Gore  <pradeep@oomworks.com>
+
+	Fix for the Discarding test failing:
+	
+	* orbsvcs/orbsvcs/Notify/Property_T.h:
+	* orbsvcs/orbsvcs/Notify/Property_T.inl:
+	 
+	  Removed the = operator that did not set the <valid_> flag when
+	  assigning to the TAO_Notify_PropertyBase_T.
+	  This caused a problem when the pacing interval was assigned in
+	  the SequenceProxySupplier because the flag was not copied in
+	  the = operator.
+	
+	* orbsvcs/orbsvcs/Notify/QoSProperties.cpp:
+	* orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp:
+
+	  Removed assignment to properties via .value().
+	
+	* orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp:
+	* orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp:
+	* orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp:
+
+	  Changed the number of events sent to 20 instead of 96 otherwise
+	  the test runs for too long and the consumer times out in the run_test.pl. 
+	  Now the supplier sends 2 event batches of 10 events each.
+	  The consumer max batch size is 5 so it should receive a max of 4
+	  batches. Also reduced the pacing interval to 3s.
+
+	* orbsvcs/tests/Notify/Basic/Sequence.cpp:
+
+	  Added useful debug messages.
 Wed Jul 16 14:13:24 2003  Yamuna Krishnamurthy  <yamuna@oomworks.com>		
 
 	* tests/RTScheduling/Scheduler.cpp:	
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h
index 8009b253da3..1f10cdd4803 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h
@@ -46,12 +46,6 @@ public:
   /// Destructor
   ~TAO_Notify_PropertyBase_T ();
 
-  /// Assignment from TAO_Notify_PropertyBase_T
-  // TAO_Notify_PropertyBase_T& operator= (const TAO_Notify_PropertyBase_T& rhs);
-
-  /// Assignment from TYPE
-  TAO_Notify_PropertyBase_T& operator= (const TYPE& rhs);
-
   /// Equality comparison operator.
   int operator== (const TYPE &rhs) const;
 
@@ -79,9 +73,6 @@ protected:
 
   /// Is the value valid
   CORBA::Boolean valid_;
-
-private:
-  ACE_UNIMPLEMENTED_FUNC (TAO_Notify_PropertyBase_T& operator= (const TAO_Notify_PropertyBase_T& rhs))
 };
 
 
@@ -102,9 +93,6 @@ public:
   /// Constuctor
   TAO_Notify_Property_T (const char* name);
 
-  /// Assignment from TYPE
-  TAO_Notify_Property_T& operator= (const TYPE& rhs);
-
   /// Init this Property from the sequence.
   /// Returns 0 on success, -1 on error
   int set (const TAO_Notify_PropertySeq& property_seq);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl
index 33bcd4c8c61..417d372b03c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl
@@ -24,14 +24,6 @@ TAO_Notify_PropertyBase_T<TYPE>::operator!= (const TYPE &rhs) const
   return (this->value_ != rhs);
 }
 
-template <class TYPE> ACE_INLINE TAO_Notify_PropertyBase_T<TYPE>&
-TAO_Notify_PropertyBase_T<TYPE>::operator=(const TYPE& value)
-{
-  this->value_ = value;
-
-  return *this;
-}
-
 template <class TYPE> ACE_INLINE void
 TAO_Notify_PropertyBase_T<TYPE>:: invalidate (void)
 {
@@ -40,15 +32,6 @@ TAO_Notify_PropertyBase_T<TYPE>:: invalidate (void)
 
 /******************************************************************************/
 
-template <class TYPE> ACE_INLINE TAO_Notify_Property_T<TYPE>&
-TAO_Notify_Property_T<TYPE>::operator=(const TYPE& value)
-{
-  this->TAO_Notify_PropertyBase_T<TYPE>::operator= (value);
-  return *this;
-}
-
-/******************************************************************************/
-
 template <class TYPE> ACE_INLINE const TYPE&
 TAO_Notify_StructProperty_T<TYPE>::value (void) const
 {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp
index aeb37b62ba3..805ae87ff67 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp
@@ -81,11 +81,11 @@ TAO_Notify_QoSProperties::init (const CosNotification::PropertySeq& prop_seq, Co
 int
 TAO_Notify_QoSProperties::copy (TAO_Notify_QoSProperties& qos_properties)
 {
-  qos_properties.priority_ = this->priority_.value ();
-  qos_properties.timeout_ = this->timeout_.value ();
-  qos_properties.stop_time_supported_ = this->stop_time_supported_.value ();
-  qos_properties.maximum_batch_size_ = this->maximum_batch_size_.value ();
-  qos_properties.pacing_interval_ = this->pacing_interval_.value ();
+  qos_properties.priority_ = this->priority_;
+  qos_properties.timeout_ = this->timeout_;
+  qos_properties.stop_time_supported_ = this->stop_time_supported_;
+  qos_properties.maximum_batch_size_ = this->maximum_batch_size_;
+  qos_properties.pacing_interval_ = this->pacing_interval_;
 
   PROPERTY_MAP::ITERATOR iter (this->property_map_);
   PROPERTY_MAP::ENTRY *entry;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
index 8db7ee044fc..5f2c292af53 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
@@ -61,7 +61,7 @@ TAO_Notify_SequencePushConsumer::release (void)
 void
 TAO_Notify_SequencePushConsumer::qos_changed (const TAO_Notify_QoSProperties& qos_properties)
 {
-  this->max_batch_size_ = qos_properties.maximum_batch_size ().value ();
+  this->max_batch_size_ = qos_properties.maximum_batch_size ();
 
   if (this->max_batch_size_.is_valid ())
     {// set the max batch size.
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
index b215b4e17d7..ba478cf5a25 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
@@ -25,20 +25,10 @@ SequencePushConsumer::push_structured_events (
   this->test_client_->events_received_ += batch.length ();
 
   if (batch.length () > this->test_client_->consumer_batch_size_)
-    if (TAO_debug_level)
       ACE_DEBUG ((LM_ERROR,
                   "Error: Received more than max event batch %d\n",
                   batch.length ()));
 
-  /*  int event_num;
-  notification.filterable_data[0].value >>= event_num;
-
-  if (TAO_debug_level)
-    ACE_DEBUG ((LM_DEBUG,
-                "Received event# %d\n",
-                event_num));
-  */
-
   this->test_client_->on_event_received ();
 
   ACE_OS::sleep (this->test_client_->consumer_delay_);
@@ -61,7 +51,7 @@ SequencePushSupplier::~SequencePushSupplier (void)
 Sequence::Sequence (void)
   : event_count_ (15), supplier_batch_size_ (5), consumer_batch_size_ (3),
     pacing_ (2), order_policy_ (CosNotification::PriorityOrder), events_received_ (0),
-    consumer_delay_ (ACE_Time_Value (1, 0))
+    consumer_delay_ (1)
 {
 }
 
@@ -74,6 +64,21 @@ Sequence::init (int argc,
                    char* argv []
                    ACE_ENV_ARG_DECL)
 {
+  if (TAO_debug_level)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "Options: event count = %d \n"
+                  "supplier batch size = %d \n"
+                  "consumer batch size = %d \n"
+                  "pacing = %d \n"
+                  , event_count_
+                  , supplier_batch_size_
+                  , consumer_batch_size_
+                  , pacing_));
+
+      ACE_DEBUG ((LM_DEBUG, "consumer delay = %d\n", consumer_delay_.sec ()));
+    }
+
   // Initialize the base class.
   Notify_Test_Client::init (argc,
                             argv
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 341c0632829..6b191f33e7d 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp
@@ -48,7 +48,7 @@ Notify_Sequence_Push_Consumer::_connect (
   properties[0].name = CORBA::string_dup (CosNotification::MaximumBatchSize);
   properties[0].value <<= (CORBA::Long)5;
   properties[1].name = CORBA::string_dup (CosNotification::PacingInterval);
-  properties[1].value <<= (TimeBase::TimeT)4;
+  properties[1].value <<= (TimeBase::TimeT)3;
   properties[2].name = CORBA::string_dup (CosNotification::DiscardPolicy);
   properties[2].value <<= this->discard_policy_;
   properties[3].name = CORBA::string_dup (CosNotification::MaxEventsPerConsumer);
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
index e0cdbedf9cd..e90987df064 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
@@ -20,7 +20,7 @@
 static const char* ior = "file://supplier.ior";
 static CORBA::Short discard_policy = CosNotification::FifoOrder;
 static unsigned int low = 2;
-static unsigned int high = 20;
+static unsigned int high = 4;
 
 // ******************************************************************
 // Subroutine Section
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
index d7d7daa05c2..427fc996aea 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
@@ -25,7 +25,8 @@ static TAO_Notify_Tests_SequencePushSupplier* supplier_1 = 0;
 static CORBA::Boolean done = 0;
 static CORBA::Boolean start = 0;
 static CORBA::Boolean use_deadline_ordering = 0;
-static int max_events = 6;  // 6 sets of 16
+static int max_events = 2;  // 2 sets of 10
+static int batch_size = 10;
 static const char* ior_output_file = "supplier.ior";
 
 // ******************************************************************
@@ -152,11 +153,11 @@ SendEvents (void)
       event.filterable_data[2].name = CORBA::string_dup ("enum");
       event.filterable_data[2].value <<= (CORBA::ULong)count;
 
-      events.length (16);
+      events.length (batch_size);
       events[0] = event;
 
-      CosNotification::StructuredEvent revents[15];
-      for (int z = 0; z < 15; z++)
+      CosNotification::StructuredEvent revents[9];
+      for (int z = 0; z < 9; z++)
         {
           revents[z].header.fixed_header.event_type.domain_name =
                                 CORBA::string_dup ("Orbix 2000 Demos");