X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=61f017660cab050cc5ae84f0b9d626daef69bcca;hp=079d8d89b38ffaec8e42b1c6a7f173e56a46bb30;hb=aca64cac30aadeee90510958b081cd385221b258;hpb=c3a740dd5d095eb1cdf42e00df4d5a5c480ac5b3 diff --git a/pv/view/view.cpp b/pv/view/view.cpp index 079d8d8..61f0176 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -43,6 +43,8 @@ #include "pv/data/logic.h" #include "pv/data/logicsnapshot.h" +using boost::shared_lock; +using boost::shared_mutex; using pv::data::SignalData; using std::back_inserter; using std::deque; @@ -51,7 +53,6 @@ using std::lock_guard; using std::max; using std::make_pair; using std::min; -using std::mutex; using std::pair; using std::set; using std::shared_ptr; @@ -273,7 +274,7 @@ list > View::selected_items() const set< shared_ptr > View::get_visible_data() const { - lock_guard lock(session().signals_mutex()); + shared_lock lock(session().signals_mutex()); const vector< shared_ptr > &sigs(session().signals()); // Make a set of all the visible data objects @@ -522,7 +523,7 @@ void View::signals_changed() // Populate the traces clear_child_items(); - lock_guard lock(session().signals_mutex()); + shared_lock lock(session().signals_mutex()); const vector< shared_ptr > &sigs(session().signals()); for (auto s : sigs) add_child_item(s);