From f93fa732acacbc25d30064d52d1fbfbf6a727429 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Mon, 1 Jul 1996 19:53:47 +0000 Subject: [PATCH] moved exist test expire to exServer.cc --- src/cas/example/exAsyncPV.cc | 12 ------------ src/cas/example/exPV.cc | 2 +- src/cas/example/exServer.cc | 26 +++++++++++++++++++------- src/cas/example/exServer.h | 4 ++-- src/cas/example/test.adl | 26 +++++++++++++------------- 5 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/cas/example/exAsyncPV.cc b/src/cas/example/exAsyncPV.cc index ce675d95d..28a084fc9 100644 --- a/src/cas/example/exAsyncPV.cc +++ b/src/cas/example/exAsyncPV.cc @@ -79,15 +79,3 @@ void exAsyncReadIO::expire() this->postIOCompletion(status); } -// -// exAsyncExistIO::expire() -// (a virtual function that runs when the base timer expires) -// -void exAsyncExistIO::expire() -{ - // - // post IO completion - // - this->postIOCompletion(S_cas_success); -} - diff --git a/src/cas/example/exPV.cc b/src/cas/example/exPV.cc index 6a2f2e7a8..0391bfa98 100644 --- a/src/cas/example/exPV.cc +++ b/src/cas/example/exPV.cc @@ -168,7 +168,7 @@ caStatus exPV::update(gdd &valueIn) // aitEnum exPV::bestExternalType() { - return aitEnumFloat64; + return aitEnumFloat32; } // diff --git a/src/cas/example/exServer.cc b/src/cas/example/exServer.cc index bf7a69b29..e796af7f5 100644 --- a/src/cas/example/exServer.cc +++ b/src/cas/example/exServer.cc @@ -14,9 +14,9 @@ osiTime exServer::currentTime; const pvInfo exServer::pvList[] = { - pvInfo (1.0e-4, "jane", 10.0f, 0.0f, excasIoSync), + pvInfo (1.0e-1, "jane", 10.0f, 0.0f, excasIoSync), pvInfo (2.0, "fred", 10.0f, -10.0f, excasIoSync), - pvInfo (1.0e-4, "janet", 10.0f, 0.0f, excasIoAsync), + pvInfo (1.0e-1, "janet", 10.0f, 0.0f, excasIoAsync), pvInfo (2.0, "freddy", 10.0f, -10.0f, excasIoAsync) }; @@ -105,11 +105,11 @@ caStatus exServer::pvExistTest(const casCtx &ctxIn, const char *pPVName, } } - /* - * there are no name aliases in this - * server's PV name syntax - */ - canonicalPVName.putRef (&pPVI->getName()); + // + // there are no name aliases in this + // server's PV name syntax + // + canonicalPVName.put (pPVI->getName()); return S_casApp_success; } @@ -180,3 +180,15 @@ void exAsyncIOTimer::destroy() { } +// +// exAsyncExistIO::expire() +// (a virtual function that runs when the base timer expires) +// +void exAsyncExistIO::expire() +{ + // + // post IO completion + // + this->postIOCompletion(S_cas_success); +} + diff --git a/src/cas/example/exServer.h b/src/cas/example/exServer.h index ffda4c808..50384f90b 100644 --- a/src/cas/example/exServer.h +++ b/src/cas/example/exServer.h @@ -370,13 +370,13 @@ public: const casCtx &ctxIn, gdd &canonicalPVName) : exAsyncIO(ctxIn, &canonicalPVName) { - canonicalPVName.putRef(&pPVI->getName()); + canonicalPVName.put (pPVI->getName()); } // // expire() // (a virtual function that runs when the base timer expires) - // see exAsyncPV.cc + // see exServer.cc // void expire(); private: diff --git a/src/cas/example/test.adl b/src/cas/example/test.adl index 709635897..cd6b79b46 100644 --- a/src/cas/example/test.adl +++ b/src/cas/example/test.adl @@ -6,7 +6,7 @@ display { majv="2" mnrv="2" ndyng="0" - npc="6" + npc="5" nstr="8" ndynamic="12" nplot="0" @@ -21,21 +21,21 @@ display { } clr="0" bclr="1" - nwords_dspy="1112" + nwords_dspy="1106" nwords_sta="28" nwords_cmap="36" nwords_crules="106" - odyng="312" - osta="284" - odynamic="312" - oplot="1112" - ord="1112" - oes="1112" - okd="1112" + odyng="306" + osta="278" + odynamic="306" + oplot="1106" + ord="1106" + oes="1106" + okd="1106" opc="58" - ostr="94" - ocmap="142" - ocrules="178" + ostr="88" + ocmap="136" + ocrules="172" style="solid" fill="outline" width="0" @@ -381,7 +381,7 @@ display { x="15" y="43" width="168" - height="22" + height="26" groupid="0" } control {