projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SignalBase: Don't terminate conversion when there's no data
[pulseview.git]
/
pv
/
data
/
signalbase.cpp
diff --git
a/pv/data/signalbase.cpp
b/pv/data/signalbase.cpp
index 26e01d05828858e1e1e1e00df28ee3162f5c3018..018e4a2733fca8f813efeff6f9b9c0fd1dd6a9f6 100644
(file)
--- a/
pv/data/signalbase.cpp
+++ b/
pv/data/signalbase.cpp
@@
-542,13
+542,19
@@
void SignalBase::conversion_thread_proc()
if (conversion_is_a2l()) {
analog_data = dynamic_pointer_cast<Analog>(data_);
if (conversion_is_a2l()) {
analog_data = dynamic_pointer_cast<Analog>(data_);
- if (analog_data->analog_segments().size() == 0)
- return;
+ if (analog_data->analog_segments().size() == 0) {
+ unique_lock<mutex> input_lock(conversion_input_mutex_);
+ conversion_input_cond_.wait(input_lock);
+ }
} else
// Currently, we only handle A2L conversions
return;
} else
// Currently, we only handle A2L conversions
return;
+ // If we had to wait for input data, we may have been notified to terminate
+ if (conversion_interrupt_)
+ return;
+
uint32_t segment_id = 0;
AnalogSegment *asegment = analog_data->analog_segments().front().get();
uint32_t segment_id = 0;
AnalogSegment *asegment = analog_data->analog_segments().front().get();