From dabe8acb7f89806dc6808d3ce913dc3d190c7e81 Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Tue, 14 Mar 2017 15:52:12 -0400 Subject: SkDynamicMemoryWStream::detachAsData more memory efficent I did some testing with very large datasets, and the difference in max RSS is measurable and significant. Change-Id: I6bb2f795d5b4f6ebdba42c3089dc85a278355d48 Reviewed-on: https://skia-review.googlesource.com/9686 Commit-Queue: Hal Canary Reviewed-by: Ben Wagner --- src/core/SkStream.cpp | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'src/core') diff --git a/src/core/SkStream.cpp b/src/core/SkStream.cpp index 1435dab235..133df83078 100644 --- a/src/core/SkStream.cpp +++ b/src/core/SkStream.cpp @@ -570,15 +570,31 @@ void SkDynamicMemoryWStream::padToAlign4() { } } + +void SkDynamicMemoryWStream::copyToAndReset(void* ptr) { + // By looping through the source and freeing as we copy, we + // can reduce real memory use with large streams. + char* dst = reinterpret_cast(ptr); + Block* block = fHead; + while (block != nullptr) { + size_t len = block->written(); + memcpy(dst, block->start(), len); + dst += len; + Block* next = block->fNext; + sk_free(block); + block = next; + } + fHead = fTail = nullptr; + fBytesWrittenBeforeTail = 0; +} + sk_sp SkDynamicMemoryWStream::detachAsData() { const size_t size = this->bytesWritten(); if (0 == size) { return SkData::MakeEmpty(); } - sk_sp data = SkData::MakeUninitialized(size); - this->copyTo(data->writable_data()); - this->reset(); // this is the "detach" part + this->copyToAndReset(data->writable_data()); return data; } -- cgit v1.2.3