X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Flogicsegment.cpp;h=62f188e383d4dff662874dce86d975f0ecbdf3a9;hp=a62d9e2f4dae7bca74e79d5f6ca04a3a6a7f87b0;hb=4cc0df94c1027add1e62dfdf81e48eda959783c9;hpb=26a883ede0bcf68d087eda5dd2082890d36c7aef diff --git a/pv/data/logicsegment.cpp b/pv/data/logicsegment.cpp index a62d9e2f..62f188e3 100644 --- a/pv/data/logicsegment.cpp +++ b/pv/data/logicsegment.cpp @@ -19,11 +19,12 @@ #include -#include -#include -#include +#include #include +#include +#include +#include "logic.hpp" #include "logicsegment.hpp" #include @@ -32,8 +33,8 @@ using std::lock_guard; using std::recursive_mutex; using std::max; using std::min; -using std::pair; using std::shared_ptr; +using std::vector; using sigrok::Logic; @@ -43,15 +44,15 @@ namespace data { const int LogicSegment::MipMapScalePower = 4; const int LogicSegment::MipMapScaleFactor = 1 << MipMapScalePower; const float LogicSegment::LogMipMapScaleFactor = logf(MipMapScaleFactor); -const uint64_t LogicSegment::MipMapDataUnit = 64*1024; // bytes +const uint64_t LogicSegment::MipMapDataUnit = 64 * 1024; // bytes -LogicSegment::LogicSegment(shared_ptr logic, uint64_t samplerate) : - Segment(samplerate, logic->unit_size()), +LogicSegment::LogicSegment(pv::data::Logic& owner, unsigned int unit_size, + uint64_t samplerate) : + Segment(samplerate, unit_size), + owner_(owner), last_append_sample_(0) { - lock_guard lock(mutex_); memset(mip_map_, 0, sizeof(mip_map_)); - append_payload(logic); } LogicSegment::~LogicSegment() @@ -135,45 +136,62 @@ void LogicSegment::pack_sample(uint8_t *ptr, uint64_t value) #endif } -void LogicSegment::append_payload(shared_ptr logic) +void LogicSegment::append_payload(shared_ptr logic) { assert(unit_size_ == logic->unit_size()); assert((logic->data_length() % unit_size_) == 0); + append_payload(logic->data_pointer(), logic->data_length()); +} + +void LogicSegment::append_payload(void *data, uint64_t data_size) +{ + assert((data_size % unit_size_) == 0); + lock_guard lock(mutex_); - append_samples(logic->data_pointer(), - logic->data_length() / unit_size_); + uint64_t prev_sample_count = sample_count_; + uint64_t sample_count = data_size / unit_size_; + + append_samples(data, sample_count); // Generate the first mip-map from the data append_payload_to_mipmap(); + + if (sample_count > 1) + owner_.notify_samples_added(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); } -const uint8_t* LogicSegment::get_samples(int64_t start_sample, - int64_t end_sample) const +void LogicSegment::get_samples(int64_t start_sample, + int64_t end_sample, uint8_t* dest) const { assert(start_sample >= 0); assert(start_sample <= (int64_t)sample_count_); assert(end_sample >= 0); assert(end_sample <= (int64_t)sample_count_); assert(start_sample <= end_sample); + assert(dest != nullptr); lock_guard lock(mutex_); - return get_raw_samples(start_sample, (end_sample-start_sample)); + get_raw_samples(start_sample, (end_sample - start_sample), dest); } -SegmentLogicDataIterator* LogicSegment::begin_sample_iteration(uint64_t start) const +SegmentLogicDataIterator* LogicSegment::begin_sample_iteration(uint64_t start) { return (SegmentLogicDataIterator*)begin_raw_sample_iteration(start); } -void LogicSegment::continue_sample_iteration(SegmentLogicDataIterator* it, uint64_t increase) const +void LogicSegment::continue_sample_iteration(SegmentLogicDataIterator* it, uint64_t increase) { Segment::continue_raw_sample_iteration((SegmentRawDataIterator*)it, increase); } -void LogicSegment::end_sample_iteration(SegmentLogicDataIterator* it) const +void LogicSegment::end_sample_iteration(SegmentLogicDataIterator* it) { Segment::end_raw_sample_iteration((SegmentRawDataIterator*)it); } @@ -240,7 +258,7 @@ void LogicSegment::append_payload_to_mipmap() // Compute higher level mipmaps for (unsigned int level = 1; level < ScaleStepCount; level++) { MipMapLevel &m = mip_map_[level]; - const MipMapLevel &ml = mip_map_[level-1]; + const MipMapLevel &ml = mip_map_[level - 1]; // Expand the data buffer to fit the new samples prev_length = m.length; @@ -278,7 +296,8 @@ uint64_t LogicSegment::get_unpacked_sample(uint64_t index) const { assert(index < sample_count_); - const uint8_t* data = get_raw_samples(index, 1); + uint8_t* data = new uint8_t[unit_size_]; + get_raw_samples(index, 1, data); uint64_t sample = unpack_sample(data); delete[] data; @@ -286,7 +305,7 @@ uint64_t LogicSegment::get_unpacked_sample(uint64_t index) const } void LogicSegment::get_subsampled_edges( - std::vector &edges, + vector &edges, uint64_t start, uint64_t end, float min_length, int sig_index) { @@ -295,7 +314,6 @@ void LogicSegment::get_subsampled_edges( bool last_sample; bool fast_forward; - assert(end <= get_sample_count()); assert(start <= end); assert(min_length > 0); assert(sig_index >= 0); @@ -303,6 +321,10 @@ void LogicSegment::get_subsampled_edges( lock_guard lock(mutex_); + // Make sure we only process as many samples as we have + if (end > get_sample_count()) + end = get_sample_count(); + const uint64_t block_length = (uint64_t)max(min_length, 1.0f); const unsigned int min_level = max((int)floorf(logf(min_length) / LogMipMapScaleFactor) - 1, 0); @@ -310,7 +332,7 @@ void LogicSegment::get_subsampled_edges( // Store the initial state last_sample = (get_unpacked_sample(start) & sig_mask) != 0; - edges.push_back(pair(index++, last_sample)); + edges.emplace_back(index++, last_sample); while (index + block_length <= end) { //----- Continue to search -----// @@ -364,7 +386,7 @@ void LogicSegment::get_subsampled_edges( // Slide right and zoom out at the beginnings of mip-map // blocks until we encounter a change - while (1) { + while (true) { const int level_scale_power = (level + 1) * MipMapScalePower; const uint64_t offset = @@ -396,7 +418,7 @@ void LogicSegment::get_subsampled_edges( // Zoom in, and slide right until we encounter a change, // and repeat until we reach min_level - while (1) { + while (true) { assert(mip_map_[level].data); const int level_scale_power = @@ -446,7 +468,7 @@ void LogicSegment::get_subsampled_edges( // Store the final state const bool final_sample = (get_unpacked_sample(final_index - 1) & sig_mask) != 0; - edges.push_back(pair(index, final_sample)); + edges.emplace_back(index, final_sample); index = final_index; last_sample = final_sample; @@ -455,8 +477,8 @@ void LogicSegment::get_subsampled_edges( // Add the final state const bool end_sample = get_unpacked_sample(end) & sig_mask; if (last_sample != end_sample) - edges.push_back(pair(end, end_sample)); - edges.push_back(pair(end + 1, end_sample)); + edges.emplace_back(end, end_sample); + edges.emplace_back(end + 1, end_sample); } uint64_t LogicSegment::get_subsample(int level, uint64_t offset) const