minor improvements to pvget for monitoring

This commit is contained in:
Matej Sekoranja
2012-08-03 09:02:56 +02:00
parent 6982f78ff4
commit e2896ddf60

View File

@@ -21,6 +21,8 @@ using namespace std::tr1;
using namespace epics::pvData;
using namespace epics::pvAccess;
// TODO cout vs cerr
void convertStructure(StringBuilder buffer,PVStructure *data,int notFirst);
void convertArray(StringBuilder buffer,PVScalarArray * pv,int notFirst);
void convertStructureArray(StringBuilder buffer,PVStructureArray * pvdata,int notFirst);
@@ -492,8 +494,7 @@ class MonitorRequesterImpl : public MonitorRequester
virtual void monitorConnect(const epics::pvData::Status& status, Monitor::shared_pointer const & monitor, StructureConstPtr const & structure)
{
std::cout << "monitorConnect(" << status.toString() << ")" << std::endl;
if (status.isSuccess() && structure)
if (status.isSuccess())
{
/*
String str;
@@ -510,6 +511,10 @@ class MonitorRequesterImpl : public MonitorRequester
}
}
else
{
std::cout << "monitorConnect(" << status.toString() << ")" << std::endl;
}
}
virtual void monitorEvent(Monitor::shared_pointer const & monitor)
@@ -745,7 +750,7 @@ int main (int argc, char *argv[])
}
}
if (monitor)
if (allOK && monitor)
{
while (true)
epicsThreadSleep(timeOut);