ChangeLogTag: Thu Jun 26 17:33:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>

15 files changed, 38 insertions, 156 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index c906d9a31a4..57baa86f287 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,23 @@
+Thu Jun 26 17:35:11 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Event/lib/Driver.cpp:
+        * orbsvcs/tests/Event/lib/Driver.h:
+        * orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i:
+        * orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Defaults.h:
+        * orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h:
+        * orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.i:
+        * orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp:
+          Removed busy_hwm and max_write_delay attributes. These can be set in
+          the ESF framework. The ones in the EC aren't used anymore when the
+          ESF framework was introduced. This fixes bugzilla entry [530].
+
 Wed Jun 25 17:54:00 2003  Justin Michel  <michel_j@ociweb.com>
 
         * orbsvcs/examples/Notify/Lanes/Lanes.mpc:
@@ -15,15 +35,15 @@ Wed Jun 25 17:54:00 2003  Justin Michel  <michel_j@ociweb.com>
 
 Wed Jun 25 17:06:18 2003  Chris Cleeland  <cleeland_c@ociweb.com>
 
-	* orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl: 
-	* orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.conf: 
-	* orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/colocated.conf: 
-	* orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/README: 
-	* orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h: 
-	* orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp: 
-	* orbsvcs/tests/Notify/performance-tests/Throughput/README: 
-	* orbsvcs/tests/Notify/lib/EventChannel_Command.h: 
-	* orbsvcs/tests/Notify/lib/EventChannel_Command.cpp: 
+	* orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl:
+	* orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.conf:
+	* orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/colocated.conf:
+	* orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/README:
+	* orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h:
+	* orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp:
+	* orbsvcs/tests/Notify/performance-tests/Throughput/README:
+	* orbsvcs/tests/Notify/lib/EventChannel_Command.h:
+	* orbsvcs/tests/Notify/lib/EventChannel_Command.cpp:
 
 	  Replaced misspelling word "colocated" with correctly spelled
 	  "collocated" throughout these files.  I did not change actual
@@ -60,7 +80,7 @@ Wed Jun 25 17:00:00 2003  Justin Michel  <michel_j@ociweb.com>
 	* tao/RTCORBA/Multi_Priority_Mapping.h:
 	* tao/Valuetype/Valuetype.mpc:
 
