fix catching polymorphic types by value

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

diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp
index 5aec9ba884677e924cb8e0d1d533a62c4ef467b2..2972d4043cf7a7bb3e6b48b49e9b190589b92884 100644 (file)
--- a/pv/data/signalbase.cpp
+++ b/pv/data/signalbase.cpp
@@ -219,7 +219,7 @@ bool SignalBase::segment_is_complete(uint32_t segment_id) const
                auto segments = data->analog_segments();
                try {
                        result = segments.at(segment_id)->is_complete();
-               } catch (out_of_range) {
+               } catch (out_of_range&) {
                        // Do nothing
                }
        }
@@ -230,7 +230,7 @@ bool SignalBase::segment_is_complete(uint32_t segment_id) const
                auto segments = data->logic_segments();
                try {
                        result = segments.at(segment_id)->is_complete();
-               } catch (out_of_range) {
+               } catch (out_of_range&) {
                        // Do nothing
                }
        }
@@ -439,14 +439,9 @@ bool SignalBase::conversion_is_a2l() const
                (conversion_type_ == A2LConversionBySchmittTrigger)));
 }
 
-void SignalBase::convert_single_segment(AnalogSegment *asegment, LogicSegment *lsegment)
+void SignalBase::convert_single_segment_range(AnalogSegment *asegment,
+       LogicSegment *lsegment, uint64_t start_sample, uint64_t end_sample)
 {
-       uint64_t start_sample, end_sample;
-       start_sample = end_sample = 0;
-
-       start_sample = lsegment->get_sample_count();
-       end_sample = asegment->get_sample_count();
-
        if (end_sample > start_sample) {
                tie(min_value_, max_value_) = asegment->get_min_max();
 
@@ -482,8 +477,7 @@ void SignalBase::convert_single_segment(AnalogSegment *asegment, LogicSegment *l
                                        analog->get_logic_via_threshold(threshold, lsamples);
 
                                lsegment->append_payload(logic->data_pointer(), logic->data_length());
-
-                               samples_added(lsegment, i, i + ConversionBlockSize);
+                               samples_added(lsegment->segment_id(), i, i + ConversionBlockSize);
                                i += ConversionBlockSize;
                        }
 
@@ -497,7 +491,7 @@ void SignalBase::convert_single_segment(AnalogSegment *asegment, LogicSegment *l
                        shared_ptr<sigrok::Logic> logic =
                                analog->get_logic_via_threshold(threshold, lsamples);
                        lsegment->append_payload(logic->data_pointer(), logic->data_length());
-                       samples_added(lsegment, i, end_sample);
+                       samples_added(lsegment->segment_id(), i, end_sample);
                }
 
                if (conversion_type_ == A2LConversionBySchmittTrigger) {
@@ -516,8 +510,7 @@ void SignalBase::convert_single_segment(AnalogSegment *asegment, LogicSegment *l
                                                &state, lsamples);
 
                                lsegment->append_payload(logic->data_pointer(), logic->data_length());
-
-                               samples_added(lsegment, i, i + ConversionBlockSize);
+                               samples_added(lsegment->segment_id(), i, i + ConversionBlockSize);
                                i += ConversionBlockSize;
                        }
 
@@ -532,7 +525,7 @@ void SignalBase::convert_single_segment(AnalogSegment *asegment, LogicSegment *l
                                analog->get_logic_via_schmitt_trigger(lo_thr, hi_thr,
                                        &state, lsamples);
                        lsegment->append_payload(logic->data_pointer(), logic->data_length());
-                       samples_added(lsegment, i, end_sample);
+                       samples_added(lsegment->segment_id(), i, end_sample);
                }
 
                // If acquisition is ongoing, start-/endsample may have changed
@@ -543,6 +536,38 @@ void SignalBase::convert_single_segment(AnalogSegment *asegment, LogicSegment *l
        }
 }
 
+void SignalBase::convert_single_segment(AnalogSegment *asegment, LogicSegment *lsegment)
+{
+       uint64_t start_sample, end_sample, old_end_sample;
+       start_sample = end_sample = 0;
+       bool complete_state, old_complete_state;
+
+       start_sample = lsegment->get_sample_count();
+       end_sample = asegment->get_sample_count();
+       complete_state = asegment->is_complete();
+
+       // Don't do anything if the segment is still being filled and the sample count is too small
+       if ((!complete_state) && (end_sample - start_sample < ConversionBlockSize))
+               return;
+
+       do {
+               convert_single_segment_range(asegment, lsegment, start_sample, end_sample);
+
+               old_end_sample = end_sample;
+               old_complete_state = complete_state;
+
+               start_sample = lsegment->get_sample_count();
+               end_sample = asegment->get_sample_count();
+               complete_state = asegment->is_complete();
+
+               // If the segment has been incomplete when we were called and has been
+               // completed in the meanwhile, we convert the remaining samples as well.
+               // Also, if a sufficient number of samples was added in the meanwhile,
+               // we do another round of sample conversion.
+       } while ((complete_state != old_complete_state) ||
+               (end_sample - old_end_sample >= ConversionBlockSize));
+}
+
 void SignalBase::conversion_thread_proc()
 {
        shared_ptr<Analog> analog_data;
@@ -584,13 +609,15 @@ void SignalBase::conversion_thread_proc()
        do {
                convert_single_segment(asegment, lsegment);
 
-               if (analog_data->analog_segments().size() > logic_data->logic_segments().size()) {
+               // Only advance to next segment if the current input segment is complete
+               if (asegment->is_complete() &&
+                       analog_data->analog_segments().size() > logic_data->logic_segments().size()) {
                        // There are more segments to process
                        segment_id++;
 
                        try {
                                asegment = analog_data->analog_segments().at(segment_id).get();
-                       } catch (out_of_range) {
+                       } catch (out_of_range&) {
                                qDebug() << "Conversion error for" << name() << ": no analog segment" \
                                        << segment_id << ", segments size is" << analog_data->analog_segments().size();
                                return;
@@ -602,7 +629,7 @@ void SignalBase::conversion_thread_proc()
 
                        lsegment = logic_data->logic_segments().back().get();
                } else {
-                       // No more segments to process, wait for data or interrupt
+                       // No more samples/segments to process, wait for data or interrupt
                        if (!conversion_interrupt_) {
                                unique_lock<mutex> input_lock(conversion_input_mutex_);
                                conversion_input_cond_.wait(input_lock);
@@ -660,7 +687,8 @@ void SignalBase::on_samples_added(QObject* segment, uint64_t start_sample,
                }
        }
 
-       samples_added(segment, start_sample, end_sample);
+       data::Segment* s = qobject_cast<data::Segment*>(segment);
+       samples_added(s->segment_id(), start_sample, end_sample);
 }
 
 void SignalBase::on_min_max_changed(float min, float max)