From ccd139a8ea7594976ee8143dbea35d8490896051 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Thu, 5 Aug 1999 00:09:54 +0000
Subject: [PATCH] osiTimer constructor now requires delay of type double

---
 src/cas/generic/st/caServerOS.cc  | 23 ++++++++--------
 src/cas/generic/st/casDGOS.cc     | 10 +++++--
 src/cas/generic/st/casStreamOS.cc | 46 ++++---------------------------
 3 files changed, 25 insertions(+), 54 deletions(-)

diff --git a/src/cas/generic/st/caServerOS.cc b/src/cas/generic/st/caServerOS.cc
index be64af0c9..2f38e3681 100644
--- a/src/cas/generic/st/caServerOS.cc
+++ b/src/cas/generic/st/caServerOS.cc
@@ -6,6 +6,9 @@
  *
  *
  * $Log$
+ * Revision 1.2  1997/04/10 19:34:28  jhill
+ * API changes
+ *
  * Revision 1.1  1996/11/02 01:01:27  jhill
  * installed
  *
@@ -29,11 +32,11 @@
 //
 class casBeaconTimer : public osiTimer {
 public:
-        casBeaconTimer (const osiTime &delay, caServerOS &osIn) :
+        casBeaconTimer (double delay, caServerOS &osIn) :
                 osiTimer(delay), os (osIn) {}
         void expire();
-        const osiTime delay() const;
-        osiBool again() const;
+        double delay() const;
+        bool again() const;
         const char *name() const;
 private:
         caServerOS      &os;
@@ -59,15 +62,15 @@ void casBeaconTimer::expire()
 //
 // casBeaconTimer::again()
 //
-osiBool casBeaconTimer::again()	const
+bool casBeaconTimer::again()	const
 {
-	return osiTrue; 
+	return true; 
 }
 
 //
 // casBeaconTimer::delay()
 //
-const osiTime casBeaconTimer::delay() const
+double casBeaconTimer::delay() const
 {
 	return os->getBeaconPeriod();
 }
@@ -80,7 +83,6 @@ const char *casBeaconTimer::name() const
 	return "casBeaconTimer";
 }
 
-
 //
 // caServerOS::init()
 //
@@ -88,14 +90,13 @@ caStatus caServerOS::init()
 {
 	this->pBTmr = new casBeaconTimer((*this)->getBeaconPeriod(), *this);
 	if (!this->pBTmr) {
-                ca_printf("CAS: Unable to start server beacon\n");
+		ca_printf("CAS: Unable to start server beacon\n");
 		return S_cas_noMemory;
-        }
-
+	}
+	
 	return S_cas_success;
 }
 
-
 //
 // caServerOS::~caServerOS()
 //
diff --git a/src/cas/generic/st/casDGOS.cc b/src/cas/generic/st/casDGOS.cc
index bca71f83c..5cff13603 100644
--- a/src/cas/generic/st/casDGOS.cc
+++ b/src/cas/generic/st/casDGOS.cc
@@ -6,6 +6,12 @@
  *
  *
  * $Log$
+ * Revision 1.6  1998/10/23 00:27:14  jhill
+ * fixed problem where send was not always rearmed if this
+ * was indirectly necessary in the send callback because
+ * in this callback the code considered sends to be still armed
+ * until the send callback completed
+ *
  * Revision 1.5  1998/07/08 15:38:10  jhill
  * fixed lost monitors during flow control problem
  *
@@ -40,8 +46,8 @@
 
 class casDGEvWakeup : public osiTimer {
 public:
-	casDGEvWakeup(casDGOS &osIn) :
-	osiTimer(osiTime(0.0)), os(osIn) {}
+	casDGEvWakeup (casDGOS &osIn) :
+	osiTimer (0.0), os(osIn) {}
 	~casDGEvWakeup();
 	void expire();
 	void show (unsigned level) const;
diff --git a/src/cas/generic/st/casStreamOS.cc b/src/cas/generic/st/casStreamOS.cc
index 82a822e23..07c49c3b3 100644
--- a/src/cas/generic/st/casStreamOS.cc
+++ b/src/cas/generic/st/casStreamOS.cc
@@ -3,45 +3,6 @@
 // $Id$
 //
 //
-// $Log$
-// Revision 1.10  1998/10/23 00:27:15  jhill
-// fixed problem where send was not always rearmed if this
-// was indirectly necessary in the send callback because
-// in this callback the code considered sends to be still armed
-// until the send callback completed
-//
-// Revision 1.9  1998/09/24 20:50:50  jhill
-// subtle changes which relate to not flushing the output buffer if there are bytes
-// pending in the input queue (improves performance)
-//
-// Revision 1.8  1998/05/05 16:29:58  jhill
-// fixed warnings
-//
-// Revision 1.7  1997/08/05 00:47:21  jhill
-// fixed warnings
-//
-// Revision 1.6  1997/06/30 22:54:34  jhill
-// use %p with pointers
-//
-// Revision 1.5  1997/04/10 19:34:32  jhill
-// API changes
-//
-// Revision 1.4  1996/12/12 21:24:17  jhill
-// moved casStreamOS *pStrmOS decl down
-//
-// Revision 1.3  1996/12/12 19:02:36  jhill
-// fixed send does not get armed after complete flush bug
-//
-// Revision 1.2  1996/12/11 00:55:14  jhill
-// better message
-//
-// Revision 1.1  1996/11/02 01:01:33  jhill
-// installed
-//
-// Revision 1.1.1.1  1996/06/20 00:28:06  jhill
-// ca server installation
-//
-//
 //
 // TO DO:
 // o armRecv() and armSend() should return bad status when
@@ -148,8 +109,10 @@ inline casStreamWriteReg::~casStreamWriteReg ()
 //
 class casStreamEvWakeup : public osiTimer {
 public:
+
 	casStreamEvWakeup(casStreamOS &osIn) : 
-		osiTimer(osiTime()), os(osIn) {}
+		osiTimer(0.0), os(osIn) {}
+
 	~casStreamEvWakeup();
 
 	void expire();
@@ -157,6 +120,7 @@ public:
 	void show(unsigned level) const;
 
 	const char *name() const;
+
 private:
 	casStreamOS	&os;
 };
@@ -219,7 +183,7 @@ void casStreamEvWakeup::expire()
 class casStreamIOWakeup : public osiTimer {
 public:
 	casStreamIOWakeup(casStreamOS &osIn) : 
-		osiTimer(osiTime(0.0)), os(osIn) {}
+		osiTimer (0.0), os(osIn) {}
 	~casStreamIOWakeup();
 
 	void expire();