From de5c3a2562bbddc0f3d95619a1b3b1318b9598fd Mon Sep 17 00:00:00 2001 From: Keisuke Kuroyanagi Date: Wed, 30 Jul 2014 20:43:28 +0900 Subject: [PATCH] Construct TrieMap from existing buffer. Bug: 14425059 Change-Id: Ia1c58d88540f55fb38fe0bdfcd7c0a34ebc7415e --- .../jni/src/suggest/policyimpl/dictionary/utils/trie_map.cpp | 4 ++++ native/jni/src/suggest/policyimpl/dictionary/utils/trie_map.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/trie_map.cpp b/native/jni/src/suggest/policyimpl/dictionary/utils/trie_map.cpp index ca79c18e5..2904b1e77 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/utils/trie_map.cpp +++ b/native/jni/src/suggest/policyimpl/dictionary/utils/trie_map.cpp @@ -43,6 +43,10 @@ TrieMap::TrieMap() : mBuffer(MAX_BUFFER_SIZE) { writeEntry(EMPTY_BITMAP_ENTRY, ROOT_BITMAP_ENTRY_INDEX); } +TrieMap::TrieMap(uint8_t *const buffer, const int bufferSize) + : mBuffer(buffer, bufferSize, + BufferWithExtendableBuffer::DEFAULT_MAX_ADDITIONAL_BUFFER_SIZE) {} + void TrieMap::dump(const int from, const int to) const { AKLOGI("BufSize: %d", mBuffer.getTailPosition()); for (int i = from; i < to; ++i) { diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/trie_map.h b/native/jni/src/suggest/policyimpl/dictionary/utils/trie_map.h index db278f5f1..8b33346e6 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/utils/trie_map.h +++ b/native/jni/src/suggest/policyimpl/dictionary/utils/trie_map.h @@ -160,6 +160,8 @@ class TrieMap { static const uint64_t MAX_VALUE; TrieMap(); + // Construct TrieMap using existing data in the memory region written by save(). + TrieMap(uint8_t *const buffer, const int bufferSize); void dump(const int from = 0, const int to = 0) const; bool isNearSizeLimit() const {