DecoderStack: Fix memory leak

[pulseview.git] / pv / data / decoderstack.cpp

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index 2b07936840f49df3d76160f2b6250ed051278003..3499baf22205cb1d0338f8d77d8645ab7d437cbd 100644 (file)
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -34,7 +34,6 @@
 
 using std::lock_guard;
 using std::mutex;
-using boost::optional;
 using std::unique_lock;
 using std::deque;
 using std::make_pair;
@@ -44,8 +43,11 @@ using std::list;
 using std::map;
 using std::pair;
 using std::shared_ptr;
+using std::make_shared;
 using std::vector;
 
+using boost::optional;
+
 using namespace pv::data::decode;
 
 namespace pv {
@@ -53,7 +55,7 @@ namespace data {
 
 const double DecoderStack::DecodeMargin = 1.0;
 const double DecoderStack::DecodeThreshold = 0.2;
-const int64_t DecoderStack::DecodeChunkLength = 4096;
+const int64_t DecoderStack::DecodeChunkLength = 10 * 1024 * 1024;
 const unsigned int DecoderStack::DecodeNotifyPeriod = 1024;
 
 mutex DecoderStack::global_srd_mutex_;
@@ -74,8 +76,7 @@ DecoderStack::DecoderStack(pv::Session &session,
        connect(&session_, SIGNAL(frame_ended()),
                this, SLOT(on_frame_ended()));
 
-       stack_.push_back(shared_ptr<decode::Decoder>(
-               new decode::Decoder(dec)));
+       stack_.push_back(make_shared<decode::Decoder>(dec));
 }
 
 DecoderStack::~DecoderStack()
@@ -87,13 +88,12 @@ DecoderStack::~DecoderStack()
        }
 }
 
-const std::list< std::shared_ptr<decode::Decoder> >&
-DecoderStack::stack() const
+const list< shared_ptr<decode::Decoder> >& DecoderStack::stack() const
 {
        return stack_;
 }
 
-void DecoderStack::push(std::shared_ptr<decode::Decoder> decoder)
+void DecoderStack::push(shared_ptr<decode::Decoder> decoder)
 {
        assert(decoder);
        stack_.push_back(decoder);
@@ -129,7 +129,7 @@ int64_t DecoderStack::samples_decoded() const
        return samples_decoded_;
 }
 
-std::vector<Row> DecoderStack::get_visible_rows() const
+vector<Row> DecoderStack::get_visible_rows() const
 {
        lock_guard<mutex> lock(output_mutex_);
 
@@ -145,14 +145,14 @@ std::vector<Row> DecoderStack::get_visible_rows() const
 
                // Add a row for the decoder if it doesn't have a row list
                if (!decc->annotation_rows)
-                       rows.push_back(Row(decc));
+                       rows.emplace_back(decc);
 
                // Add the decoder rows
                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);
-                       rows.push_back(Row(decc, ann_row));
+                       rows.emplace_back(decc, ann_row);
                }
        }
 
@@ -160,7 +160,7 @@ std::vector<Row> DecoderStack::get_visible_rows() const
 }
 
 void DecoderStack::get_annotation_subset(
-       std::vector<pv::data::decode::Annotation> &dest,
+       vector<pv::data::decode::Annotation> &dest,
        const Row &row, uint64_t start_sample,
        uint64_t end_sample) const
 {
@@ -301,26 +301,26 @@ optional<int64_t> DecoderStack::wait_for_data() const
 }
 
 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;
+       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) {
                        error_message_ = tr("Decoder reported an error");
+                       delete[] chunk;
                        break;
                }
+               delete[] chunk;
 
                {
                        lock_guard<mutex> lock(output_mutex_);
@@ -382,8 +382,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