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

channelList using svector

Browse Source
This commit is contained in:
Matej Sekoranja
2014-06-09 22:13:48 +02:00
parent aea156ebbb
commit 4e62a7d4df
7 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
testApp/remote/testServer.cpp
View File

@@ -2633,15 +2633,16 @@ public:
throw std::runtime_error("null requester");
// NOTE: this adds only active channels, not all (especially RPC ones)
std::set<epics::pvData::String> channelNames;
PVStringArray::svector channelNames;
{
Lock guard(structureStoreMutex);
channelNames.reserve(structureStore.size());
for (map<String, PVStructure::shared_pointer>::const_iterator iter = structureStore.begin();
iter != structureStore.end();
iter++)
channelNames.insert(iter->first);
channelNames.push_back(iter->first);
}
channelListRequester->channelListResult(Status::Ok, m_mockChannelFind, channelNames, true);
channelListRequester->channelListResult(Status::Ok, m_mockChannelFind, freeze(channelNames), true);
return m_mockChannelFind;
}