Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff6ca099 authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi
Browse files

Add BufferWithExtendableBuffer::extend()

Bug: 14425059
Change-Id: I13dd8412ba4d16a1325ac2210b3852d580e71ad3
parent 6810e8df
Loading
Loading
Loading
Loading
+9 −5
Original line number Diff line number Diff line
@@ -49,6 +49,10 @@ void BufferWithExtendableBuffer::readCodePointsAndAdvancePosition(const int maxC
    }
}

bool BufferWithExtendableBuffer::extend(const int size) {
    return checkAndPrepareWriting(getTailPosition(), size);
}

bool BufferWithExtendableBuffer::writeUint(const uint32_t data, const int size, const int pos) {
    int writingPos = pos;
    return writeUintAndAdvancePosition(data, size, &writingPos);
@@ -96,13 +100,13 @@ bool BufferWithExtendableBuffer::writeCodePointsAndAdvancePosition(const int *co
    return true;
}

bool BufferWithExtendableBuffer::extendBuffer() {
    const size_t sizeAfterExtending =
            mAdditionalBuffer.size() + EXTEND_ADDITIONAL_BUFFER_SIZE_STEP;
bool BufferWithExtendableBuffer::extendBuffer(const size_t size) {
    const size_t extendSize = std::max(EXTEND_ADDITIONAL_BUFFER_SIZE_STEP, size);
    const size_t sizeAfterExtending = mAdditionalBuffer.size() + extendSize;
    if (sizeAfterExtending > mMaxAdditionalBufferSize) {
        return false;
    }
    mAdditionalBuffer.resize(mAdditionalBuffer.size() + EXTEND_ADDITIONAL_BUFFER_SIZE_STEP);
    mAdditionalBuffer.resize(sizeAfterExtending);
    return true;
}

@@ -133,7 +137,7 @@ bool BufferWithExtendableBuffer::checkAndPrepareWriting(const int pos, const int
    }
    const size_t extendSize = totalRequiredSize -
            std::min(mAdditionalBuffer.size() + mOriginalBufferSize, totalRequiredSize);
    if (extendSize > 0 && !extendBuffer()) {
    if (extendSize > 0 && !extendBuffer(extendSize)) {
        // Failed to extend the buffer.
        return false;
    }
+3 −1
Original line number Diff line number Diff line
@@ -87,6 +87,8 @@ class BufferWithExtendableBuffer {
                * NEAR_BUFFER_LIMIT_THRESHOLD_PERCENTILE) / 100);
    }

    bool extend(const int size);

    /**
     * For writing.
     *
@@ -115,7 +117,7 @@ class BufferWithExtendableBuffer {
    const size_t mMaxAdditionalBufferSize;

    // Return if the buffer is successfully extended or not.
    bool extendBuffer();
    bool extendBuffer(const size_t size);

    // Returns if it is possible to write size-bytes from pos. When pos is at the tail position of
    // the additional buffer, try extending the buffer.