projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SigSession: Converted _signals_mutex into a boost::shared_mutex
[pulseview.git]
/
pv
/
popups
/
channels.cpp
diff --git
a/pv/popups/channels.cpp
b/pv/popups/channels.cpp
index 9afc3b48952754047eecce46b3f7aefb2630beb8..ee0daedf4b1035f76c6d6346dc9a59616be8db49 100644
(file)
--- a/
pv/popups/channels.cpp
+++ b/
pv/popups/channels.cpp
@@
-35,6
+35,8
@@
using namespace Qt;
using namespace Qt;
+using boost::shared_lock;
+using boost::shared_mutex;
using std::lock_guard;
using std::map;
using std::mutex;
using std::lock_guard;
using std::map;
using std::mutex;
@@
-68,7
+70,7
@@
Channels::Channels(SigSession &session, QWidget *parent) :
// Collect a set of signals
map<shared_ptr<Channel>, shared_ptr<Signal> > signal_map;
// Collect a set of signals
map<shared_ptr<Channel>, shared_ptr<Signal> > signal_map;
-
lock_guard<
mutex> lock(_session.signals_mutex());
+
shared_lock<shared_
mutex> lock(_session.signals_mutex());
const vector< shared_ptr<Signal> > &sigs(_session.signals());
for (const shared_ptr<Signal> &sig : sigs)
const vector< shared_ptr<Signal> > &sigs(_session.signals());
for (const shared_ptr<Signal> &sig : sigs)