X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.cpp;h=414aaf0ca1ae338629fdcf2e60ce5b4dd4c5fafd;hb=bb3030b34e44733036acdfe5b4d4ec0705146831;hp=f82d3ecc1ef82f32dbfbee4f460d5af588a2fd1c;hpb=f46e495ef1db0a4e522462ac18260f2151fa2b89;p=pulseview.git

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index f82d3ecc..414aaf0c 100644
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -20,9 +20,6 @@
 
 #include <libsigrokdecode/libsigrokdecode.h>
 
-#include <boost/foreach.hpp>
-#include <boost/thread/thread.hpp>
-
 #include <stdexcept>
 
 #include <QDebug>
@@ -36,11 +33,10 @@
 #include <pv/sigsession.h>
 #include <pv/view/logicsignal.h>
 
-using boost::lock_guard;
-using boost::mutex;
+using std::lock_guard;
+using std::mutex;
 using boost::optional;
-using boost::shared_ptr;
-using boost::unique_lock;
+using std::unique_lock;
 using std::deque;
 using std::make_pair;
 using std::max;
@@ -48,6 +44,7 @@ using std::min;
 using std::list;
 using std::map;
 using std::pair;
+using std::shared_ptr;
 using std::vector;
 
 using namespace pv::data::decode;
@@ -83,18 +80,19 @@ DecoderStack::DecoderStack(pv::SigSession &session,
 DecoderStack::~DecoderStack()
 {
 	if (_decode_thread.joinable()) {
-		_decode_thread.interrupt();
+		_interrupt = true;
+		_input_cond.notify_one();
 		_decode_thread.join();
 	}
 }
 
-const std::list< boost::shared_ptr<decode::Decoder> >&
+const std::list< std::shared_ptr<decode::Decoder> >&
 DecoderStack::stack() const
 {
 	return _stack;
 }
 
-void DecoderStack::push(boost::shared_ptr<decode::Decoder> decoder)
+void DecoderStack::push(std::shared_ptr<decode::Decoder> decoder)
 {
 	assert(decoder);
 	_stack.push_back(decoder);
@@ -126,7 +124,7 @@ std::vector<Row> DecoderStack::get_visible_rows() const
 
 	vector<Row> rows;
 
-	BOOST_FOREACH (const shared_ptr<decode::Decoder> &dec, _stack)
+	for (const shared_ptr<decode::Decoder> &dec : _stack)
 	{
 		assert(dec);
 		if (!dec->shown())
@@ -187,14 +185,15 @@ void DecoderStack::begin_decode()
 	shared_ptr<pv::data::Logic> data;
 
 	if (_decode_thread.joinable()) {
-		_decode_thread.interrupt();
+		_interrupt = true;
+		_input_cond.notify_one();
 		_decode_thread.join();
 	}
 
 	clear();
 
 	// Check that all decoders have the required channels
-	BOOST_FOREACH(const shared_ptr<decode::Decoder> &dec, _stack)
+	for (const shared_ptr<decode::Decoder> &dec : _stack)
 		if (!dec->have_required_probes()) {
 			_error_message = tr("One or more required channels "
 				"have not been specified");
@@ -202,7 +201,7 @@ void DecoderStack::begin_decode()
 		}
 
 	// Add classes
-	BOOST_FOREACH (const shared_ptr<decode::Decoder> &dec, _stack)
+	for (const shared_ptr<decode::Decoder> &dec : _stack)
 	{
 		assert(dec);
 		const srd_decoder *const decc = dec->decoder();
@@ -235,7 +234,7 @@ void DecoderStack::begin_decode()
 	// We get the logic data of the first channel in the list.
 	// This works because we are currently assuming all
 	// LogicSignals have the same data/snapshot
-	BOOST_FOREACH (const shared_ptr<decode::Decoder> &dec, _stack)
+	for (const shared_ptr<decode::Decoder> &dec : _stack)
 		if (dec && !dec->channels().empty() &&
 			((logic_signal = (*dec->channels().begin()).second)) &&
 			((data = logic_signal->logic_data())))
@@ -257,7 +256,8 @@ void DecoderStack::begin_decode()
 	if (_samplerate == 0.0)
 		_samplerate = 1.0;
 
-	_decode_thread = boost::thread(&DecoderStack::decode_proc, this);
+	_interrupt = false;
+	_decode_thread = std::thread(&DecoderStack::decode_proc, this);
 }
 
 uint64_t DecoderStack::get_max_sample_count() const
@@ -274,11 +274,10 @@ uint64_t DecoderStack::get_max_sample_count() const
 optional<int64_t> DecoderStack::wait_for_data() const
 {
 	unique_lock<mutex> input_lock(_input_mutex);
-	while(!boost::this_thread::interruption_requested() &&
-		!_frame_complete && _samples_decoded >= _sample_count)
+	while(!_interrupt && !_frame_complete &&
+		_samples_decoded >= _sample_count)
 		_input_cond.wait(input_lock);
-	return boost::make_optional(
-		!boost::this_thread::interruption_requested() &&
+	return boost::make_optional(!_interrupt &&
 		(_samples_decoded < _sample_count || !_frame_complete),
 		_sample_count);
 }
@@ -292,9 +291,7 @@ void DecoderStack::decode_data(
 	const unsigned int chunk_sample_count =
 		DecodeChunkLength / _snapshot->unit_size();
 
-	for (int64_t i = 0;
-		!boost::this_thread::interruption_requested() &&
-			i < sample_count;
+	for (int64_t i = 0; !_interrupt && i < sample_count;
 		i += chunk_sample_count)
 	{
 		lock_guard<mutex> decode_lock(_global_decode_mutex);
@@ -336,7 +333,7 @@ void DecoderStack::decode_proc()
 	// Create the decoders
 	const unsigned int unit_size = _snapshot->unit_size();
 
-	BOOST_FOREACH(const shared_ptr<decode::Decoder> &dec, _stack)
+	for (const shared_ptr<decode::Decoder> &dec : _stack)
 	{
 		srd_decoder_inst *const di = dec->create_decoder_inst(session, unit_size);