X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Flogicsegment.cpp;h=58cf00e5dddbfcc6e1514cb0534084546fbe3dec;hp=fcf572297e689f87762eabc81df96207df3000dc;hb=53aa9bb42c921cfc3a658855598f984cdaac17d0;hpb=9d22929c3588b994771e8db8f3be5b013fd35040 diff --git a/pv/data/logicsegment.cpp b/pv/data/logicsegment.cpp index fcf57229..58cf00e5 100644 --- a/pv/data/logicsegment.cpp +++ b/pv/data/logicsegment.cpp @@ -20,9 +20,9 @@ #include #include -#include -#include #include +#include +#include #include "logic.hpp" #include "logicsegment.hpp" @@ -33,7 +33,6 @@ using std::lock_guard; using std::recursive_mutex; using std::max; using std::min; -using std::pair; using std::shared_ptr; using std::vector; @@ -45,22 +44,11 @@ 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 - -LogicSegment::LogicSegment(pv::data::Logic& owner, shared_ptr data, - uint64_t samplerate) : - Segment(samplerate, data->unit_size()), - owner_(owner), - last_append_sample_(0) -{ - lock_guard lock(mutex_); - memset(mip_map_, 0, sizeof(mip_map_)); - append_payload(data); -} +const uint64_t LogicSegment::MipMapDataUnit = 64 * 1024; // bytes -LogicSegment::LogicSegment(pv::data::Logic& owner, unsigned int unit_size, - uint64_t samplerate) : - Segment(samplerate, unit_size), +LogicSegment::LogicSegment(pv::data::Logic& owner, uint32_t segment_id, + unsigned int unit_size, uint64_t samplerate) : + Segment(segment_id, samplerate, unit_size), owner_(owner), last_append_sample_(0) { @@ -178,18 +166,19 @@ void LogicSegment::append_payload(void *data, uint64_t data_size) 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) @@ -269,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; @@ -307,9 +296,11 @@ uint64_t LogicSegment::get_unpacked_sample(uint64_t index) const { assert(index < sample_count_); - const uint8_t* data = get_raw_samples(index, 1); + assert(unit_size_ <= 8); // 8 * 8 = 64 channels + uint8_t data[8]; + + get_raw_samples(index, 1, data); uint64_t sample = unpack_sample(data); - delete[] data; return sample; } @@ -324,7 +315,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); @@ -332,6 +322,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); @@ -346,20 +340,19 @@ void LogicSegment::get_subsampled_edges( level = min_level; // We cannot fast-forward if there is no mip-map data at - // at the minimum level. + // the minimum level. fast_forward = (mip_map_[level].data != nullptr); if (min_length < MipMapScaleFactor) { // Search individual samples up to the beginning of // the next first level mip map block - const uint64_t final_index = min(end, - pow2_ceil(index, MipMapScalePower)); + const uint64_t final_index = min(end, pow2_ceil(index, MipMapScalePower)); for (; index < final_index && (index & ~((uint64_t)(~0) << MipMapScalePower)) != 0; index++) { - const bool sample = - (get_unpacked_sample(index) & sig_mask) != 0; + + const bool sample = (get_unpacked_sample(index) & sig_mask) != 0; // If there was a change we cannot fast forward if (sample != last_sample) { @@ -371,15 +364,13 @@ void LogicSegment::get_subsampled_edges( // If resolution is less than a mip map block, // round up to the beginning of the mip-map block // for this level of detail - const int min_level_scale_power = - (level + 1) * MipMapScalePower; + const int min_level_scale_power = (level + 1) * MipMapScalePower; index = pow2_ceil(index, min_level_scale_power); if (index >= end) break; // We can fast forward only if there was no change - const bool sample = - (get_unpacked_sample(index) & sig_mask) != 0; + const bool sample = (get_unpacked_sample(index) & sig_mask) != 0; if (last_sample != sample) fast_forward = false; } @@ -394,32 +385,27 @@ void LogicSegment::get_subsampled_edges( // Slide right and zoom out at the beginnings of mip-map // blocks until we encounter a change while (true) { - const int level_scale_power = - (level + 1) * MipMapScalePower; - const uint64_t offset = - index >> level_scale_power; + const int level_scale_power = (level + 1) * MipMapScalePower; + const uint64_t offset = index >> level_scale_power; // Check if we reached the last block at this // level, or if there was a change in this block if (offset >= mip_map_[level].length || - (get_subsample(level, offset) & - sig_mask)) + (get_subsample(level, offset) & sig_mask)) break; if ((offset & ~((uint64_t)(~0) << MipMapScalePower)) == 0) { // If we are now at the beginning of a // higher level mip-map block ascend one // level - if (level + 1 >= ScaleStepCount || - !mip_map_[level + 1].data) + if ((level + 1 >= ScaleStepCount) || (!mip_map_[level + 1].data)) break; level++; } else { // Slide right to the beginning of the // next mip map block - index = pow2_ceil(index + 1, - level_scale_power); + index = pow2_ceil(index + 1, level_scale_power); } } @@ -428,16 +414,13 @@ void LogicSegment::get_subsampled_edges( while (true) { assert(mip_map_[level].data); - const int level_scale_power = - (level + 1) * MipMapScalePower; - const uint64_t offset = - index >> level_scale_power; + const int level_scale_power = (level + 1) * MipMapScalePower; + const uint64_t offset = index >> level_scale_power; // Check if we reached the last block at this // level, or if there was a change in this block if (offset >= mip_map_[level].length || - (get_subsample(level, offset) & - sig_mask)) { + (get_subsample(level, offset) & sig_mask)) { // Zoom in unless we reached the minimum // zoom if (level == min_level) @@ -447,8 +430,7 @@ void LogicSegment::get_subsampled_edges( } else { // Slide right to the beginning of the // next mip map block - index = pow2_ceil(index + 1, - level_scale_power); + index = pow2_ceil(index + 1, level_scale_power); } } @@ -457,8 +439,7 @@ void LogicSegment::get_subsampled_edges( // block if (min_length < MipMapScaleFactor) { for (; index < end; index++) { - const bool sample = (get_unpacked_sample(index) & - sig_mask) != 0; + const bool sample = (get_unpacked_sample(index) & sig_mask) != 0; if (sample != last_sample) break; } @@ -473,8 +454,7 @@ void LogicSegment::get_subsampled_edges( break; // Store the final state - const bool final_sample = - (get_unpacked_sample(final_index - 1) & sig_mask) != 0; + const bool final_sample = (get_unpacked_sample(final_index - 1) & sig_mask) != 0; edges.emplace_back(index, final_sample); index = final_index;