* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <extdef.h>
#include <stdlib.h>
#include <cmath>
+#include "logic.hpp"
#include "logicsegment.hpp"
#include <libsigrokcxx/libsigrokcxx.hpp>
const float LogicSegment::LogMipMapScaleFactor = logf(MipMapScaleFactor);
const uint64_t LogicSegment::MipMapDataUnit = 64*1024; // bytes
-LogicSegment::LogicSegment(shared_ptr<Logic> logic, uint64_t samplerate,
- const uint64_t expected_num_samples) :
- Segment(samplerate, logic->unit_size()),
+LogicSegment::LogicSegment(pv::data::Logic& owner, shared_ptr<sigrok::Logic> data,
+ uint64_t samplerate) :
+ Segment(samplerate, data->unit_size()),
+ owner_(owner),
last_append_sample_(0)
{
- set_capacity(expected_num_samples);
-
lock_guard<recursive_mutex> lock(mutex_);
memset(mip_map_, 0, sizeof(mip_map_));
- append_payload(logic);
+ append_payload(data);
}
LogicSegment::~LogicSegment()
return *(uint64_t*)ptr;
#else
uint64_t value = 0;
- switch(unit_size_) {
+ switch (unit_size_) {
default:
value |= ((uint64_t)ptr[7]) << 56;
/* FALLTHRU */
#ifdef HAVE_UNALIGNED_LITTLE_ENDIAN_ACCESS
*(uint64_t*)ptr = value;
#else
- switch(unit_size_) {
+ switch (unit_size_) {
default:
ptr[7] = value >> 56;
/* FALLTHRU */
#endif
}
-void LogicSegment::append_payload(shared_ptr<Logic> logic)
+void LogicSegment::append_payload(shared_ptr<sigrok::Logic> logic)
{
assert(unit_size_ == logic->unit_size());
assert((logic->data_length() % unit_size_) == 0);
lock_guard<recursive_mutex> lock(mutex_);
- append_data(logic->data_pointer(),
- logic->data_length() / unit_size_);
+ uint64_t prev_sample_count = sample_count_;
+ uint64_t sample_count = logic->data_length() / unit_size_;
+
+ append_samples(logic->data_pointer(), 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);
}
-void LogicSegment::get_samples(uint8_t *const data,
- int64_t start_sample, int64_t end_sample) const
+const uint8_t* LogicSegment::get_samples(int64_t start_sample,
+ int64_t end_sample) const
{
- assert(data);
assert(start_sample >= 0);
assert(start_sample <= (int64_t)sample_count_);
assert(end_sample >= 0);
lock_guard<recursive_mutex> lock(mutex_);
- const size_t size = (end_sample - start_sample) * unit_size_;
- memcpy(data, (const uint8_t*)data_.data() + start_sample * unit_size_, size);
+ return get_raw_samples(start_sample, (end_sample-start_sample));
+}
+
+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)
+{
+ Segment::continue_raw_sample_iteration((SegmentRawDataIterator*)it, increase);
+}
+
+void LogicSegment::end_sample_iteration(SegmentLogicDataIterator* it)
+{
+ Segment::end_raw_sample_iteration((SegmentRawDataIterator*)it);
}
void LogicSegment::reallocate_mipmap_level(MipMapLevel &m)
{
+ lock_guard<recursive_mutex> lock(mutex_);
+
const uint64_t new_data_length = ((m.length + MipMapDataUnit - 1) /
MipMapDataUnit) * MipMapDataUnit;
- if (new_data_length > m.data_length)
- {
+
+ if (new_data_length > m.data_length) {
m.data_length = new_data_length;
// Padding is added to allow for the uint64_t write word
{
MipMapLevel &m0 = mip_map_[0];
uint64_t prev_length;
- const uint8_t *src_ptr;
uint8_t *dest_ptr;
+ SegmentRawDataIterator* it;
uint64_t accumulator;
unsigned int diff_counter;
dest_ptr = (uint8_t*)m0.data + prev_length * unit_size_;
// Iterate through the samples to populate the first level mipmap
- const uint8_t *const end_src_ptr = (uint8_t*)data_.data() +
- m0.length * unit_size_ * MipMapScaleFactor;
- for (src_ptr = (uint8_t*)data_.data() +
- prev_length * unit_size_ * MipMapScaleFactor;
- src_ptr < end_src_ptr;)
- {
+ uint64_t start_sample = prev_length * MipMapScaleFactor;
+ uint64_t end_sample = m0.length * MipMapScaleFactor;
+
+ it = begin_raw_sample_iteration(start_sample);
+ for (uint64_t i = start_sample; i < end_sample;) {
// Accumulate transitions which have occurred in this sample
accumulator = 0;
diff_counter = MipMapScaleFactor;
- while (diff_counter-- > 0)
- {
- const uint64_t sample = unpack_sample(src_ptr);
+ while (diff_counter-- > 0) {
+ const uint64_t sample = unpack_sample(it->value);
accumulator |= last_append_sample_ ^ sample;
last_append_sample_ = sample;
- src_ptr += unit_size_;
+ continue_raw_sample_iteration(it, 1);
+ i++;
}
pack_sample(dest_ptr, accumulator);
dest_ptr += unit_size_;
}
+ end_raw_sample_iteration(it);
// Compute higher level mipmaps
- for (unsigned int level = 1; level < ScaleStepCount; level++)
- {
+ for (unsigned int level = 1; level < ScaleStepCount; level++) {
MipMapLevel &m = mip_map_[level];
const MipMapLevel &ml = mip_map_[level-1];
prev_length = m.length;
m.length = ml.length / MipMapScaleFactor;
- // Break off if there are no more samples to computed
+ // Break off if there are no more samples to be computed
if (m.length == prev_length)
break;
reallocate_mipmap_level(m);
- // Subsample the level lower level
- src_ptr = (uint8_t*)ml.data +
+ // Subsample the lower level
+ const uint8_t* src_ptr = (uint8_t*)ml.data +
unit_size_ * prev_length * MipMapScaleFactor;
const uint8_t *const end_dest_ptr =
(uint8_t*)m.data + unit_size_ * m.length;
+
for (dest_ptr = (uint8_t*)m.data +
- unit_size_ * prev_length;
- dest_ptr < end_dest_ptr;
- dest_ptr += unit_size_)
- {
+ unit_size_ * prev_length;
+ dest_ptr < end_dest_ptr;
+ dest_ptr += unit_size_) {
accumulator = 0;
diff_counter = MipMapScaleFactor;
- while (diff_counter-- > 0)
- {
+ while (diff_counter-- > 0) {
accumulator |= unpack_sample(src_ptr);
src_ptr += unit_size_;
}
}
}
-uint64_t LogicSegment::get_sample(uint64_t index) const
+uint64_t LogicSegment::get_unpacked_sample(uint64_t index) const
{
assert(index < sample_count_);
- return unpack_sample((uint8_t*)data_.data() + index * unit_size_);
+ const uint8_t* data = get_raw_samples(index, 1);
+ uint64_t sample = unpack_sample(data);
+ delete[] data;
+
+ return sample;
}
void LogicSegment::get_subsampled_edges(
const uint64_t sig_mask = 1ULL << sig_index;
// Store the initial state
- last_sample = (get_sample(start) & sig_mask) != 0;
+ last_sample = (get_unpacked_sample(start) & sig_mask) != 0;
edges.push_back(pair<int64_t, bool>(index++, last_sample));
- while (index + block_length <= end)
- {
+ while (index + block_length <= end) {
//----- Continue to search -----//
level = min_level;
// We cannot fast-forward if there is no mip-map data at
// at the minimum level.
- fast_forward = (mip_map_[level].data != NULL);
+ fast_forward = (mip_map_[level].data != nullptr);
- if (min_length < MipMapScaleFactor)
- {
+ 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));
for (; index < final_index &&
- (index & ~(~0 << MipMapScalePower)) != 0;
- index++)
- {
+ (index & ~((uint64_t)(~0) << MipMapScalePower)) != 0;
+ index++) {
const bool sample =
- (get_sample(index) & sig_mask) != 0;
+ (get_unpacked_sample(index) & sig_mask) != 0;
// If there was a change we cannot fast forward
if (sample != last_sample) {
break;
}
}
- }
- else
- {
+ } else {
// If resolution is less than a mip map block,
// round up to the beginning of the mip-map block
// for this level of detail
// We can fast forward only if there was no change
const bool sample =
- (get_sample(index) & sig_mask) != 0;
+ (get_unpacked_sample(index) & sig_mask) != 0;
if (last_sample != sample)
fast_forward = false;
}
sig_mask))
break;
- if ((offset & ~(~0 << MipMapScalePower)) == 0) {
+ if ((offset & ~((uint64_t)(~0) << MipMapScalePower)) == 0) {
// If we are now at the beginning of a
// higher level mip-map block ascend one
// level
// 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) &
+ (get_subsample(level, offset) &
sig_mask)) {
// Zoom in unless we reached the minimum
// zoom
// block
if (min_length < MipMapScaleFactor) {
for (; index < end; index++) {
- const bool sample = (get_sample(index) &
+ const bool sample = (get_unpacked_sample(index) &
sig_mask) != 0;
if (sample != last_sample)
break;
// Store the final state
const bool final_sample =
- (get_sample(final_index - 1) & sig_mask) != 0;
+ (get_unpacked_sample(final_index - 1) & sig_mask) != 0;
edges.push_back(pair<int64_t, bool>(index, final_sample));
index = final_index;
}
// Add the final state
- const bool end_sample = get_sample(end) & sig_mask;
+ const bool end_sample = get_unpacked_sample(end) & sig_mask;
if (last_sample != end_sample)
edges.push_back(pair<int64_t, bool>(end, end_sample));
edges.push_back(pair<int64_t, bool>(end + 1, end_sample));
projects / pulseview.git / blobdiff