From ebe3b13c773bf375ea6bc0d12698169b1301e118 Mon Sep 17 00:00:00 2001
From: Ruud Overeem <overeem@astron.nl>
Date: Thu, 2 Aug 2007 21:32:21 +0000
Subject: [PATCH] BugID: 1083 Added function so we can call the 'work'
procedure of the database manger from the outside world.
---
MAC/GCF/PVSS/include/GCF/PVSS/PVSSservice.h | 2 ++
MAC/GCF/PVSS/src/PVSSservice.cc | 10 ++++++++++
MAC/GCF/PVSS/test/tPerformance.cc | 2 +-
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/MAC/GCF/PVSS/include/GCF/PVSS/PVSSservice.h b/MAC/GCF/PVSS/include/GCF/PVSS/PVSSservice.h
index 45a6e891831..d612d7563af 100644
--- a/MAC/GCF/PVSS/include/GCF/PVSS/PVSSservice.h
+++ b/MAC/GCF/PVSS/include/GCF/PVSS/PVSSservice.h
@@ -66,6 +66,8 @@ public:
PVSSresult dpQuerySubscribeSingle(const string& queryWhere,
const string& queryFrom);
PVSSresult dpQueryUnsubscribe (uint32 queryId);
+
+ void doWork();
private:
// methods
diff --git a/MAC/GCF/PVSS/src/PVSSservice.cc b/MAC/GCF/PVSS/src/PVSSservice.cc
index 7346225805b..72cec0f4d43 100644
--- a/MAC/GCF/PVSS/src/PVSSservice.cc
+++ b/MAC/GCF/PVSS/src/PVSSservice.cc
@@ -397,6 +397,16 @@ void PVSSservice::convAndForwardValueChange(const DpIdentifier& dpId, const Vari
}
}
+//
+// doWork()
+//
+void PVSSservice::doWork()
+{
+ ASSERT(itsSCADAHandler);
+ itsSCADAHandler->workProc();
+}
+
+
//
// dpCreate(dpname, typename)
//
diff --git a/MAC/GCF/PVSS/test/tPerformance.cc b/MAC/GCF/PVSS/test/tPerformance.cc
index f520023b363..3a8ac408193 100644
--- a/MAC/GCF/PVSS/test/tPerformance.cc
+++ b/MAC/GCF/PVSS/test/tPerformance.cc
@@ -304,7 +304,7 @@ GCFEvent::TResult tPerformance::test1getvalue(GCFEvent& e, GCFPortInterface& p)
case F_TIMER:
if (gGetCounter != 0) {
- itsTimerPort->setTimer(0.1);
+ itsTimerPort->setTimer(0.022);
LOG_INFO_STR ("Waiting for " << gGetCounter << " datapoints to be read");
}
else {
--
GitLab