X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fstoresession.cpp;h=fcba344e9fa8470b6372119eb26e552f83d312ae;hp=f60cd26cc621ec9225e16ef57ed37ad2113e80d9;hb=3b68d03ddae96edb38a80f31bf6a990bde21cd1d;hpb=f9abf97e78bc4825d80926b0ebc6cbaef40768b1 diff --git a/pv/storesession.cpp b/pv/storesession.cpp index f60cd26..fcba344 100644 --- a/pv/storesession.cpp +++ b/pv/storesession.cpp @@ -25,17 +25,17 @@ #include #include -using boost::mutex; -using boost::thread; -using boost::lock_guard; using std::deque; using std::dynamic_pointer_cast; +using std::lock_guard; using std::make_pair; using std::min; +using std::mutex; using std::pair; using std::set; using std::shared_ptr; using std::string; +using std::thread; using std::vector; namespace pv { @@ -46,6 +46,7 @@ StoreSession::StoreSession(const std::string &file_name, const SigSession &session) : _file_name(file_name), _session(session), + _interrupt(false), _units_stored(0), _unit_count(0) { @@ -129,7 +130,7 @@ bool StoreSession::start() free(probes[i]); delete[] probes; - _thread = boost::thread(&StoreSession::store_proc, this, snapshot); + _thread = std::thread(&StoreSession::store_proc, this, snapshot); return true; } @@ -141,7 +142,7 @@ void StoreSession::wait() void StoreSession::cancel() { - _thread.interrupt(); + _interrupt = true; } void StoreSession::store_proc(shared_ptr snapshot) @@ -164,8 +165,7 @@ void StoreSession::store_proc(shared_ptr snapshot) const unsigned int samples_per_block = BlockSize / unit_size; - while (!boost::this_thread::interruption_requested() && - start_sample < _unit_count) + while (!_interrupt && start_sample < _unit_count) { progress_updated();