flow: Merged <feature> 'changesAfter3_0_2' to <develop> ('default').

2014-06-10 09:05:48 -04:00
parent d1791393ad 552925dfe6
commit 35429bf4df
21 changed files with 745 additions and 1305 deletions
--- a/src/pvAccess/channelProviderLocal.cpp
+++ b/src/pvAccess/channelProviderLocal.cpp
@@ -122,6 +122,19 @@ ChannelFind::shared_pointer ChannelProviderLocal::channelFind(
    return channelFinder;
 }

+ChannelFind::shared_pointer ChannelProviderLocal::channelList(
+    ChannelListRequester::shared_pointer const & channelListRequester)
+{
+    PVStringArrayPtr records;
+    {
+        Lock guard(mutex);
+        records = pvDatabase->getRecordNames();
+    }
+
+    channelListRequester->channelListResult(Status::Ok, channelFinder, records->view(), false);
+    return channelFinder;
+}
+
 Channel::shared_pointer ChannelProviderLocal::createChannel(
    String const & channelName,
    ChannelRequester::shared_pointer  const &channelRequester,