a3760992c9
Reason for revert: Making MSAN and TSAN rather unhappy. https://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN/builds/1586 https://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN/builds/5922 Original issue's description: > Fixes for SkRWBuffer > > Do not call SkBufferHead::validate in SkROBuffer's destructor, which > may be called in a separate thread from SkRWBuffer::append. validate() > reads SkBufferBlock::fUsed, and append() writes to it, resulting in > a data race. > > Update some comments to be more clear about how it is safe to use > these classes across threads. > > Test the readers in separate threads. > > In addition, make sure it is safe to create a reader even when no > data has been appended. Add tests for this case. > > Mark a parameter to SkBufferHead::validate() as const, reflecting > its use. > > BUG=chromium:601578 > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1871953002 > > Committed: https://skia.googlesource.com/skia/+/d06920a29fe11c68bde2b93948ec99f277bb8459 TBR=mtklein@google.com,reed@google.com,scroggo@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=chromium:601578 Review URL: https://codereview.chromium.org/1882853004
334 lines
11 KiB
C++
334 lines
11 KiB
C++
/*
|
|
* Copyright 2011 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "SkData.h"
|
|
#include "SkDataTable.h"
|
|
#include "SkOSFile.h"
|
|
#include "SkReadBuffer.h"
|
|
#include "SkWriteBuffer.h"
|
|
#include "SkStream.h"
|
|
#include "Test.h"
|
|
|
|
static void test_is_equal(skiatest::Reporter* reporter,
|
|
const SkDataTable* a, const SkDataTable* b) {
|
|
REPORTER_ASSERT(reporter, a->count() == b->count());
|
|
for (int i = 0; i < a->count(); ++i) {
|
|
size_t sizea, sizeb;
|
|
const void* mema = a->at(i, &sizea);
|
|
const void* memb = b->at(i, &sizeb);
|
|
REPORTER_ASSERT(reporter, sizea == sizeb);
|
|
REPORTER_ASSERT(reporter, !memcmp(mema, memb, sizea));
|
|
}
|
|
}
|
|
|
|
static void test_datatable_is_empty(skiatest::Reporter* reporter,
|
|
SkDataTable* table) {
|
|
REPORTER_ASSERT(reporter, table->isEmpty());
|
|
REPORTER_ASSERT(reporter, 0 == table->count());
|
|
}
|
|
|
|
static void test_emptytable(skiatest::Reporter* reporter) {
|
|
SkAutoTUnref<SkDataTable> table0(SkDataTable::NewEmpty());
|
|
SkAutoTUnref<SkDataTable> table1(SkDataTable::NewCopyArrays(nullptr, nullptr, 0));
|
|
SkAutoTUnref<SkDataTable> table2(SkDataTable::NewCopyArray(nullptr, 0, 0));
|
|
SkAutoTUnref<SkDataTable> table3(SkDataTable::NewArrayProc(nullptr, 0, 0,
|
|
nullptr, nullptr));
|
|
|
|
test_datatable_is_empty(reporter, table0);
|
|
test_datatable_is_empty(reporter, table1);
|
|
test_datatable_is_empty(reporter, table2);
|
|
test_datatable_is_empty(reporter, table3);
|
|
|
|
test_is_equal(reporter, table0, table1);
|
|
test_is_equal(reporter, table0, table2);
|
|
test_is_equal(reporter, table0, table3);
|
|
}
|
|
|
|
static void test_simpletable(skiatest::Reporter* reporter) {
|
|
const int idata[] = { 1, 4, 9, 16, 25, 63 };
|
|
int icount = SK_ARRAY_COUNT(idata);
|
|
SkAutoTUnref<SkDataTable> itable(SkDataTable::NewCopyArray(idata,
|
|
sizeof(idata[0]),
|
|
icount));
|
|
REPORTER_ASSERT(reporter, itable->count() == icount);
|
|
for (int i = 0; i < icount; ++i) {
|
|
size_t size;
|
|
REPORTER_ASSERT(reporter, sizeof(int) == itable->atSize(i));
|
|
REPORTER_ASSERT(reporter, *itable->atT<int>(i, &size) == idata[i]);
|
|
REPORTER_ASSERT(reporter, sizeof(int) == size);
|
|
}
|
|
}
|
|
|
|
static void test_vartable(skiatest::Reporter* reporter) {
|
|
const char* str[] = {
|
|
"", "a", "be", "see", "deigh", "ef", "ggggggggggggggggggggggggggg"
|
|
};
|
|
int count = SK_ARRAY_COUNT(str);
|
|
size_t sizes[SK_ARRAY_COUNT(str)];
|
|
for (int i = 0; i < count; ++i) {
|
|
sizes[i] = strlen(str[i]) + 1;
|
|
}
|
|
|
|
SkAutoTUnref<SkDataTable> table(SkDataTable::NewCopyArrays(
|
|
(const void*const*)str, sizes, count));
|
|
|
|
REPORTER_ASSERT(reporter, table->count() == count);
|
|
for (int i = 0; i < count; ++i) {
|
|
size_t size;
|
|
REPORTER_ASSERT(reporter, table->atSize(i) == sizes[i]);
|
|
REPORTER_ASSERT(reporter, !strcmp(table->atT<const char>(i, &size),
|
|
str[i]));
|
|
REPORTER_ASSERT(reporter, size == sizes[i]);
|
|
|
|
const char* s = table->atStr(i);
|
|
REPORTER_ASSERT(reporter, strlen(s) == strlen(str[i]));
|
|
}
|
|
}
|
|
|
|
static void test_tablebuilder(skiatest::Reporter* reporter) {
|
|
const char* str[] = {
|
|
"", "a", "be", "see", "deigh", "ef", "ggggggggggggggggggggggggggg"
|
|
};
|
|
int count = SK_ARRAY_COUNT(str);
|
|
|
|
SkDataTableBuilder builder(16);
|
|
|
|
for (int i = 0; i < count; ++i) {
|
|
builder.append(str[i], strlen(str[i]) + 1);
|
|
}
|
|
SkAutoTUnref<SkDataTable> table(builder.detachDataTable());
|
|
|
|
REPORTER_ASSERT(reporter, table->count() == count);
|
|
for (int i = 0; i < count; ++i) {
|
|
size_t size;
|
|
REPORTER_ASSERT(reporter, table->atSize(i) == strlen(str[i]) + 1);
|
|
REPORTER_ASSERT(reporter, !strcmp(table->atT<const char>(i, &size),
|
|
str[i]));
|
|
REPORTER_ASSERT(reporter, size == strlen(str[i]) + 1);
|
|
|
|
const char* s = table->atStr(i);
|
|
REPORTER_ASSERT(reporter, strlen(s) == strlen(str[i]));
|
|
}
|
|
}
|
|
|
|
static void test_globaltable(skiatest::Reporter* reporter) {
|
|
static const int gData[] = {
|
|
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
|
|
};
|
|
int count = SK_ARRAY_COUNT(gData);
|
|
|
|
SkAutoTUnref<SkDataTable> table(SkDataTable::NewArrayProc(gData,
|
|
sizeof(gData[0]), count, nullptr, nullptr));
|
|
|
|
REPORTER_ASSERT(reporter, table->count() == count);
|
|
for (int i = 0; i < count; ++i) {
|
|
size_t size;
|
|
REPORTER_ASSERT(reporter, table->atSize(i) == sizeof(int));
|
|
REPORTER_ASSERT(reporter, *table->atT<const char>(i, &size) == i);
|
|
REPORTER_ASSERT(reporter, sizeof(int) == size);
|
|
}
|
|
}
|
|
|
|
DEF_TEST(DataTable, reporter) {
|
|
test_emptytable(reporter);
|
|
test_simpletable(reporter);
|
|
test_vartable(reporter);
|
|
test_tablebuilder(reporter);
|
|
test_globaltable(reporter);
|
|
}
|
|
|
|
static void* gGlobal;
|
|
|
|
static void delete_int_proc(const void* ptr, void* context) {
|
|
int* data = (int*)ptr;
|
|
SkASSERT(context == gGlobal);
|
|
delete[] data;
|
|
}
|
|
|
|
static void assert_len(skiatest::Reporter* reporter, SkData* ref, size_t len) {
|
|
REPORTER_ASSERT(reporter, ref->size() == len);
|
|
}
|
|
|
|
static void assert_data(skiatest::Reporter* reporter, SkData* ref,
|
|
const void* data, size_t len) {
|
|
REPORTER_ASSERT(reporter, ref->size() == len);
|
|
REPORTER_ASSERT(reporter, !memcmp(ref->data(), data, len));
|
|
}
|
|
|
|
static void test_cstring(skiatest::Reporter* reporter) {
|
|
const char str[] = "Hello world";
|
|
size_t len = strlen(str);
|
|
|
|
SkAutoTUnref<SkData> r0(SkData::NewWithCopy(str, len + 1));
|
|
SkAutoTUnref<SkData> r1(SkData::NewWithCString(str));
|
|
|
|
REPORTER_ASSERT(reporter, r0->equals(r1));
|
|
|
|
SkAutoTUnref<SkData> r2(SkData::NewWithCString(nullptr));
|
|
REPORTER_ASSERT(reporter, 1 == r2->size());
|
|
REPORTER_ASSERT(reporter, 0 == *r2->bytes());
|
|
}
|
|
|
|
static void test_files(skiatest::Reporter* reporter) {
|
|
SkString tmpDir = skiatest::GetTmpDir();
|
|
if (tmpDir.isEmpty()) {
|
|
return;
|
|
}
|
|
|
|
SkString path = SkOSPath::Join(tmpDir.c_str(), "data_test");
|
|
|
|
const char s[] = "abcdefghijklmnopqrstuvwxyz";
|
|
{
|
|
SkFILEWStream writer(path.c_str());
|
|
if (!writer.isValid()) {
|
|
ERRORF(reporter, "Failed to create tmp file %s\n", path.c_str());
|
|
return;
|
|
}
|
|
writer.write(s, 26);
|
|
}
|
|
|
|
FILE* file = sk_fopen(path.c_str(), kRead_SkFILE_Flag);
|
|
SkAutoTUnref<SkData> r1(SkData::NewFromFILE(file));
|
|
REPORTER_ASSERT(reporter, r1.get() != nullptr);
|
|
REPORTER_ASSERT(reporter, r1->size() == 26);
|
|
REPORTER_ASSERT(reporter, strncmp(static_cast<const char*>(r1->data()), s, 26) == 0);
|
|
|
|
int fd = sk_fileno(file);
|
|
SkAutoTUnref<SkData> r2(SkData::NewFromFD(fd));
|
|
REPORTER_ASSERT(reporter, r2.get() != nullptr);
|
|
REPORTER_ASSERT(reporter, r2->size() == 26);
|
|
REPORTER_ASSERT(reporter, strncmp(static_cast<const char*>(r2->data()), s, 26) == 0);
|
|
}
|
|
|
|
DEF_TEST(Data, reporter) {
|
|
const char* str = "We the people, in order to form a more perfect union.";
|
|
const int N = 10;
|
|
|
|
SkAutoTUnref<SkData> r0(SkData::NewEmpty());
|
|
SkAutoTUnref<SkData> r1(SkData::NewWithCopy(str, strlen(str)));
|
|
SkAutoTUnref<SkData> r2(SkData::NewWithProc(new int[N], N*sizeof(int),
|
|
delete_int_proc, gGlobal));
|
|
SkAutoTUnref<SkData> r3(SkData::NewSubset(r1, 7, 6));
|
|
|
|
assert_len(reporter, r0, 0);
|
|
assert_len(reporter, r1, strlen(str));
|
|
assert_len(reporter, r2, N * sizeof(int));
|
|
assert_len(reporter, r3, 6);
|
|
|
|
assert_data(reporter, r1, str, strlen(str));
|
|
assert_data(reporter, r3, "people", 6);
|
|
|
|
SkData* tmp = SkData::NewSubset(r1, strlen(str), 10);
|
|
assert_len(reporter, tmp, 0);
|
|
tmp->unref();
|
|
tmp = SkData::NewSubset(r1, 0, 0);
|
|
assert_len(reporter, tmp, 0);
|
|
tmp->unref();
|
|
|
|
test_cstring(reporter);
|
|
test_files(reporter);
|
|
}
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
|
#include "SkRWBuffer.h"
|
|
|
|
const char gABC[] = "abcdefghijklmnopqrstuvwxyz";
|
|
|
|
static void check_abcs(skiatest::Reporter* reporter, const char buffer[], size_t size) {
|
|
REPORTER_ASSERT(reporter, size % 26 == 0);
|
|
for (size_t offset = 0; offset < size; offset += 26) {
|
|
REPORTER_ASSERT(reporter, !memcmp(&buffer[offset], gABC, 26));
|
|
}
|
|
}
|
|
|
|
// 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();
|
|
REPORTER_ASSERT(reporter, size % 26 == 0);
|
|
|
|
SkAutoTMalloc<char> storage(size);
|
|
char* array = storage.get();
|
|
size_t bytesRead = stream->read(array, size);
|
|
REPORTER_ASSERT(reporter, bytesRead == size);
|
|
check_abcs(reporter, array, size);
|
|
|
|
// try checking backwards
|
|
for (size_t offset = size; offset > 0; offset -= 26) {
|
|
REPORTER_ASSERT(reporter, stream->seek(offset - 26));
|
|
REPORTER_ASSERT(reporter, stream->getPosition() == offset - 26);
|
|
REPORTER_ASSERT(reporter, stream->read(array, 26) == 26);
|
|
check_abcs(reporter, array, 26);
|
|
REPORTER_ASSERT(reporter, stream->getPosition() == offset);
|
|
}
|
|
}
|
|
|
|
// reader should contains an integral number of copies of gABC.
|
|
static void check_alphabet_buffer(skiatest::Reporter* reporter, const SkROBuffer* reader) {
|
|
size_t size = reader->size();
|
|
REPORTER_ASSERT(reporter, size % 26 == 0);
|
|
|
|
SkAutoTMalloc<char> storage(size);
|
|
SkROBuffer::Iter iter(reader);
|
|
size_t offset = 0;
|
|
do {
|
|
SkASSERT(offset + iter.size() <= size);
|
|
memcpy(storage.get() + offset, iter.data(), iter.size());
|
|
offset += iter.size();
|
|
} while (iter.next());
|
|
REPORTER_ASSERT(reporter, offset == size);
|
|
check_abcs(reporter, storage.get(), size);
|
|
}
|
|
|
|
DEF_TEST(RWBuffer, reporter) {
|
|
// Knowing that the default capacity is 4096, choose N large enough so we force it to use
|
|
// multiple buffers internally.
|
|
const int N = 1000;
|
|
SkROBuffer* readers[N];
|
|
SkStream* streams[N];
|
|
|
|
{
|
|
SkRWBuffer buffer;
|
|
for (int i = 0; i < N; ++i) {
|
|
buffer.append(gABC, 26);
|
|
readers[i] = buffer.newRBufferSnapshot();
|
|
streams[i] = buffer.newStreamSnapshot();
|
|
}
|
|
REPORTER_ASSERT(reporter, N*26 == buffer.size());
|
|
}
|
|
|
|
for (int i = 0; i < N; ++i) {
|
|
REPORTER_ASSERT(reporter, (i + 1) * 26U == readers[i]->size());
|
|
check_alphabet_buffer(reporter, readers[i]);
|
|
check_alphabet_stream(reporter, streams[i]);
|
|
readers[i]->unref();
|
|
delete streams[i];
|
|
}
|
|
}
|
|
|
|
// Tests that it is safe to call SkROBuffer::Iter::size() when exhausted.
|
|
DEF_TEST(RWBuffer_size, r) {
|
|
SkRWBuffer buffer;
|
|
buffer.append(gABC, 26);
|
|
|
|
SkAutoTUnref<SkROBuffer> roBuffer(buffer.newRBufferSnapshot());
|
|
SkROBuffer::Iter iter(roBuffer);
|
|
REPORTER_ASSERT(r, iter.data());
|
|
REPORTER_ASSERT(r, iter.size() == 26);
|
|
|
|
// There is only one block in this buffer.
|
|
REPORTER_ASSERT(r, !iter.next());
|
|
REPORTER_ASSERT(r, 0 == iter.size());
|
|
}
|
|
|
|
// 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());
|
|
}
|