projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switch segment storage from single vector to vector of arrays
[pulseview.git]
/
pv
/
data
/
logicsegment.hpp
diff --git
a/pv/data/logicsegment.hpp
b/pv/data/logicsegment.hpp
index 0931e2c46c9f6ed86a9c1d8f8706c8477cc56a26..43fd41126617bd0b9d76dbc0f8bbf7875c5569bd 100644
(file)
--- a/
pv/data/logicsegment.hpp
+++ b/
pv/data/logicsegment.hpp
@@
-40,6
+40,12
@@
struct LongPulses;
namespace pv {
namespace data {
namespace pv {
namespace data {
+typedef struct {
+ uint64_t sample_index, chunk_num, chunk_offs;
+ uint8_t* chunk;
+ uint8_t* value;
+} SegmentLogicDataIterator;
+
class LogicSegment : public Segment
{
private:
class LogicSegment : public Segment
{
private:
@@
-61,8
+67,7
@@
public:
typedef std::pair<int64_t, bool> EdgePair;
public:
typedef std::pair<int64_t, bool> EdgePair;
public:
- LogicSegment(std::shared_ptr<sigrok::Logic> logic,
- uint64_t samplerate, uint64_t expected_num_samples = 0);
+ LogicSegment(std::shared_ptr<sigrok::Logic> logic, uint64_t samplerate);
virtual ~LogicSegment();
virtual ~LogicSegment();
@@
-70,6
+75,10
@@
public:
const uint8_t* get_samples(int64_t start_sample, int64_t end_sample) const;
const uint8_t* get_samples(int64_t start_sample, int64_t end_sample) const;
+ SegmentLogicDataIterator* begin_sample_iteration(uint64_t start) const;
+ void continue_sample_iteration(SegmentLogicDataIterator* it, uint64_t increase) const;
+ void end_sample_iteration(SegmentLogicDataIterator* it) const;
+
private:
uint64_t unpack_sample(const uint8_t *ptr) const;
void pack_sample(uint8_t *ptr, uint64_t value);
private:
uint64_t unpack_sample(const uint8_t *ptr) const;
void pack_sample(uint8_t *ptr, uint64_t value);
@@
-78,7
+87,7
@@
private:
void append_payload_to_mipmap();
void append_payload_to_mipmap();
- uint64_t get_sample(uint64_t index) const;
+ uint64_t get_
unpacked_
sample(uint64_t index) const;
public:
/**
public:
/**