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

get/setLength capacity removed

Browse Source
This commit is contained in:
Matej Sekoranja
2014-07-22 09:04:08 +02:00
parent c01b928836
commit 16eeeb992b
8 changed files with 37 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/responseHandlers.cpp
View File

@@ -1801,8 +1801,7 @@ void ServerArrayHandler::handleResponse(osiSockAddr* responseFrom,
else if (setLength)
{
size_t length = SerializeHelper::readSize(payloadBuffer, transport.get());
size_t capacity = SerializeHelper::readSize(payloadBuffer, transport.get());
request->getChannelArray()->setLength(length, capacity);
request->getChannelArray()->setLength(length);
}
else if (getLength)
{
@@ -1909,13 +1908,12 @@ void ServerChannelArrayRequesterImpl::setLengthDone(const Status& status, Channe
}
void ServerChannelArrayRequesterImpl::getLengthDone(const Status& status, ChannelArray::shared_pointer const & /*channelArray*/,
size_t length, size_t capacity)
size_t length)
{
{
Lock guard(_mutex);
_status = status;
_length = length;
_capacity = capacity;
}
TransportSender::shared_pointer thisSender = shared_from_this();
_transport->enqueueSendRequest(thisSender);
@@ -1987,7 +1985,6 @@ void ServerChannelArrayRequesterImpl::send(ByteBuffer* buffer, TransportSendCont
{
//Lock guard(_mutex);
SerializeHelper::writeSize(_length, buffer, control);
SerializeHelper::writeSize(_capacity, buffer, control);
}
else if ((QOS_INIT & request) != 0)
{

3
src/server/responseHandlers.h
View File

@@ -584,7 +584,7 @@ namespace pvAccess {
void putArrayDone(const epics::pvData::Status& status, ChannelArray::shared_pointer const & channelArray);
void setLengthDone(const epics::pvData::Status& status, ChannelArray::shared_pointer const & channelArray);
void getLengthDone(const epics::pvData::Status& status, ChannelArray::shared_pointer const & channelArray,
std::size_t length, std::size_t capacity);
std::size_t length);
void lock();
void unlock();
void destroy();
@@ -605,7 +605,6 @@ namespace pvAccess {
epics::pvData::PVArray::shared_pointer _pvPutArray;
std::size_t _length;
std::size_t _capacity;
epics::pvData::Status _status;
};