-	  Fixes for various mpc generation problems. 
+	  Fixes for various mpc generation problems.
 	  Incorrect export macro used in the rtcorba header.
 
 Wed Jun 25 16:05:50 2003  Chris Cleeland  <cleeland_c@ociweb.com>
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
index f600d8a2a53..ae0dea6b0f9 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
@@ -18,11 +18,6 @@ TAO_CEC_ConsumerAdmin::TAO_CEC_ConsumerAdmin (TAO_CEC_EventChannel *ec)
      push_admin_ (ec),
      pull_admin_ (ec)
 {
-  // @@
-  // @@ this->collection_->busy_hwm (this->event_channel_->busy_hwm ());
-  // @@ this->collection_->max_write_delay (
-  // @@           this->event_channel_->max_write_delay ()
-  // @@ );
   this->default_POA_ =
     this->event_channel_->consumer_poa ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h
index 99860d8d0de..cf40afdcf62 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h
@@ -39,17 +39,6 @@
 # define TAO_CEC_DEFAULT_DISCONNECT_CALLBACKS 0
 #endif /* TAO_CEC_DEFAULT_DISCONNECT_CALLBACKS */
 
-// Control the maximum degree of concurrency tolerated by the EC, some
-// kind of limit is required to avoid starvation of delayed write
-// operations.
-#ifndef TAO_CEC_DEFAULT_BUSY_HWM
-# define TAO_CEC_DEFAULT_BUSY_HWM 1024
-#endif /* TAO_CEC_DEFAULT_BUSY_HWM */
-
-#ifndef TAO_CEC_DEFAULT_MAX_WRITE_DELAY
-# define TAO_CEC_DEFAULT_MAX_WRITE_DELAY 2048
-#endif /* TAO_CEC_DEFAULT_MAX_WRITE_DELAY */
-
 // The defaults for the default factory.
 // The TAO_CEC_Default_Factory is a run-time configurable factory for
 // the event channel.  Using the service configurator the user can
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
index 8a93d5c49cc..ee171b6bbc8 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
@@ -25,9 +25,7 @@ TAO_CEC_EventChannel (const TAO_CEC_EventChannel_Attributes& attr,
     own_factory_ (own_factory),
     consumer_reconnect_ (attr.consumer_reconnect),
     supplier_reconnect_ (attr.supplier_reconnect),
-    disconnect_callbacks_ (attr.disconnect_callbacks),
-    busy_hwm_ (attr.busy_hwm),
-    max_write_delay_ (attr.max_write_delay)
+    disconnect_callbacks_ (attr.disconnect_callbacks)
 {
   if (this->factory_ == 0)
     {
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
index 71d438ce9f9..7a02182b46e 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
@@ -74,10 +74,6 @@ public:
    */
   int disconnect_callbacks;
 
-  /// Flags for the Consumer Admin
-  int busy_hwm;
-  int max_write_delay;
-
 private:
   /// Only the EC can read the private fields.
   friend class TAO_CEC_EventChannel;
@@ -223,11 +219,6 @@ public:
   /// disconnected by the client
   int disconnect_callbacks (void) const;
 
-  /// Control the concurrency of the delayed connect/disconnect
-  /// operations.
-  int busy_hwm (void) const;
-  int max_write_delay (void) const;
-
   // = The CosEventChannelAdmin::EventChannel methods...
   /// The default implementation is:
   ///    this->consumer_admin ()->_this (env);
@@ -280,11 +271,6 @@ private:
   /// If not zero we send callbacks when a proxy is disconnected
   int disconnect_callbacks_;
 
-  /// Control the level of concurrency in the supplier sets with
-  /// delayed operations
-  int busy_hwm_;
-  int max_write_delay_;
-
   /// Strategies to disconnect misbehaving or destroyed consumers and
   /// suppliers
   TAO_CEC_ConsumerControl *consumer_control_;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i
index 58c70cd9fe8..563dc6e69e0 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i
@@ -7,8 +7,6 @@ TAO_CEC_EventChannel_Attributes (PortableServer::POA_ptr s_poa,
   :  consumer_reconnect (TAO_CEC_DEFAULT_CONSUMER_RECONNECT),
      supplier_reconnect (TAO_CEC_DEFAULT_SUPPLIER_RECONNECT),
      disconnect_callbacks (TAO_CEC_DEFAULT_DISCONNECT_CALLBACKS),
-     busy_hwm (TAO_CEC_DEFAULT_BUSY_HWM),
-     max_write_delay (TAO_CEC_DEFAULT_MAX_WRITE_DELAY),
      supplier_poa (s_poa),
      consumer_poa (c_poa)
 {
@@ -194,14 +192,3 @@ TAO_CEC_EventChannel::disconnect_callbacks (void) const
   return this->disconnect_callbacks_;
 }
 
-ACE_INLINE int
-TAO_CEC_EventChannel::busy_hwm (void) const
-{
-  return this->busy_hwm_;
-}
-
-ACE_INLINE int
-TAO_CEC_EventChannel::max_write_delay (void) const
-{
-  return this->max_write_delay_;
-}
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
index fb7b6ba79aa..1c40b303546 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
@@ -17,12 +17,6 @@ TAO_CEC_SupplierAdmin::TAO_CEC_SupplierAdmin (TAO_CEC_EventChannel *ec)
      push_admin_ (ec),
      pull_admin_ (ec)
 {
-  // @@
-  // @@ this->collection_->busy_hwm (this->event_channel_->busy_hwm ());
-  // @@ this->collection_->max_write_delay (
-  // @@           this->event_channel_->max_write_delay ()
-  // @@ );
-
   this->default_POA_ =
     this->event_channel_->supplier_poa ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Defaults.h b/TAO/orbsvcs/orbsvcs/Event/EC_Defaults.h
index 9fe896a344c..5e220664aa1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Defaults.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Defaults.h
@@ -40,17 +40,6 @@
 # define TAO_EC_DEFAULT_DISCONNECT_CALLBACKS 0
 #endif /* TAO_EC_DEFAULT_DISCONNECT_CALLBACKS */
 
-// Control the maximum degree of concurrency tolerated by the EC, some
-// kind of limit is required to avoid starvation of delayed write
-// operations.
-#ifndef TAO_EC_DEFAULT_BUSY_HWM
-# define TAO_EC_DEFAULT_BUSY_HWM 1024
-#endif /* TAO_EC_DEFAULT_BUSY_HWM */
-
-#ifndef TAO_EC_DEFAULT_MAX_WRITE_DELAY
-# define TAO_EC_DEFAULT_MAX_WRITE_DELAY 2048
-#endif /* TAO_EC_DEFAULT_MAX_WRITE_DELAY */
-
 // The defaults for the default factory.
 // The TAO_EC_Default_Factory is a run-time configurable factory for
 // the event channel.  Using the service configurator the user can
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
index 72a94ea7b19..a0696b23d7d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
@@ -36,8 +36,6 @@ TAO_EC_Event_Channel_Base (const TAO_EC_Event_Channel_Attributes& attr,
     consumer_reconnect_ (attr.consumer_reconnect),
     supplier_reconnect_ (attr.supplier_reconnect),
     disconnect_callbacks_ (attr.disconnect_callbacks),
-    busy_hwm_ (attr.busy_hwm),
-    max_write_delay_ (attr.max_write_delay),
     consumer_control_ (0),
     supplier_control_ (0),
     status_ (EC_S_IDLE)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
index 42e6f17c251..f04d4a06912 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
@@ -74,10 +74,6 @@ public:
    */
   int disconnect_callbacks;
 
-  /// Flags for the Consumer Admin
-  int busy_hwm;
-  int max_write_delay;
-
   /**
    * The scheduling service that we will use with this event channel.
    * Notice that this is optional and will only take effect if the EC
@@ -225,11 +221,6 @@ public:
   /// Obtain the scheduler, the user must release
   CORBA::Object_ptr scheduler (void);
 
-  /// Control the concurrency of the delayed connect/disconnect
-  /// operations.
-  int busy_hwm (void) const;
-  int max_write_delay (void) const;
-
   // = The RtecEventChannelAdmin::EventChannel methods...
   /// The default implementation is:
   ///    this->consumer_admin ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -342,21 +333,19 @@ protected:
   /// The scheduling strategy
   TAO_EC_Scheduling_Strategy *scheduling_strategy_;
 
-  /// Consumer/Supplier reconnection flags
+  /// Consumer reconnection flags
   int consumer_reconnect_;
+
+  /// Supplier reconnection flags
   int supplier_reconnect_;
 
   /// If not zero we send callbacks when a proxy is disconnected
   int disconnect_callbacks_;
 
-  /// Control the level of concurrency in the supplier sets with
-  /// delayed operations
-  int busy_hwm_;
-  int max_write_delay_;
-
-  /// Strategies to disconnect misbehaving or destroyed consumers and
-  /// suppliers
+  /// Strategies to disconnect misbehaving or destroyed consumers
   TAO_EC_ConsumerControl *consumer_control_;
+
+  /// Strategies to disconnect misbehaving or destroyed suppliers
   TAO_EC_SupplierControl *supplier_control_;
 
   /// Mutex to protect the internal state
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.i b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.i
index 3c6678e280d..f3a4d6a784d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.i
@@ -7,8 +7,6 @@ TAO_EC_Event_Channel_Attributes (PortableServer::POA_ptr s_poa,
   :  consumer_reconnect (TAO_EC_DEFAULT_CONSUMER_RECONNECT),
      supplier_reconnect (TAO_EC_DEFAULT_SUPPLIER_RECONNECT),
      disconnect_callbacks (TAO_EC_DEFAULT_DISCONNECT_CALLBACKS),
-     busy_hwm (TAO_EC_DEFAULT_BUSY_HWM),
-     max_write_delay (TAO_EC_DEFAULT_MAX_WRITE_DELAY),
      scheduler (CORBA::Object::_nil ()),
      supplier_poa (s_poa),
      consumer_poa (c_poa)
@@ -195,18 +193,6 @@ TAO_EC_Event_Channel_Base::scheduler (void)
 }
 
 ACE_INLINE int
-TAO_EC_Event_Channel_Base::busy_hwm (void) const
-{
-  return this->busy_hwm_;
-}
-
-ACE_INLINE int
-TAO_EC_Event_Channel_Base::max_write_delay (void) const
-{
-  return this->max_write_delay_;
-}
-
-ACE_INLINE int
 TAO_EC_Event_Channel_Base::destroyed (void)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
index c5636dcc759..1eb2794a909 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
@@ -24,11 +24,6 @@ TAO_EC_Per_Supplier_Filter::
      refcnt_ (1)
 {
   this->event_channel_->create_proxy_collection (this->collection_);
-  // @@
-  // @@ this->collection_->busy_hwm (this->event_channel_->busy_hwm ());
-  // @@ this->collection_->max_write_delay (
-  // @@           this->event_channel_->max_write_delay ()
-  // @@ );
 }
 
 TAO_EC_Per_Supplier_Filter::~TAO_EC_Per_Supplier_Filter (void)
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
index 66518a6ec95..d6a03203c50 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
@@ -257,8 +257,6 @@ ECT_Throughput::run (int argc, char* argv[])
         {
           TAO_EC_Event_Channel_Attributes attr (root_poa.in (),
                                                 root_poa.in ());
-          attr.busy_hwm = this->ec_concurrency_hwm_;
-          attr.max_write_delay = this->ec_concurrency_hwm_;
 
           TAO_EC_Event_Channel *ec =
             new TAO_EC_Event_Channel (attr);
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
index ec5d7342741..e8a68fefba1 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
@@ -47,9 +47,7 @@ EC_Driver::EC_Driver (void)
 #if !defined(TAO_EC_DISABLE_OLD_EC)
      module_factory_ (0),
 #endif
-     ec_impl_ (0),
-     busy_hwm_ (TAO_EC_DEFAULT_BUSY_HWM),
-     max_write_delay_ (TAO_EC_DEFAULT_MAX_WRITE_DELAY)
+     ec_impl_ (0)
 {
   TAO_EC_Default_Factory::init_svcs ();
 }
@@ -395,7 +393,6 @@ EC_Driver::initialize_new_ec (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_EC_Event_Channel_Attributes attr (this->root_poa_.in (),
                                         this->root_poa_.in ());
-  this->modify_attributes (attr);
 
   TAO_EC_Event_Channel *ec =
     new TAO_EC_Event_Channel (attr);
@@ -988,30 +985,6 @@ EC_Driver::parse_args (int &argc, char *argv [])
             }
         }
 
-      else if (ACE_OS::strcmp (arg, "-busyhwm") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              this->busy_hwm_ =
-                ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-maxwritedelay") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              this->max_write_delay_ =
-                ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-
       else
         {
           arg_shifter.ignore_arg ();
@@ -1042,19 +1015,10 @@ EC_Driver::print_usage (void)
               "  -supplier_tstart <type>\n"
               "  -supplier_tcount <count>\n"
               "  -supplier_tshift <shift>\n"
-              "  -busy_hwm <value>\n"
-              "  -max_write_delay <value>\n"
               ));
 }
 
 void
-EC_Driver::modify_attributes (TAO_EC_Event_Channel_Attributes& attr)
-{
-  attr.busy_hwm = this->busy_hwm_;
-  attr.max_write_delay = this->max_write_delay_;
-}
-
-void
 EC_Driver::cleanup_tasks (void)
 {
   if (this->tasks_ != 0)
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.h b/TAO/orbsvcs/tests/Event/lib/Driver.h
index 3daa0aa56ce..df182a1369c 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.h
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.h
@@ -169,9 +169,6 @@ public:
   virtual void cleanup_suppliers (void);
   // Cleanup the resources
 
-  virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr);
-  // Allow modifications of the default EC attributes
-
   virtual int decode_consumer_cookie (void* cookie) const;
   // Returns the index of the consumer for <cookie>
 
@@ -326,9 +323,6 @@ protected:
   RtecEventChannelAdmin::EventChannel_var event_channel_;
   // The event channel object reference
 
-  int busy_hwm_;
-  int max_write_delay_;
-  // Control the concurrency inside the EC.
 };
 
 #if defined (__ACE_INLINE__)