X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.cpp;h=1cb9ce7154a9c302f15e3ecb63637f109f84286a;hp=138ba0a14263fc92e0ce09cb74232f227d0b0c22;hb=aca64cac30aadeee90510958b081cd385221b258;hpb=c3a740dd5d095eb1cdf42e00df4d5a5c480ac5b3 diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp index 138ba0a..1cb9ce7 100644 --- a/pv/view/decodetrace.cpp +++ b/pv/view/decodetrace.cpp @@ -53,6 +53,8 @@ extern "C" { #include #include +using boost::shared_lock; +using boost::shared_mutex; using std::dynamic_pointer_cast; using std::list; using std::lock_guard; @@ -60,7 +62,6 @@ using std::make_pair; using std::max; using std::map; using std::min; -using std::mutex; using std::pair; using std::shared_ptr; using std::tie; @@ -696,7 +697,7 @@ QComboBox* DecodeTrace::create_channel_selector( { assert(dec); - lock_guard lock(_session.signals_mutex()); + shared_lock lock(_session.signals_mutex()); const vector< shared_ptr > &sigs(_session.signals()); assert(_decoder_stack); @@ -731,7 +732,7 @@ void DecodeTrace::commit_decoder_channels(shared_ptr &dec map > channel_map; - lock_guard lock(_session.signals_mutex()); + shared_lock lock(_session.signals_mutex()); const vector< shared_ptr > &sigs(_session.signals()); for (const ChannelSelector &s : _channel_selectors)