#include <cstdlib>
#include <cstring>
+#include <QDebug>
+
using std::bad_alloc;
using std::lock_guard;
using std::min;
chunk_size_ = min(MaxChunkSize, (MaxChunkSize / unit_size_) * unit_size_);
// Create the initial chunk
- current_chunk_ = new uint8_t[chunk_size_];
+ current_chunk_ = new uint8_t[chunk_size_ + 7]; /* FIXME +7 is workaround for #1284 */
data_chunks_.push_back(current_chunk_);
used_samples_ = 0;
unused_samples_ = chunk_size_ / unit_size_;
if (current_chunk_) {
// No more data will come in, so re-create the last chunk accordingly
- uint8_t* resized_chunk = new uint8_t[used_samples_ * unit_size_];
+ uint8_t* resized_chunk = new uint8_t[used_samples_ * unit_size_ + 7]; /* FIXME +7 is workaround for #1284 */
memcpy(resized_chunk, current_chunk_, used_samples_ * unit_size_);
delete[] current_chunk_;
unused_samples_--;
if (unused_samples_ == 0) {
- current_chunk_ = new uint8_t[chunk_size_];
+ current_chunk_ = new uint8_t[chunk_size_ + 7]; /* FIXME +7 is workaround for #1284 */
data_chunks_.push_back(current_chunk_);
used_samples_ = 0;
unused_samples_ = chunk_size_ / unit_size_;
// This way, memory allocation will fail early enough to let
// PV remain alive. Otherwise, PV will crash in a random
// memory-allocating part of the application.
- current_chunk_ = new uint8_t[chunk_size_];
+ current_chunk_ = new uint8_t[chunk_size_ + 7]; /* FIXME +7 is workaround for #1284 */
const int dummy_size = 2 * chunk_size_;
auto dummy_chunk = new uint8_t[dummy_size];
memset(dummy_chunk, 0xFF, dummy_size);
delete[] dummy_chunk;
- } catch (bad_alloc) {
+ } catch (bad_alloc&) {
delete[] current_chunk_; // The new may have succeeded
current_chunk_ = nullptr;
throw;
}
}
-SegmentRawDataIterator* Segment::begin_raw_sample_iteration(uint64_t start)
+SegmentDataIterator* Segment::begin_sample_iteration(uint64_t start)
{
- SegmentRawDataIterator* it = new SegmentRawDataIterator;
+ SegmentDataIterator* it = new SegmentDataIterator;
assert(start < sample_count_);
it->chunk_num = (start * unit_size_) / chunk_size_;
it->chunk_offs = (start * unit_size_) % chunk_size_;
it->chunk = data_chunks_[it->chunk_num];
- it->value = it->chunk + it->chunk_offs;
return it;
}
-void Segment::continue_raw_sample_iteration(SegmentRawDataIterator* it, uint64_t increase)
+void Segment::continue_sample_iteration(SegmentDataIterator* it, uint64_t increase)
{
- // Fail gracefully if we are asked to deliver data we don't have
- if (it->sample_index > sample_count_)
- return;
-
it->sample_index += increase;
it->chunk_offs += (increase * unit_size_);
it->chunk_offs -= chunk_size_;
it->chunk = data_chunks_[it->chunk_num];
}
-
- it->value = it->chunk + it->chunk_offs;
}
-void Segment::end_raw_sample_iteration(SegmentRawDataIterator* it)
+void Segment::end_sample_iteration(SegmentDataIterator* it)
{
delete it;
}
}
+uint8_t* Segment::get_iterator_value(SegmentDataIterator* it)
+{
+ assert(it->sample_index <= (sample_count_ - 1));
+
+ return (it->chunk + it->chunk_offs);
+}
+
+uint64_t Segment::get_iterator_valid_length(SegmentDataIterator* it)
+{
+ assert(it->sample_index <= (sample_count_ - 1));
+
+ return ((chunk_size_ - it->chunk_offs) / unit_size_);
+}
+
} // namespace data
} // namespace pv