Session: Handle frame markers properly

[pulseview.git] / pv / session.cpp

diff --git a/pv/session.cpp b/pv/session.cpp
index 97741ebf7b944a4c6507bd1a4e64c1d8128a5d5b..df09ff3b2ebc0b924a9158158de9a2362ab385db 100644 (file)
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -857,6 +857,9 @@ void Session::sample_thread_proc(function<void (const QString)> error_handler)
                assert(0);
        }
 
+       // Optimize memory usage
+       free_unused_memory();
+
        // We now have unsaved data unless we just "captured" from a file
        shared_ptr<devices::File> file_device =
                dynamic_pointer_cast<devices::File>(device_);
@@ -868,6 +871,17 @@ void Session::sample_thread_proc(function<void (const QString)> error_handler)
                error_handler(tr("Out of memory, acquisition stopped."));
 }
 
+void Session::free_unused_memory()
+{
+       for (shared_ptr<data::SignalData> data : all_signal_data_) {
+               const vector< shared_ptr<data::Segment> > segments = data->segments();
+
+               for (shared_ptr<data::Segment> segment : segments) {
+                       segment->free_unused_memory();
+               }
+       }
+}
+
 void Session::feed_in_header()
 {
        cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);
@@ -1017,6 +1031,8 @@ void Session::feed_in_analog(shared_ptr<Analog> analog)
 void Session::data_feed_in(shared_ptr<sigrok::Device> device,
        shared_ptr<Packet> packet)
 {
+       static bool frame_began=false;
+
        (void)device;
 
        assert(device);
@@ -1038,6 +1054,7 @@ void Session::data_feed_in(shared_ptr<sigrok::Device> device,
 
        case SR_DF_FRAME_BEGIN:
                feed_in_frame_begin();
+               frame_began = true;
                break;
 
        case SR_DF_LOGIC:
@@ -1058,6 +1075,7 @@ void Session::data_feed_in(shared_ptr<sigrok::Device> device,
                }
                break;
 
+       case SR_DF_FRAME_END:
        case SR_DF_END:
        {
                {
@@ -1065,7 +1083,10 @@ void Session::data_feed_in(shared_ptr<sigrok::Device> device,
                        cur_logic_segment_.reset();
                        cur_analog_segments_.clear();
                }
-               frame_ended();
+               if (frame_began) {
+                       frame_began = false;
+                       frame_ended();
+               }
                break;
        }
        default: