X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.cpp;h=d01bab2de111b155c9880ecf72a4fd3806316e62;hp=e9876d21bc268299eeab4c1fd9d835a237001fd7;hb=caa4a2db5e100713818a353c17d2dc00fa475a2a;hpb=f3d66e52ed6b454ea7a0662d5e6367e230116a2b

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index e9876d21..d01bab2d 100644
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -55,9 +55,9 @@ namespace data {
 const double DecoderStack::DecodeMargin = 1.0;
 const double DecoderStack::DecodeThreshold = 0.2;
 const int64_t DecoderStack::DecodeChunkLength = 4096;
-const unsigned int DecoderStack::DecodeNotifyPeriod = 65536;
+const unsigned int DecoderStack::DecodeNotifyPeriod = 1024;
 
-mutex DecoderStack::global_decode_mutex_;
+mutex DecoderStack::global_srd_mutex_;
 
 DecoderStack::DecoderStack(pv::Session &session,
 	const srd_decoder *const dec) :
@@ -107,7 +107,7 @@ void DecoderStack::remove(int index)
 
 	// Find the decoder in the stack
 	auto iter = stack_.begin();
-	for(int i = 0; i < index; i++, iter++)
+	for (int i = 0; i < index; i++, iter++)
 		assert(iter != stack_.end());
 
 	// Delete the element
@@ -119,7 +119,7 @@ double DecoderStack::samplerate() const
 	return samplerate_;
 }
 
-double DecoderStack::start_time() const
+const pv::util::Timestamp& DecoderStack::start_time() const
 {
 	return start_time_;
 }
@@ -136,8 +136,7 @@ std::vector<Row> DecoderStack::get_visible_rows() const
 
 	vector<Row> rows;
 
