X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.cpp;h=c216d8d2627344264d940e4ab7a8d1a3db26c6d5;hp=0bb875da74b68e8a30086e90124d69eea93400b5;hb=4e6301f9744f2c97b6ee7982ba56903f63cc455e;hpb=60d9b99a32e551cffd2b537d3e157d578a761c9b
diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index 0bb875da..c216d8d2 100644
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#include
@@ -54,10 +53,10 @@ 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 int64_t DecoderStack::DecodeChunkLength = 10 * 1024 * 1024;
+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) :
@@ -136,8 +135,7 @@ std::vector DecoderStack::get_visible_rows() const
vector rows;
- for (const shared_ptr &dec : stack_)
- {
+ for (const shared_ptr &dec : stack_) {
assert(dec);
if (!dec->shown())
continue;
@@ -150,8 +148,7 @@ std::vector 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 +190,6 @@ void DecoderStack::clear()
void DecoderStack::begin_decode()
{
- shared_ptr logic_signal;
- shared_ptr data;
-
if (decode_thread_.joinable()) {
interrupt_ = true;
input_cond_.notify_one();
@@ -213,8 +207,7 @@ void DecoderStack::begin_decode()
}
// Add classes
- for (const shared_ptr &dec : stack_)
- {
+ for (const shared_ptr &dec : stack_) {
assert(dec);
const srd_decoder *const decc = dec->decoder();
assert(dec->decoder());
@@ -224,8 +217,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 +237,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 = nullptr;
+
for (const shared_ptr &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)
@@ -276,9 +271,9 @@ 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,31 +281,38 @@ uint64_t DecoderStack::max_sample_count() const
optional DecoderStack::wait_for_data() const
{
unique_lock input_lock(input_mutex_);
+
+ // 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_)
+ (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_);
}
void DecoderStack::decode_data(
- const int64_t sample_count, const unsigned int unit_size,
+ const int64_t abs_start_samplenum, const int64_t sample_count, const unsigned int unit_size,
srd_session *const session)
{
- uint8_t chunk[DecodeChunkLength];
-
const unsigned int chunk_sample_count =
DecodeChunkLength / segment_->unit_size();
- for (int64_t i = 0; !interrupt_ && i < sample_count;
- i += chunk_sample_count)
- {
- lock_guard decode_lock(global_decode_mutex_);
+ for (int64_t i = abs_start_samplenum; !interrupt_ && i < sample_count;
+ i += chunk_sample_count) {
const int64_t chunk_end = min(
i + chunk_sample_count, sample_count);
- segment_->get_samples(chunk, i, chunk_end);
+ const uint8_t* chunk = segment_->get_samples(i, chunk_end);
if (srd_session_send(session, i, chunk_end, chunk,
(chunk_end - i) * unit_size, unit_size) != SRD_OK) {
@@ -338,6 +340,9 @@ void DecoderStack::decode_proc()
assert(segment_);
+ // Prevent any other decode threads from accessing libsigrokdecode
+ lock_guard srd_lock(global_srd_mutex_);
+
// Create the session
srd_session_new(&session);
assert(session);
@@ -345,12 +350,10 @@ void DecoderStack::decode_proc()
// Create the decoders
const unsigned int unit_size = segment_->unit_size();
- for (const shared_ptr &dec : stack_)
- {
+ for (const shared_ptr &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;
@@ -377,8 +380,10 @@ void DecoderStack::decode_proc()
srd_session_start(session);
+ int64_t abs_start_samplenum = 0;
do {
- decode_data(*sample_count, unit_size, session);
+ decode_data(abs_start_samplenum, *sample_count, unit_size, session);
+ abs_start_samplenum = *sample_count;
} while (error_message_.isEmpty() && (sample_count = wait_for_data()));
// Destroy the session
@@ -409,8 +414,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));
}