ChangeLogTag:Wed Mar 10 16:43:55 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

2 files changed, 37 insertions, 211 deletions

diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
index 00ba11800dd..bca917ef4a0 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
@@ -7,11 +7,7 @@
 
 #include "orbsvcs/Event_Utilities.h"
 #include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Scheduler_Factory.h"
 #include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/Sched/Config_Scheduler.h"
-#include "orbsvcs/Runtime_Scheduler.h"
 
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Basic_Factory.h"
@@ -122,20 +118,6 @@ ECM_Driver::run (int argc, char* argv[])
             }
         }
 
-      ACE_Config_Scheduler scheduler_impl;
-      RtecScheduler::Scheduler_var scheduler =
-        scheduler_impl._this (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      CORBA::String_var str =
-        this->orb_->object_to_string (scheduler.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      ACE_DEBUG ((LM_DEBUG, "The (local) scheduler IOR is <%s>\n",
-                  str.in ()));
-
-      if (ACE_Scheduler_Factory::server (scheduler.in ()) == -1)
-        return -1;
-
       TAO_EC_Basic_Factory ec_factory (root_poa.in ());
 
       TAO_EC_Event_Channel ec_impl (&ec_factory);
@@ -145,7 +127,8 @@ ECM_Driver::run (int argc, char* argv[])
         ec_impl._this (TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
-      str = this->orb_->object_to_string (ec.in (), TAO_TRY_ENV);
+      CORBA::String_var str =
+        this->orb_->object_to_string (ec.in (), TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "The (local) EC IOR is <%s>\n", str.in ()));
@@ -159,35 +142,29 @@ ECM_Driver::run (int argc, char* argv[])
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: local EC objref ready\n"));
 
       this->open_federations (ec.in (),
-                              scheduler.in (),
                               TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: open_federations done\n"));
 
       this->open_senders (ec.in (),
-                          scheduler.in (),
                           TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: open_senders done\n"));
 
       this->open_receivers (ec.in (),
-                            scheduler.in (),
                             TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: open_receivers done\n"));
 
       this->activate_federations (ec.in (),
-                                  scheduler.in (),
                                   TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: activate_federations done\n"));
 
-      ACE_DEBUG ((LM_DEBUG, "EC_Mcast: activate the  EC\n"));
-
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: running the test\n"));
       if (this->orb_->run () == -1)
         ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
@@ -206,13 +183,6 @@ ECM_Driver::run (int argc, char* argv[])
 
       ec_impl.shutdown (TAO_TRY_ENV);
       TAO_CHECK_ENV;
-
-      ACE_DEBUG ((LM_DEBUG, "EC_Mcast: shutdown grace period\n"));
-
-      ACE_Time_Value tv (5, 0);
-      if (this->orb_->run (&tv) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
-
     }
   TAO_CATCH (CORBA::SystemException, sys_ex)
     {
@@ -239,28 +209,28 @@ ECM_Driver::federation_has_shutdown (ECM_Local_Federation *federation,
 
 void
 ECM_Driver::open_federations (RtecEventChannelAdmin::EventChannel_ptr ec,
-                              RtecScheduler::Scheduler_ptr scheduler,
                               CORBA::Environment &TAO_IN_ENV)
 {
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
       this->local_federations_[i]->open (this->event_count_,
-                                         this->event_period_,
-                                         ec, scheduler, TAO_IN_ENV);
+                                         ec, TAO_IN_ENV);
       TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
 }
 
 void
 ECM_Driver::activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec,
-                                  RtecScheduler::Scheduler_ptr scheduler,
                                   CORBA::Environment &TAO_IN_ENV)
 {
   this->federations_running_ = this->local_federations_count_;
+  RtecEventComm::Time interval = this->event_period_;
+  interval *= 10;
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
-      this->local_federations_[i]->activate (this->event_period_,
-                                             ec, scheduler, TAO_IN_ENV);
+      this->local_federations_[i]->activate (ec,
+                                             interval,
+                                             TAO_IN_ENV);
       TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
 }
@@ -277,7 +247,6 @@ ECM_Driver::close_federations (CORBA::Environment &TAO_IN_ENV)
 
 void
 ECM_Driver::open_senders (RtecEventChannelAdmin::EventChannel_ptr ec,
-                          RtecScheduler::Scheduler_ptr scheduler,
                           CORBA::Environment &TAO_IN_ENV)
 {
   if (this->endpoint_.dgram ().open (ACE_Addr::sap_any) == -1)
@@ -296,7 +265,6 @@ ECM_Driver::open_senders (RtecEventChannelAdmin::EventChannel_ptr ec,
     {
       this->all_federations_[i]->open (&this->endpoint_,
                                        ec,
-                                       scheduler,
                                        TAO_IN_ENV);
       TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
@@ -315,13 +283,11 @@ ECM_Driver::close_senders (CORBA::Environment &TAO_IN_ENV)
 
 void
 ECM_Driver::open_receivers (RtecEventChannelAdmin::EventChannel_ptr ec,
-                            RtecScheduler::Scheduler_ptr scheduler,
                             CORBA::Environment &TAO_IN_ENV)
 {
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
       this->local_federations_[i]->open_receiver (ec,
-                                                  scheduler,
                                                   &this->endpoint_,
                                                   TAO_IN_ENV);
       TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
@@ -609,20 +575,13 @@ ECM_Federation::ECM_Federation (char* name,
 void
 ECM_Federation::open (TAO_ECG_UDP_Out_Endpoint *endpoint,
                       RtecEventChannelAdmin::EventChannel_ptr ec,
-                      RtecScheduler::Scheduler_ptr scheduler,
                       CORBA::Environment &TAO_IN_ENV)
 {
-  const int bufsize = 512;
-  char buf[bufsize];
-  ACE_OS::strcpy (buf, this->name ());
-  ACE_OS::strcat (buf, "/sender");
-
   RtecUDPAdmin::AddrServer_var addr_server =
     this->addr_server (TAO_IN_ENV);
   TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
-  this->sender_.init (ec, scheduler,
-                      buf,
+  this->sender_.init (ec,
                       addr_server.in (),
                       endpoint,
                       TAO_IN_ENV);
@@ -631,31 +590,17 @@ ECM_Federation::open (TAO_ECG_UDP_Out_Endpoint *endpoint,
   // @@ TODO Make this a parameter....
   this->sender_.mtu (64);
 
-  RtecScheduler::handle_t rt_info =
-    scheduler->create (buf, TAO_IN_ENV);
-  TAO_CHECK_ENV_RETURN_VOID(TAO_IN_ENV);
-
   // The worst case execution time is far less than 2
   // milliseconds, but that is a safe estimate....
   ACE_Time_Value tv (0, 2000);
   TimeBase::TimeT time;
   ORBSVCS_Time::Time_Value_to_TimeT (time, tv);
-  scheduler->set (rt_info,
-                  RtecScheduler::VERY_HIGH_CRITICALITY,
-                  time, time, time,
-                  0,
-                  RtecScheduler::VERY_LOW_IMPORTANCE,
-                  time,
-                  0,
-                  RtecScheduler::OPERATION,
-                  TAO_IN_ENV);
-  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   ACE_ConsumerQOS_Factory qos;
   qos.start_disjunction_group ();
   for (int i = 0; i < this->consumer_types (); ++i)
     {
-      qos.insert_type (this->consumer_ipaddr (i), rt_info);
+      qos.insert_type (this->consumer_ipaddr (i), 0);
     }
   RtecEventChannelAdmin::ConsumerQOS qos_copy = qos.get_ConsumerQOS ();
   this->sender_.open (qos_copy, TAO_IN_ENV);
@@ -687,34 +632,9 @@ ECM_Supplier::ECM_Supplier (ECM_Local_Federation* federation)
 
 void
 ECM_Supplier::open (const char* name,
-                    RtecScheduler::Period_t period,
                     RtecEventChannelAdmin::EventChannel_ptr ec,
-                    RtecScheduler::Scheduler_ptr scheduler,
                     CORBA::Environment &TAO_IN_ENV)
 {
-  RtecScheduler::handle_t rt_info =
-    scheduler->create (name, TAO_IN_ENV);
-  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
-
-  // The execution times are set to reasonable values, but
-  // actually they are changed on the real execution, i.e. we
-  // lie to the scheduler to obtain right priorities; but we
-  // don't care if the set is schedulable.
-  ACE_Time_Value tv (0, 2000);
-  TimeBase::TimeT time;
-  ORBSVCS_Time::Time_Value_to_TimeT (time, tv);
-
-  scheduler->set (rt_info,
-                  RtecScheduler::VERY_HIGH_CRITICALITY,
-                  time, time, time,
-                  period,
-                  RtecScheduler::VERY_LOW_IMPORTANCE,
-                  time,
-                  1,
-                  RtecScheduler::OPERATION,
-                  TAO_IN_ENV);
-  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
-
   this->supplier_id_ = ACE::crc32 (name);
   ACE_DEBUG ((LM_DEBUG, "ID for <%s> is %04.4x\n", name,
               this->supplier_id_));
@@ -724,11 +644,11 @@ ECM_Supplier::open (const char* name,
     {
       qos.insert (this->supplier_id_,
                   this->federation_->supplier_ipaddr (i),
-                  rt_info, 1);
+                  0, 1);
     }
   qos.insert (this->supplier_id_,
               ACE_ES_EVENT_SHUTDOWN,
-              rt_info, 1);
+              0, 1);
 
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
     ec->for_suppliers (TAO_IN_ENV);
@@ -760,50 +680,15 @@ ECM_Supplier::close (CORBA::Environment &TAO_IN_ENV)
 }
 
 void
-ECM_Supplier::activate (const char* name,
-                        RtecScheduler::Period_t period,
-                        RtecEventChannelAdmin::EventChannel_ptr ec,
-                        RtecScheduler::Scheduler_ptr scheduler,
+ECM_Supplier::activate (RtecEventChannelAdmin::EventChannel_ptr ec,
+                        RtecEventComm::Time interval,
                         CORBA::Environment &TAO_IN_ENV)
 {
-  const int bufsize = 512;
-  char buf[bufsize];
-  ACE_OS::strcpy (buf, "consumer_");
-  ACE_OS::strcat (buf, name);
-  RtecScheduler::handle_t rt_info =
-    scheduler->create (buf, TAO_IN_ENV);
-  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
-
-  // The execution times are set to reasonable values, but
-  // actually they are changed on the real execution, i.e. we
-  // lie to the scheduler to obtain right priorities; but we
-  // don't care if the set is schedulable.
-  ACE_Time_Value tv (0, 2000);
-  TimeBase::TimeT time;
-  ORBSVCS_Time::Time_Value_to_TimeT (time, tv);
-  scheduler->set (rt_info,
-                  RtecScheduler::VERY_HIGH_CRITICALITY,
-                  time, time, time,
-                  period,
-                  RtecScheduler::VERY_LOW_IMPORTANCE,
-                  time,
-                  1,
-                  RtecScheduler::OPERATION,
-                  TAO_IN_ENV);
-  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
-
-  // Also connect our consumer for timeout events from the EC.
-  int interval = period / 10;
-  ACE_Time_Value tv_timeout (interval / ACE_ONE_SECOND_IN_USECS,
-                             interval % ACE_ONE_SECOND_IN_USECS);
-  TimeBase::TimeT timeout;
-  ORBSVCS_Time::Time_Value_to_TimeT (timeout, tv_timeout);
-
   ACE_ConsumerQOS_Factory consumer_qos;
   consumer_qos.start_disjunction_group ();
   consumer_qos.insert_time (ACE_ES_EVENT_INTERVAL_TIMEOUT,
-                            timeout,
-                            rt_info);
+                            interval,
+                            0);
 
   // = Connect as a consumer.
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
@@ -871,29 +756,14 @@ ECM_Consumer::ECM_Consumer (ECM_Local_Federation *federation)
 void
 ECM_Consumer::open (const char* name,
                     RtecEventChannelAdmin::EventChannel_ptr ec,
-                    RtecScheduler::Scheduler_ptr scheduler,
                     ACE_RANDR_TYPE &seed,
                     CORBA::Environment& TAO_IN_ENV)
 {
-  this->rt_info_ =
-    scheduler->create (name, TAO_IN_ENV);
-  TAO_CHECK_ENV_RETURN_VOID(TAO_IN_ENV);
-
   // The worst case execution time is far less than 2
   // milliseconds, but that is a safe estimate....
   ACE_Time_Value tv (0, 2000);
   TimeBase::TimeT time;
   ORBSVCS_Time::Time_Value_to_TimeT (time, tv);
-  scheduler->set (this->rt_info_,
-                  RtecScheduler::VERY_HIGH_CRITICALITY,
-                  time, time, time,
-                  0,
-                  RtecScheduler::VERY_LOW_IMPORTANCE,
-                  time,
-                  0,
-                  RtecScheduler::OPERATION,
-                  TAO_IN_ENV);
-  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   // = Connect as a consumer.
   this->consumer_admin_ = ec->for_consumers (TAO_IN_ENV);
@@ -915,8 +785,7 @@ ECM_Consumer::connect (ACE_RANDR_TYPE &seed,
 
   ACE_ConsumerQOS_Factory qos;
   qos.start_disjunction_group ();
-  qos.insert_type (ACE_ES_EVENT_SHUTDOWN,
-                   this->rt_info_);
+  qos.insert_type (ACE_ES_EVENT_SHUTDOWN, 0);
   const ECM_Federation* federation = this->federation_->federation ();
   for (int i = 0; i < federation->consumer_types (); ++i)
     {
@@ -934,8 +803,7 @@ ECM_Consumer::connect (ACE_RANDR_TYPE &seed,
                   federation->name (),
                   federation->consumer_name (i)));
       this->federation_->subscribed_bit (i, 1);
-      qos.insert_type (federation->consumer_ipaddr (i),
-                       this->rt_info_);
+      qos.insert_type (federation->consumer_ipaddr (i), 0);
     }
 
   RtecEventComm::PushConsumer_var objref = this->_this (TAO_IN_ENV);
@@ -1012,9 +880,7 @@ ECM_Local_Federation::~ECM_Local_Federation (void)
 
 void
 ECM_Local_Federation::open (int event_count,
-                            RtecScheduler::Period_t period,
                             RtecEventChannelAdmin::EventChannel_ptr ec,
-                            RtecScheduler::Scheduler_ptr scheduler,
                             CORBA::Environment& TAO_IN_ENV)
 {
   this->event_count_ = event_count;
@@ -1024,12 +890,12 @@ ECM_Local_Federation::open (int event_count,
   ACE_OS::strcpy (buf, this->federation_->name ());
   ACE_OS::strcat (buf, "/supplier");
 
-  this->supplier_.open (buf, period, ec, scheduler, TAO_IN_ENV);
+  this->supplier_.open (buf, ec, TAO_IN_ENV);
   TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   ACE_OS::strcpy (buf, this->federation_->name ());
   ACE_OS::strcat (buf, "/consumer");
-  this->consumer_.open (buf, ec, scheduler, this->seed_, TAO_IN_ENV);
+  this->consumer_.open (buf, ec, this->seed_, TAO_IN_ENV);
   TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   this->last_subscription_change_ = ACE_OS::gettimeofday ();
@@ -1046,14 +912,11 @@ ECM_Local_Federation::close (CORBA::Environment &TAO_IN_ENV)
 }
 
 void
-ECM_Local_Federation::activate (RtecScheduler::Period_t period,
-                                RtecEventChannelAdmin::EventChannel_ptr ec,
-                                RtecScheduler::Scheduler_ptr scheduler,
+ECM_Local_Federation::activate (RtecEventChannelAdmin::EventChannel_ptr ec,
+                                RtecEventComm::Time interval,
                                 CORBA::Environment& TAO_IN_ENV)
 {
-  this->supplier_.activate (this->federation_->name (),
-                            period,
-                            ec, scheduler, TAO_IN_ENV);
+  this->supplier_.activate (ec, interval, TAO_IN_ENV);
 }
 
 void
@@ -1148,15 +1011,9 @@ ECM_Local_Federation::consumer_push (ACE_hrtime_t,
 
 void
 ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
-                                     RtecScheduler::Scheduler_ptr scheduler,
                                      TAO_ECG_UDP_Out_Endpoint* ignore_from,
                                      CORBA::Environment &TAO_IN_ENV)
 {
-  const int bufsize = 512;
-  char buf[bufsize];
-  ACE_OS::strcpy (buf, this->name ());
-  ACE_OS::strcat (buf, "/receiver");
-
   RtecUDPAdmin::AddrServer_var addr_server =
     this->federation_->addr_server (TAO_IN_ENV);
   TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
@@ -1166,33 +1023,19 @@ ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
   // @@ This should be parameters...
   ACE_Time_Value expire_interval (1, 0);
   const int max_timeouts = 5;
-  this->receiver_.init (ec, scheduler,
-                        buf,
+  this->receiver_.init (ec,
                         ignore_from,
                         addr_server.in (),
-                        reactor, expire_interval, max_timeouts,
+                        reactor,
+                        expire_interval,
+                        max_timeouts,
                         TAO_IN_ENV);
   TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
-  RtecScheduler::handle_t rt_info =
-    scheduler->create (buf, TAO_IN_ENV);
-  TAO_CHECK_ENV_RETURN_VOID(TAO_IN_ENV);
-
-  // The worst case execution time is far less than 2
-  // milliseconds, but that is a safe estimate....
-  ACE_Time_Value tv (0, 2000);
-  TimeBase::TimeT time;
-  ORBSVCS_Time::Time_Value_to_TimeT (time, tv);
-  scheduler->set (rt_info,
-                  RtecScheduler::VERY_HIGH_CRITICALITY,
-                  time, time, time,
-                  0,
-                  RtecScheduler::VERY_LOW_IMPORTANCE,
-                  time,
-                  1,
-                  RtecScheduler::OPERATION,
-                  TAO_IN_ENV);
-  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+  const int bufsize = 512;
+  char buf[bufsize];
+  ACE_OS::strcpy (buf, this->name ());
+  ACE_OS::strcat (buf, "/receiver");
 
   RtecEventComm::EventSourceID source = ACE::crc32 (buf);
 
@@ -1206,7 +1049,7 @@ ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
     {
       qos.insert (source,
                   this->consumer_ipaddr (i),
-                  rt_info, 1);
+                  0, 1);
     }
 
   RtecEventChannelAdmin::SupplierQOS qos_copy =
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
index b05aa7aedb2..8d021e57381 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
@@ -111,7 +111,6 @@ public:
 
   void open (TAO_ECG_UDP_Out_Endpoint *endoint,
              RtecEventChannelAdmin::EventChannel_ptr ec,
-             RtecScheduler::Scheduler_ptr scheduler,
              CORBA::Environment &_env);
   // Connect the UDP sender to the EC.
 
@@ -164,19 +163,15 @@ public:
   ECM_Supplier (ECM_Local_Federation* federation);
 
   void open (const char* name,
-             RtecScheduler::Period_t period,
              RtecEventChannelAdmin::EventChannel_ptr event_channel,
-             RtecScheduler::Scheduler_ptr scheduler,
              CORBA::Environment& _env);
   // This method connects the supplier to the EC.
 
   void close (CORBA::Environment &_env);
   // Disconnect from the EC.
 
-  void activate (const char* name,
-                 RtecScheduler::Period_t period,
-                 RtecEventChannelAdmin::EventChannel_ptr event_channel,
-                 RtecScheduler::Scheduler_ptr scheduler,
+  void activate (RtecEventChannelAdmin::EventChannel_ptr event_channel,
+                 RtecEventComm::Time interval,
                  CORBA::Environment& _env);
   // Connect as a consumer to start receiving events.
 
@@ -224,7 +219,6 @@ public:
 
   void open (const char* name,
              RtecEventChannelAdmin::EventChannel_ptr event_channel,
-             RtecScheduler::Scheduler_ptr scheduler,
              ACE_RANDR_TYPE &seed,
              CORBA::Environment& _env);
   // This method connects the consumer to the EC.
@@ -247,9 +241,6 @@ private:
   ECM_Local_Federation* federation_;
   // To callback.
 
-  RtecScheduler::handle_t rt_info_;
-  // The handle for our RT_Info description.
-
   RtecEventChannelAdmin::ProxyPushSupplier_var supplier_proxy_;
   // We talk to the EC using this proxy.
 
@@ -271,18 +262,15 @@ public:
   // Destructor
 
   void open (int event_count,
-             RtecScheduler::Period_t period,
              RtecEventChannelAdmin::EventChannel_ptr event_channel,
-             RtecScheduler::Scheduler_ptr scheduler,
              CORBA::Environment& _env);
   // Connect both the supplier and the consumer.
 
   void close (CORBA::Environment& _env);
   // Disconnect everybody from the EC
 
-  void activate (RtecScheduler::Period_t period,
-                 RtecEventChannelAdmin::EventChannel_ptr event_channel,
-                 RtecScheduler::Scheduler_ptr scheduler,
+  void activate (RtecEventChannelAdmin::EventChannel_ptr event_channel,
+                 RtecEventComm::Time interval,
                  CORBA::Environment& _env);
   // Activate the supplier
 
@@ -299,7 +287,6 @@ public:
   // The federation description.
 
   void open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
-                      RtecScheduler::Scheduler_ptr scheduler,
                       TAO_ECG_UDP_Out_Endpoint* ignore_from,
                       CORBA::Environment &_env);
   // Connect the UDP receiver to the EC.
@@ -431,12 +418,10 @@ public:
 
 private:
   void open_federations (RtecEventChannelAdmin::EventChannel_ptr ec,
-                         RtecScheduler::Scheduler_ptr scheduler,
                          CORBA::Environment &_env);
   // Connect the federations to the EC.
 
   void activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec,
-                             RtecScheduler::Scheduler_ptr scheduler,
                              CORBA::Environment &_env);
   // Activate all the federations
 
@@ -445,12 +430,10 @@ private:
   // the objects, etc.
 
   void open_senders (RtecEventChannelAdmin::EventChannel_ptr ec,
-                     RtecScheduler::Scheduler_ptr scheduler,
                      CORBA::Environment &_env);
   // Connect all the senders, so we can start multicasting events.
 
   void open_receivers (RtecEventChannelAdmin::EventChannel_ptr ec,
-                       RtecScheduler::Scheduler_ptr scheduler,
                        CORBA::Environment &_env);
   // Connect all the receivers, thus we accept events arriving through
   // multicast.
@@ -483,7 +466,7 @@ private:
 
 private:
   int event_period_;
-  // The events are generated using this interval.
+  // The events are generated using this interval, in microseconds.
 
   int event_count_;
   // How many events will the suppliers send