epics/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

ca: actual array element count

Browse Source
This commit is contained in:
Matej Sekoranja
2014-08-29 22:07:15 +02:00
parent 0df64f21c5
commit a02b59f992
2 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pvtoolsSrc/eget.cpp
+13 -2
View File
@@ -1807,8 +1807,19 @@ int main (int argc, char *argv[])
shared_ptr<ChannelRequesterImpl> channelRequesterImpl = dynamic_pointer_cast<ChannelRequesterImpl>(channel->getChannelRequester());
channelRequesterImpl->showDisconnectMessage();
shared_ptr<MonitorRequesterImpl> monitorRequesterImpl(new MonitorRequesterImpl(channel->getChannelName()));
channel->createMonitor(monitorRequesterImpl, pvRequest);
// TODO remove this line, when CA provider will allow creation of monitors
// when channels is yet not connected
if (channelRequesterImpl->waitUntilConnected(timeOut))
{
shared_ptr<MonitorRequesterImpl> monitorRequesterImpl(new MonitorRequesterImpl(channel->getChannelName()));
channel->createMonitor(monitorRequesterImpl, pvRequest);
}
else
{
allOK = false;
channel->destroy();
std::cerr << "[" << channel->getChannelName() << "] connection timeout" << std::endl;
}
}
else
{
src/ca/caChannel.cpp
+29 -2
View File
@@ -4,6 +4,8 @@
* in file LICENSE that is included with this distribution.
*/
#include <epicsVersion.h>
#include <pv/logger.h>
#include <pv/standardField.h>
@@ -869,7 +871,20 @@ void CAChannelGet::getDone(struct event_handler_args &args)
void CAChannelGet::get()
{
int result = ca_array_get_callback(getType, channel->getElementCount(),
/*
From R3.14.12 onwards ca_array_get_callback() replies will give a CA client application the current number
of elements in an array field, provided they specified an element count of zero in their original request.
The element count is passed in the callback argument structure.
Prior to R3.14.12 requesting zero elements in a ca_array_get_callback() call was illegal and would fail
immediately.
*/
int result = ca_array_get_callback(getType,
#if (((EPICS_VERSION * 256 + EPICS_REVISION) * 256 + EPICS_MODIFICATION) >= ((3*256+14)*256+12))
0,
#else
channel->getElementCount(),
#endif
channel->getChannelID(), ca_get_handler, this);
if (result == ECA_NORMAL)
{
@@ -1373,8 +1388,20 @@ void CAChannelMonitor::subscriptionEvent(struct event_handler_args &args)
epics::pvData::Status CAChannelMonitor::start()
{
/*
From R3.14.12 onwards when using the IOC server and the C++ client libraries monitor callbacks
replies will give a CA client application the current number of elements in an array field,
provided they specified an element count of zero in their original request.
The element count is passed in the callback argument structure.
Prior to R3.14.12 you could request a zero-length subscription and the zero would mean
“use the value of chid->element_count() for this particular channel”,
but the length of the data you got in your callbacks would never change
(the server would zero-fill everything after the current length of the field).
*/
// TODO DBE_PROPERTY support
int result = ca_create_subscription(getType, channel->getElementCount(),
int result = ca_create_subscription(getType,
0 /*channel->getElementCount()*/,
channel->getChannelID(), DBE_VALUE,
ca_subscription_handler, this,
&eventID);