1 files changed, 54 insertions, 10 deletions

diff --git a/TAO/orbsvcs/examples/RtEC/test_driver/Supplier.h b/TAO/orbsvcs/examples/RtEC/test_driver/Supplier.h
index b0391f7602b..3d31dce16d3 100644
--- a/TAO/orbsvcs/examples/RtEC/test_driver/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/test_driver/Supplier.h
@@ -10,37 +10,62 @@
 //   Supplier
 //
 // = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
+//   Bryan Thrall (thrall@cse.wustl.edu)
 //
 // ============================================================================
 
 #ifndef SUPPLIER_H
 #define SUPPLIER_H
 
-#include "orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/RtecEventCommC.h"
+#include "orbsvcs/RtecEventCommC.h"
+#include "orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/Channel_Clients_T.h"
+#include "ace/RW_Mutex.h"
+#include "TimeoutConsumer.h"
+#include <sstream> //for ostringstream
+
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class Supplier : public POA_RtecEventComm::PushSupplier
+class Supplier : Timeout_Observer
 {
   // = TITLE
-  //   Simple supplier object
+  //   Simple supplier object which responds to timeout events.
   //
   // = DESCRIPTION
-  //   This class is a supplier of events.
-  //   It simply register for two event typesone event type
-  //   The class is just a helper to simplify common tasks in EC
-  //   tests, such as subscribing for a range of events, disconnecting
-  //   from the EC, informing the driver of shutdown messages, etc.
+  //   This class is an event supplier which responds to EC timeouts.
+  //   For each timeout event it is notified of (via a TimeoutConsumer object),
+  //   it pushes a specified EventSet into the EC.
   //
   //   There are several ways to connect and disconnect this class,
   //   and it is up to the driver program to use the right one.
   //
 public:
   Supplier (void);
-  // Constructor
+  // Default Constructor.
+
+  virtual ~Supplier (void);
+
+  virtual void update(ACE_ENV_SINGLE_ARG_DECL);
+
+  void connect (ACE_RW_Mutex* done,
+                RtecScheduler::Scheduler_ptr scheduler,
+                const char *entry_prefix,
+                TimeBase::TimeT period,
+                RtecScheduler::Importance_t importance,
+                RtecScheduler::Criticality_t criticality,
+                RtecEventComm::EventSourceID supplier_id,
+                size_t to_send,
+                const RtecEventComm::EventSet& events,
+                RtecEventChannelAdmin::EventChannel_ptr ec
+              ACE_ENV_ARG_DECL);
+  // This method connects the supplier to the EC.
+
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  // Disconnect from the EC.
 
   // = The RtecEventComm::PushSupplier methods
 
@@ -49,6 +74,25 @@ public:
   // The skeleton methods.
 
 private:
+  size_t _to_send; //number of times to push on timeout
+  size_t _num_sent; //number of pushes so far
+  int _hold_mtx; //1 when hold _done mutex; 0 else
+  ACE_RW_Mutex* _done; //release read lock when _num_sent >= _to_send
+
+  TimeoutConsumer timeoutconsumer;
+
+  RtecEventComm::EventSourceID _supplier_id;
+  // We generate an id based on the name....
+
+  RtecEventChannelAdmin::ProxyPushConsumer_var _consumer_proxy;
+  // We talk to the EC (as a supplier) using this proxy.
+
+  ACE_PushSupplier_Adapter<Supplier> _supplier;
+  // We connect to the EC as a supplier so we can push events
+  // every time we receive a timeout event.
+
+  RtecEventComm::EventSet _events;
+  // set of events to push when a timeout event is received.
 };
 
 #endif /* SUPPLIER_H */