-	for (const shared_ptr<decode::Decoder> &dec : stack_)
-	{
+	for (const shared_ptr<decode::Decoder> &dec : stack_) {
 		assert(dec);
 		if (!dec->shown())
 			continue;
@@ -150,8 +149,7 @@ std::vector<Row> DecoderStack::get_visible_rows() const
 			rows.push_back(Row(decc));
 
 		// Add the decoder rows
-		for (const GSList *l = decc->annotation_rows; l; l = l->next)
-		{
+		for (const GSList *l = decc->annotation_rows; l; l = l->next) {
 			const srd_decoder_annotation_row *const ann_row =
 				(srd_decoder_annotation_row *)l->data;
 			assert(ann_row);
@@ -193,9 +191,6 @@ void DecoderStack::clear()
 
 void DecoderStack::begin_decode()
 {
-	shared_ptr<pv::view::LogicSignal> logic_signal;
-	shared_ptr<pv::data::Logic> data;
-
 	if (decode_thread_.joinable()) {
 		interrupt_ = true;
 		input_cond_.notify_one();
@@ -213,8 +208,7 @@ void DecoderStack::begin_decode()
 		}
 
 	// Add classes
-	for (const shared_ptr<decode::Decoder> &dec : stack_)
-	{
+	for (const shared_ptr<decode::Decoder> &dec : stack_) {
 		assert(dec);
 		const srd_decoder *const decc = dec->decoder();
 		assert(dec->decoder());
@@ -224,8 +218,7 @@ void DecoderStack::begin_decode()
 			rows_[Row(decc)] = decode::RowData();
 
 		// Add the decoder rows
-		for (const GSList *l = decc->annotation_rows; l; l = l->next)
-		{
+		for (const GSList *l = decc->annotation_rows; l; l = l->next) {
 			const srd_decoder_annotation_row *const ann_row =
 				(srd_decoder_annotation_row *)l->data;
 			assert(ann_row);
@@ -245,11 +238,14 @@ 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/segment
+	// logic signals have the same data/segment
+	pv::data::SignalBase *signalbase;
+	pv::data::Logic *data;
+
 	for (const shared_ptr<decode::Decoder> &dec : stack_)
 		if (dec && !dec->channels().empty() &&
-			((logic_signal = (*dec->channels().begin()).second)) &&
-			((data = logic_signal->logic_data())))
+			((signalbase = (*dec->channels().begin()).second.get())) &&
+			((data = signalbase->logic_data().get())))
 			break;
 
 	if (!data)
@@ -272,13 +268,13 @@ void DecoderStack::begin_decode()
 	decode_thread_ = std::thread(&DecoderStack::decode_proc, this);
 }
 
-uint64_t DecoderStack::get_max_sample_count() const
+uint64_t DecoderStack::max_sample_count() const
 {
 	uint64_t max_sample_count = 0;
 
-	for (auto i = rows_.cbegin(); i != rows_.end(); i++)
+	for (const auto& row : rows_)
 		max_sample_count = max(max_sample_count,
-			(*i).second.get_max_sample());
+			row.second.get_max_sample());
 
 	return max_sample_count;
 }
@@ -286,11 +282,22 @@ uint64_t DecoderStack::get_max_sample_count() const
 optional<int64_t> DecoderStack::wait_for_data() const
 {
 	unique_lock<mutex> input_lock(input_mutex_);
-	while(!interrupt_ && !frame_complete_ &&
-		samples_decoded_ >= sample_count_)
+
+	// Do wait if we decoded all samples but we're still capturing
+	// Do not wait if we're done capturing
+	while (!interrupt_ && !frame_complete_ &&
+		(samples_decoded_ >= sample_count_) &&
+		(session_.get_capture_state() != Session::Stopped)) {
+
 		input_cond_.wait(input_lock);
+	}
+
+	// Return value is valid if we're not aborting the decode,
 	return boost::make_optional(!interrupt_ &&
-		(samples_decoded_ < sample_count_ || !frame_complete_),
+		// and there's more work to do...
+		(samples_decoded_ < sample_count_ || !frame_complete_) &&
+		// and if the end of the data hasn't been reached yet
+		(!((samples_decoded_ >= sample_count_) && (session_.get_capture_state() == Session::Stopped))),
 		sample_count_);
 }
 
@@ -304,16 +311,14 @@ void DecoderStack::decode_data(
 		DecodeChunkLength / segment_->unit_size();
 
 	for (int64_t i = 0; !interrupt_ && i < sample_count;
-		i += chunk_sample_count)
-	{
-		lock_guard<mutex> decode_lock(global_decode_mutex_);
+			i += chunk_sample_count) {
 
 		const int64_t chunk_end = min(
 			i + chunk_sample_count, sample_count);
 		segment_->get_samples(chunk, i, chunk_end);
 
-		if (srd_session_send(session, i, i + sample_count, chunk,
-				(chunk_end - i) * unit_size) != SRD_OK) {
+		if (srd_session_send(session, i, chunk_end, chunk,
+				(chunk_end - i) * unit_size, unit_size) != SRD_OK) {
 			error_message_ = tr("Decoder reported an error");
 			break;
 		}
@@ -334,10 +339,13 @@ void DecoderStack::decode_proc()
 {
 	optional<int64_t> sample_count;
 	srd_session *session;
-	srd_decoder_inst *prev_di = NULL;
+	srd_decoder_inst *prev_di = nullptr;
 
 	assert(segment_);
 
+	// Prevent any other decode threads from accessing libsigrokdecode
+	lock_guard<mutex> srd_lock(global_srd_mutex_);
+
 	// Create the session
 	srd_session_new(&session);
 	assert(session);
@@ -345,12 +353,10 @@ void DecoderStack::decode_proc()
 	// Create the decoders
 	const unsigned int unit_size = segment_->unit_size();
 
-	for (const shared_ptr<decode::Decoder> &dec : stack_)
-	{
-		srd_decoder_inst *const di = dec->create_decoder_inst(session, unit_size);
+	for (const shared_ptr<decode::Decoder> &dec : stack_) {
+		srd_decoder_inst *const di = dec->create_decoder_inst(session);
 
-		if (!di)
-		{
+		if (!di) {
 			error_message_ = tr("Failed to create decoder instance");
 			srd_session_destroy(session);
 			return;
@@ -379,7 +385,7 @@ void DecoderStack::decode_proc()
 
 	do {
 		decode_data(*sample_count, unit_size, session);
-	} while(error_message_.isEmpty() && (sample_count = wait_for_data()));
+	} while (error_message_.isEmpty() && (sample_count = wait_for_data()));
 
 	// Destroy the session
 	srd_session_destroy(session);
@@ -409,8 +415,7 @@ void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
 	const auto r = d->class_rows_.find(make_pair(decc, a.format()));
 	if (r != d->class_rows_.end())
 		row_iter = d->rows_.find((*r).second);
-	else
-	{
+	else {
 		// Failing that, use the decoder as a key
 		row_iter = d->rows_.find(Row(decc));	
 	}