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

search req. accepted

Browse Source
This commit is contained in:
Matej Sekoranja
2011-01-10 16:34:56 +01:00
parent 62ce32e824
commit a87b9e72e7
13 changed files with 229 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pvAccessApp/remote/channelSearchManager.cpp
+6 -6
View File
@@ -60,7 +60,7 @@ bool BaseSearchInstance::generateSearchRequestMessage(ByteBuffer* requestMessage
return false;
}
const string name = getChannelName();
const String name = getSearchInstanceName();
// not nice...
const int addedPayloadSize = sizeof(int32)/sizeof(int8) + (1 + sizeof(int32)/sizeof(int8) + name.length());
@@ -69,7 +69,7 @@ bool BaseSearchInstance::generateSearchRequestMessage(ByteBuffer* requestMessage
return false;
}
requestMessage->putInt(getChannelID());
requestMessage->putInt(getSearchInstanceID());
SerializeHelper::serializeString(name, requestMessage, control);
requestMessage->putInt(PAYLOAD_POSITION, requestMessage->getPosition() - CA_MESSAGE_HEADER_SIZE);
@@ -484,17 +484,17 @@ void ChannelSearchManager::registerChannel(SearchInstance* channel)
if(_canceled) return;
//overrides if already registered
_channels[channel->getChannelID()] = channel;
_channels[channel->getSearchInstanceID()] = channel;
_timers[0]->installChannel(channel);
}
void ChannelSearchManager::unregisterChannel(SearchInstance* channel)
{
Lock guard(&_mutex);
_channelsIter = _channels.find(channel->getChannelID());
_channelsIter = _channels.find(channel->getSearchInstanceID());
if(_channelsIter != _channels.end())
{
_channels.erase(channel->getChannelID());
_channels.erase(channel->getSearchInstanceID());
}
channel->removeAndUnsetListOwnership();
@@ -508,7 +508,7 @@ void ChannelSearchManager::searchResponse(int32 cid, int32 seqNo, int8 minorRevi
_channelsIter = _channels.find(cid);
if(_channelsIter != _channels.end())
{
SearchInstance* si = _channelsIter->second;
si = _channelsIter->second;
_channels.erase(_channelsIter);
si->removeAndUnsetListOwnership();
}