Session: Fix issue #67 by improving error handling

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

diff --git a/pv/data/logicsegment.cpp b/pv/data/logicsegment.cpp
index 4170f6422d521b0a519432a04b680423844eaf73..739b2b9ee2a97652de2d4d4e3530041c1613af2c 100644 (file)
--- a/pv/data/logicsegment.cpp
+++ b/pv/data/logicsegment.cpp
@@ -63,10 +63,24 @@ LogicSegment::LogicSegment(pv::data::Logic& owner, uint32_t segment_id,
 LogicSegment::~LogicSegment()
 {
        lock_guard<recursive_mutex> lock(mutex_);
+
        for (MipMapLevel &l : mip_map_)
                free(l.data);
 }
 
+shared_ptr<const LogicSegment> LogicSegment::get_shared_ptr() const
+{
+       shared_ptr<const Segment> ptr = nullptr;
+
+       try {
+               ptr = shared_from_this();
+       } catch (std::exception& e) {
+               /* Do nothing, ptr remains a null pointer */
+       }
+
+       return ptr ? std::dynamic_pointer_cast<const LogicSegment>(ptr) : nullptr;
+}
+
 template <class T>
 void LogicSegment::downsampleTmain(const T*&in, T &acc, T &prev)
 {
@@ -328,6 +342,7 @@ void LogicSegment::append_payload(shared_ptr<sigrok::Logic> logic)
 
 void LogicSegment::append_payload(void *data, uint64_t data_size)
 {
+       assert(unit_size_ > 0);
        assert((data_size % unit_size_) == 0);
 
        lock_guard<recursive_mutex> lock(mutex_);
@@ -341,15 +356,40 @@ void LogicSegment::append_payload(void *data, uint64_t data_size)
        append_payload_to_mipmap();
 
        if (sample_count > 1)
-               owner_.notify_samples_added(this, prev_sample_count + 1,
-                       prev_sample_count + 1 + sample_count);
+               owner_.notify_samples_added(SharedPtrToSegment(shared_from_this()),
+                       prev_sample_count + 1, prev_sample_count + 1 + sample_count);
        else
-               owner_.notify_samples_added(this, prev_sample_count + 1,
-                       prev_sample_count + 1);
+               owner_.notify_samples_added(SharedPtrToSegment(shared_from_this()),
+                       prev_sample_count + 1, prev_sample_count + 1);
+}
+
+void LogicSegment::append_subsignal_payload(unsigned int index, void *data,
+       uint64_t data_size, vector<uint8_t>& destination)
+{
+       if (index == 0)
+               destination.resize(data_size * unit_size_, 0);
+
+       // Set the bits for this sub-signal where needed
+       // Note: the bytes in *data must either be 0 or 1, nothing else
+       unsigned int index_byte_offs = index / 8;
+       uint8_t* output_data = destination.data() + index_byte_offs;
+       uint8_t* input_data = (uint8_t*)data;
+
+       for (uint64_t i = 0; i < data_size; i++) {
+               assert((i * unit_size_ + index_byte_offs) < destination.size());
+               *output_data |= (input_data[i] << index);
+               output_data += unit_size_;
+       }
+
+       if (index == owner_.num_channels() - 1) {
+               // We gathered sample data of all sub-signals, let's append it
+               append_payload(destination.data(), destination.size());
+               destination.clear();
+       }
 }
 
 void LogicSegment::get_samples(int64_t start_sample,
-       int64_t end_sample,     uint8_t* dest) const
+       int64_t end_sample, uint8_t* dest) const
 {
        assert(start_sample >= 0);
        assert(start_sample <= (int64_t)sample_count_);
@@ -628,7 +668,7 @@ void LogicSegment::append_payload_to_mipmap()
                else if (unit_size_ == 4)
                        downsampleT<uint32_t>(src_ptr, dest_ptr, count);
                else if (unit_size_ == 8)
-                       downsampleT<uint8_t>(src_ptr, dest_ptr, count);
+                       downsampleT<uint64_t>(src_ptr, dest_ptr, count);
                else
                        downsampleGeneric(src_ptr, dest_ptr, count);
                len_sample -= count;