return amount;
}
- // Do not call in the reader thread, since the writer may be updating fUsed.
- // (The assertion is still true, but TSAN still may complain about its raciness.)
void validate() const {
#ifdef SK_DEBUG
SkASSERT(fCapacity > 0);
}
}
- void validate(size_t minUsed, const SkBufferBlock* tail = nullptr) const {
+ void validate(size_t minUsed, SkBufferBlock* tail = nullptr) const {
#ifdef SK_DEBUG
SkASSERT(fRefCnt > 0);
size_t totalUsed = 0;
SkROBuffer::~SkROBuffer() {
if (fHead) {
+ fHead->validate(fAvailable);
fHead->unref();
}
}
}
void SkROBuffer::Iter::reset(const SkROBuffer* buffer) {
- if (buffer && buffer->fHead) {
+ if (buffer) {
fBlock = &buffer->fHead->fBlock;
fRemaining = buffer->fAvailable;
} else {
}
}
-// stream should contain an integral number of copies of gABC.
+// stream should contains an integral number of copies of gABC.
static void check_alphabet_stream(skiatest::Reporter* reporter, SkStream* stream) {
REPORTER_ASSERT(reporter, stream->hasLength());
size_t size = stream->getLength();
check_abcs(reporter, storage.get(), size);
}
-#include "SkTaskGroup.h"
-
DEF_TEST(RWBuffer, reporter) {
// Knowing that the default capacity is 4096, choose N large enough so we force it to use
// multiple buffers internally.
SkStream* streams[N];
{
- SkTaskGroup tasks;
SkRWBuffer buffer;
for (int i = 0; i < N; ++i) {
buffer.append(gABC, 26);
readers[i] = buffer.newRBufferSnapshot();
streams[i] = buffer.newStreamSnapshot();
- REPORTER_ASSERT(reporter, readers[i]->size() == buffer.size());
- REPORTER_ASSERT(reporter, streams[i]->getLength() == buffer.size());
-
- tasks.add([reporter, i, &readers, &streams] {
- REPORTER_ASSERT(reporter, (i + 1) * 26U == readers[i]->size());
- REPORTER_ASSERT(reporter, streams[i]->getLength() == readers[i]->size());
- check_alphabet_buffer(reporter, readers[i]);
- check_alphabet_stream(reporter, streams[i]);
- REPORTER_ASSERT(reporter, streams[i]->rewind());
- });
}
REPORTER_ASSERT(reporter, N*26 == buffer.size());
- tasks.wait();
}
- // Test again, to verify that the snapshots work even after the SkRWBuffer is gone.
for (int i = 0; i < N; ++i) {
REPORTER_ASSERT(reporter, (i + 1) * 26U == readers[i]->size());
- REPORTER_ASSERT(reporter, streams[i]->getLength() == readers[i]->size());
check_alphabet_buffer(reporter, readers[i]);
check_alphabet_stream(reporter, streams[i]);
readers[i]->unref();
REPORTER_ASSERT(r, 0 == iter.size());
}
-// Tests that operations (including the destructor) are safe on an SkRWBuffer
-// without any data appended.
+// Tests that it is safe to destruct an SkRWBuffer without appending
+// anything to it.
DEF_TEST(RWBuffer_noAppend, r) {
SkRWBuffer buffer;
REPORTER_ASSERT(r, 0 == buffer.size());
-
- sk_sp<SkROBuffer> roBuffer = sk_sp<SkROBuffer>(buffer.newRBufferSnapshot());
- REPORTER_ASSERT(r, roBuffer);
- if (roBuffer) {
- REPORTER_ASSERT(r, roBuffer->size() == 0);
- SkROBuffer::Iter iter(roBuffer.get());
- REPORTER_ASSERT(r, iter.size() == 0);
- REPORTER_ASSERT(r, !iter.data());
- REPORTER_ASSERT(r, !iter.next());
- }
-
- SkAutoTDelete<SkStream> stream(buffer.newStreamSnapshot());
- REPORTER_ASSERT(r, stream);
- if (stream) {
- REPORTER_ASSERT(r, stream->hasLength());
- REPORTER_ASSERT(r, stream->getLength() == 0);
- REPORTER_ASSERT(r, stream->skip(10) == 0);
- }
}