From 9c10c82e82c49d30a315bb4023f47f74fb529e87 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Thu, 8 Mar 2018 12:24:15 -0500 Subject: [PATCH] pdb: ChannelList include groups --- pdbApp/pdb.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pdbApp/pdb.cpp b/pdbApp/pdb.cpp index d039352..38c0f9f 100644 --- a/pdbApp/pdb.cpp +++ b/pdbApp/pdb.cpp @@ -591,6 +591,16 @@ PDBProvider::channelList(pva::ChannelListRequester::shared_pointer const & reque { names.push_back(rec.name()); } + { + epicsGuard G(transient_pv_map.mutex()); + + for(persist_pv_map_t::const_iterator it=persist_pv_map.begin(), end=persist_pv_map.end(); + it != end; ++it) + { + names.push_back(it->first); + } + } + // check for duplicates? requester->channelListResult(pvd::Status::Ok, shared_from_this(), pvd::freeze(names), false);