commit ff6ca09905be7e50828100301f23c68d56dcea2b
author Keisuke Kuroyanagi <ksk@google.com> Wed Jul 23 11:59:12 2014 +0900
committer Keisuke Kuroyanagi <ksk@google.com> Fri Jul 25 07:02:05 2014 +0900
tree 03ace3d5cf36fbc8642bd56b6c87d0dfcb7b858f
parent 6810e8df1ef7cdc37869f43a91f52695a1db8f0c

Add BufferWithExtendableBuffer::extend()

Bug: 14425059
Change-Id: I13dd8412ba4d16a1325ac2210b3852d580e71ad3

native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.cpp

diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.cpp b/native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.cpp
index 6e88bed..fab7208 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.cpp
+++ b/native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.cpp
@@ -49,6 +49,10 @@
     }
 }
 
+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 @@
     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 @@
     }
     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;
     }

native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h

diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h b/native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h
index a2e88a4..5e1362e 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h
+++ b/native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h
@@ -87,6 +87,8 @@
                 * NEAR_BUFFER_LIMIT_THRESHOLD_PERCENTILE) / 100);
     }
 
+    bool extend(const int size);
+
     /**
      * For writing.
      *
@@ -115,7 +117,7 @@
     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.